Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #30 ARTEMIS-138

This commit is contained in:
Clebert Suconic 2015-06-16 14:38:53 -04:00
parent 6073475d50 07f9fe4e7b
commit 4950c343e5
6 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractSequentialFileFactory.java
View File

@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -198,7 +199,7 @@ abstract class AbstractSequentialFileFactory implements SequentialFileFactory
if (fileNames == null)
{
throw new IOException("Failed to list: " + journalDir);
return Collections.EMPTY_LIST;
}
return Arrays.asList(fileNames);

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/AIOSequentialFileFactoryTest.java
View File

@ -35,9 +35,9 @@ public class AIOSequentialFileFactoryTest extends SequentialFileFactoryTestBase
}
@Override
protected SequentialFileFactory createFactory()
protected SequentialFileFactory createFactory(String folder)
{
return new AIOSequentialFileFactory(getTestDir());
return new AIOSequentialFileFactory(folder);
}
@Test

6
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIONonBufferedSequentialFileFactoryTest.java
View File

@ -15,17 +15,17 @@
* limitations under the License.
*/
package org.apache.activemq.artemis.tests.integration.journal;
import org.apache.activemq.artemis.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
import org.apache.activemq.artemis.core.journal.impl.NIOSequentialFileFactory;
import org.apache.activemq.artemis.tests.unit.core.journal.impl.SequentialFileFactoryTestBase;
public class NIONonBufferedSequentialFileFactoryTest extends SequentialFileFactoryTestBase
{
@Override
protected SequentialFileFactory createFactory()
protected SequentialFileFactory createFactory(String folder)
{
return new NIOSequentialFileFactory(getTestDir(), false);
return new NIOSequentialFileFactory(folder, false);
}
}

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOSequentialFileFactoryTest.java
View File

@ -23,9 +23,9 @@ public class NIOSequentialFileFactoryTest extends SequentialFileFactoryTestBase
{
@Override
protected SequentialFileFactory createFactory()
protected SequentialFileFactory createFactory(String folder)
{
return new NIOSequentialFileFactory(getTestDir(), true);
return new NIOSequentialFileFactory(folder, true);
}
}

2
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/FakeSequentialFileFactoryTest.java
View File

@ -23,7 +23,7 @@ public class FakeSequentialFileFactoryTest extends SequentialFileFactoryTestBase
{
@Override
protected SequentialFileFactory createFactory()
protected SequentialFileFactory createFactory(String folder)
{
return new FakeSequentialFileFactory();
}

30
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java
View File

@ -15,25 +15,22 @@
* limitations under the License.
*/
package org.apache.activemq.artemis.tests.unit.core.journal.impl;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Before;
import org.junit.After;
import org.junit.Test;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.junit.Assert;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
import org.apache.activemq.artemis.core.journal.SequentialFile;
import org.apache.activemq.artemis.core.journal.SequentialFileFactory;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public abstract class SequentialFileFactoryTestBase extends ActiveMQTestBase
{
@ -43,7 +40,7 @@ public abstract class SequentialFileFactoryTestBase extends ActiveMQTestBase
{
super.setUp();
factory = createFactory();
factory = createFactory(getTestDir());
factory.start();
}
@ -63,10 +60,19 @@ public abstract class SequentialFileFactoryTestBase extends ActiveMQTestBase
super.tearDown();
}
protected abstract SequentialFileFactory createFactory();
protected abstract SequentialFileFactory createFactory(String folder);
protected SequentialFileFactory factory;
@Test
public void listFilesOnNonExistentFolder() throws Exception
{
SequentialFileFactory fileFactory = createFactory("./target/dontexist");
List list = fileFactory.listFiles("tmp");
Assert.assertNotNull(list);
Assert.assertEquals(0, list.size());
}
@Test
public void testCreateAndListFiles() throws Exception
{