ARTEMIS-906 Adding Paging tests for mapped journal
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c039aae3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c039aae3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c039aae3 Branch: refs/heads/master Commit: c039aae37fbc3b0eb8fe0b0289fb2af2def84f6a Parents: aacddfd Author: Clebert Suconic <[email protected]> Authored: Thu Feb 2 17:16:54 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Fri Feb 3 09:04:57 2017 -0500 ---------------------------------------------------------------------- .../tests/integration/paging/GlobalPagingTest.java | 4 ++-- .../artemis/tests/integration/paging/PagingTest.java | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c039aae3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/GlobalPagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/GlobalPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/GlobalPagingTest.java index 3960b49..84b48ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/GlobalPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/GlobalPagingTest.java @@ -43,8 +43,8 @@ import org.junit.runners.Parameterized; @RunWith(Parameterized.class) public class GlobalPagingTest extends PagingTest { - public GlobalPagingTest(StoreConfiguration.StoreType storeType) { - super(storeType); + public GlobalPagingTest(StoreConfiguration.StoreType storeType, boolean mapped) { + super(storeType, mapped); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c039aae3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java index 3a932b9..1843239 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java @@ -73,6 +73,7 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.DescribeJournal import org.apache.activemq.artemis.core.persistence.impl.journal.JournalRecordIds; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.RoutingType; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; @@ -109,17 +110,20 @@ public class PagingTest extends ActiveMQTestBase { protected static final int PAGE_SIZE = 10 * 1024; + protected final boolean mapped; + protected final StoreConfiguration.StoreType storeType; static final SimpleString ADDRESS = new SimpleString("SimpleAddress"); - public PagingTest(StoreConfiguration.StoreType storeType) { + public PagingTest(StoreConfiguration.StoreType storeType, boolean mapped) { this.storeType = storeType; + this.mapped = mapped; } - @Parameterized.Parameters(name = "storeType={0}") + @Parameterized.Parameters(name = "storeType={0}, mapped={1}") public static Collection<Object[]> data() { - Object[][] params = new Object[][]{{StoreConfiguration.StoreType.FILE}, {StoreConfiguration.StoreType.DATABASE}}; + Object[][] params = new Object[][]{{StoreConfiguration.StoreType.FILE, false}, {StoreConfiguration.StoreType.FILE, true}, {StoreConfiguration.StoreType.DATABASE, false}}; return Arrays.asList(params); } @@ -5654,6 +5658,8 @@ public class PagingTest extends ActiveMQTestBase { Configuration configuration = super.createDefaultInVMConfig().setJournalSyncNonTransactional(false); if (storeType == StoreConfiguration.StoreType.DATABASE) { setDBStoreType(configuration); + } else if (mapped) { + configuration.setJournalType(JournalType.MAPPED); } return configuration; }
