Repository: activemq Updated Branches: refs/heads/master fe34a61c3 -> 226222546
Adding logging to help debug test failures https://issues.apache.org/jira/browse/AMQ-5923 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/22622254 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/22622254 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/22622254 Branch: refs/heads/master Commit: 226222546ab94441e6d66ea641092471d5b8b886 Parents: fe34a61 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Fri Sep 11 11:33:28 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Fri Sep 11 12:09:25 2015 +0000 ---------------------------------------------------------------------- .../region/cursors/KahaDBPendingMessageCursorTest.java | 13 +++++++------ .../cursors/MultiKahaDBPendingMessageCursorTest.java | 2 +- .../activemq/store/AbstractStoreStatTestSupport.java | 8 ++++++++ .../store/kahadb/KahaDBMessageStoreSizeStatTest.java | 9 +++++---- .../kahadb/MultiKahaDBMessageStoreSizeStatTest.java | 11 +++++++---- 5 files changed, 28 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java index 7d54b08..557c70e 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java @@ -45,12 +45,13 @@ public class KahaDBPendingMessageCursorTest extends protected static final Logger LOG = LoggerFactory .getLogger(KahaDBPendingMessageCursorTest.class); - File dataFileDir = new File("target/test-amq-5923/pending-datadb"); + @Rule + public TemporaryFolder dataFileDir = new TemporaryFolder(new File("target")); @Override protected void setUpBroker(boolean clearDataDir) throws Exception { - if (clearDataDir && dataFileDir.exists()) - FileUtils.cleanDirectory(dataFileDir); + if (clearDataDir && dataFileDir.getRoot().exists()) + FileUtils.cleanDirectory(dataFileDir.getRoot()); super.setUpBroker(clearDataDir); } @@ -58,7 +59,7 @@ public class KahaDBPendingMessageCursorTest extends protected void initPersistence(BrokerService brokerService) throws IOException { broker.setPersistent(true); - broker.setDataDirectoryFile(dataFileDir); + broker.setDataDirectoryFile(dataFileDir.getRoot()); } /** @@ -67,7 +68,7 @@ public class KahaDBPendingMessageCursorTest extends * * @throws Exception */ - @Test(timeout=20000) + @Test(timeout=10000) public void testDurableMessageSizeAfterRestartAndPublish() throws Exception { AtomicLong publishedMessageSize = new AtomicLong(); @@ -106,7 +107,7 @@ public class KahaDBPendingMessageCursorTest extends * * @throws Exception */ - @Test(timeout=20000) + @Test(timeout=10000) public void testNonPersistentDurableMessageSize() throws Exception { AtomicLong publishedMessageSize = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java index e1c3f22..9768980 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java @@ -41,7 +41,7 @@ public class MultiKahaDBPendingMessageCursorTest extends //setup multi-kaha adapter MultiKahaDBPersistenceAdapter persistenceAdapter = new MultiKahaDBPersistenceAdapter(); - persistenceAdapter.setDirectory(dataFileDir); + persistenceAdapter.setDirectory(dataFileDir.getRoot()); KahaDBPersistenceAdapter kahaStore = new KahaDBPersistenceAdapter(); kahaStore.setJournalMaxFileLength(1024 * 512); http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java index e9630f0..085becb 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java @@ -45,10 +45,13 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.jmx.DurableSubscriptionViewMBean; import org.apache.activemq.broker.region.Destination; +import org.apache.activemq.broker.region.cursors.AbstractPendingMessageCursorTest; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -56,6 +59,9 @@ import org.apache.activemq.command.ActiveMQTopic; */ public abstract class AbstractStoreStatTestSupport { + protected static final Logger LOG = LoggerFactory + .getLogger(AbstractStoreStatTestSupport.class); + protected static int defaultMessageSize = 1000; protected abstract BrokerService getBroker(); @@ -173,6 +179,7 @@ public abstract class AbstractStoreStatTestSupport { MessageProducer prod = session.createProducer(queue); prod.setDeliveryMode(deliveryMode); for (int i = 0; i < count; i++) { + LOG.info("Publishing message: " + i + ", size: " + messageSize); prod.send(createMessage(session, messageSize, publishedMessageSize)); } @@ -223,6 +230,7 @@ public abstract class AbstractStoreStatTestSupport { MessageProducer prod = session.createProducer(topic); prod.setDeliveryMode(deliveryMode); for (int i = 0; i < publishSize; i++) { + LOG.info("Publishing message: " + i + ", size: " + messageSize); prod.send(createMessage(session, messageSize, publishedMessageSize)); } http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java index 292cace..276a310 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java @@ -42,12 +42,13 @@ public class KahaDBMessageStoreSizeStatTest extends protected static final Logger LOG = LoggerFactory .getLogger(KahaDBMessageStoreSizeStatTest.class); - File dataFileDir = new File("target/test-amq-5748/stat-datadb"); + @Rule + public TemporaryFolder dataFileDir = new TemporaryFolder(new File("target")); @Override protected void setUpBroker(boolean clearDataDir) throws Exception { - if (clearDataDir && dataFileDir.exists()) - FileUtils.cleanDirectory(dataFileDir); + if (clearDataDir && dataFileDir.getRoot().exists()) + FileUtils.cleanDirectory(dataFileDir.getRoot()); super.setUpBroker(clearDataDir); } @@ -55,7 +56,7 @@ public class KahaDBMessageStoreSizeStatTest extends protected void initPersistence(BrokerService brokerService) throws IOException { broker.setPersistent(true); - broker.setDataDirectoryFile(dataFileDir); + broker.setDataDirectoryFile(dataFileDir.getRoot()); } /** http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java index 8d9efbc..3572acc 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java @@ -28,7 +28,9 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.Destination; import org.apache.activemq.store.AbstractMessageStoreSizeStatTest; import org.apache.commons.io.FileUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,12 +46,13 @@ public class MultiKahaDBMessageStoreSizeStatTest extends protected static final Logger LOG = LoggerFactory .getLogger(MultiKahaDBMessageStoreSizeStatTest.class); - File dataFileDir = new File("target/test-amq-5748/stat-datadb"); + @Rule + public TemporaryFolder dataFileDir = new TemporaryFolder(new File("target")); @Override protected void setUpBroker(boolean clearDataDir) throws Exception { - if (clearDataDir && dataFileDir.exists()) - FileUtils.cleanDirectory(dataFileDir); + if (clearDataDir && dataFileDir.getRoot().exists()) + FileUtils.cleanDirectory(dataFileDir.getRoot()); super.setUpBroker(clearDataDir); } @@ -60,7 +63,7 @@ public class MultiKahaDBMessageStoreSizeStatTest extends //setup multi-kaha adapter MultiKahaDBPersistenceAdapter persistenceAdapter = new MultiKahaDBPersistenceAdapter(); - persistenceAdapter.setDirectory(dataFileDir); + persistenceAdapter.setDirectory(dataFileDir.getRoot()); KahaDBPersistenceAdapter kahaStore = new KahaDBPersistenceAdapter(); kahaStore.setJournalMaxFileLength(1024 * 512);
