Repository: activemq-artemis Updated Branches: refs/heads/master 872c35e2f -> 229797d15
ARTEMIS-995 Bulk of test fixes This commit fixes tests: ActiveMQScheduledComponentTest.testAccumulationOwnPool PendingDeliveriesTest.testWithtReconnect ReceiveTest.testReceiveImmediate ActiveMQProducerResourceTest.testSendString EmbeddedActiveMQResourceTest.testSendString MultipleEmbeddedActiveMQResourcesTest.testMultipleServers MultipleEmbeddedJMSResourcesTest.testMultipleServers ActiveMQDynamicProducerResourceWithoutAddressTest.testSendString ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.testSendBytesToDefaultAddress ActiveMQDynamicProducerResourceTest.testSendString ActiveMQServerControlTest.testTotalMessageCount EmbeddedActiveMQResourceCustomConfigurationTest.testCustomConfiguration EmbeddedJMSResourceMultipleFileConfigurationTest.testConfiguration EmbeddedJMSResourceQueueTest.testPushObjectMessage EmbeddedJMSResourceSingleFileConfigurationTest.testConfiguration EmbeddedActiveMQResourceFileConfigurationTest.testConfiguredQueue EmbeddedJMSResourceTopicTest.testPushObjectMessage LargeMessageFailoverTest.testTimeoutOnFailoverTransactionCommit Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0c64cbfa Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0c64cbfa Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0c64cbfa Branch: refs/heads/master Commit: 0c64cbfa4e78208b1e262d6c60613c738b211fe1 Parents: 872c35e Author: Erich Duda <[email protected]> Authored: Wed Feb 8 12:21:58 2017 +0100 Committer: Erich Duda <[email protected]> Committed: Fri Feb 24 15:17:00 2017 +0100 ---------------------------------------------------------------------- .../utils/ActiveMQScheduledComponentTest.java | 2 +- .../artemis/junit/EmbeddedActiveMQResource.java | 4 ++-- .../ActiveMQDynamicProducerResourceTest.java | 3 +++ ...ducerResourceWithoutAddressExceptionTest.java | 3 +++ ...ynamicProducerResourceWithoutAddressTest.java | 3 +++ .../junit/ActiveMQProducerResourceTest.java | 3 +++ ...dActiveMQResourceCustomConfigurationTest.java | 6 ++++++ ...dedActiveMQResourceFileConfigurationTest.java | 6 ++++++ .../junit/EmbeddedActiveMQResourceTest.java | 3 +++ ...JMSResourceMultipleFileConfigurationTest.java | 6 ++++++ .../junit/EmbeddedJMSResourceQueueTest.java | 4 ++++ ...edJMSResourceSingleFileConfigurationTest.java | 6 ++++++ .../junit/EmbeddedJMSResourceTopicTest.java | 4 ++++ .../MultipleEmbeddedActiveMQResourcesTest.java | 5 +++++ .../junit/MultipleEmbeddedJMSResourcesTest.java | 5 +++++ .../cli/test/WebServerComponentTest.java | 16 ++++++++++++++++ .../tests/integration/client/ReceiveTest.java | 2 +- .../clientcrash/PendingDeliveriesTest.java | 15 +++++++++------ .../cluster/failover/FailoverTest.java | 19 +++++++++++++++++++ .../management/ActiveMQServerControlTest.java | 7 +++++++ .../artemis/tests/util/SpawnedVMSupport.java | 3 ++- 21 files changed, 114 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java ---------------------------------------------------------------------- diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java index 2fcfb1b..76bdea6 100644 --- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java +++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ActiveMQScheduledComponentTest.java @@ -101,7 +101,7 @@ public class ActiveMQScheduledComponentTest { local.stop(); - Assert.assertTrue("just because one took a lot of time, it doesn't mean we can accumulate many, we got " + count + " executions", count.get() < 5 && count.get() > 0); + Assert.assertTrue("just because one took a lot of time, it doesn't mean we can accumulate many, we got " + count + " executions", count.get() <= 5 && count.get() > 0); } @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java index 55d455e..732e8a3 100644 --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java @@ -207,9 +207,9 @@ public class EmbeddedActiveMQResource extends ExternalResource { protected void after() { log.info("Stopping {}: {}", this.getClass().getSimpleName(), getServerName()); - super.after(); - this.stop(); + + super.after(); } public boolean isUseDurableMessage() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java index da3990c..5ce855c 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java @@ -44,6 +44,9 @@ public class ActiveMQDynamicProducerResourceTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); } EmbeddedActiveMQResource server = new EmbeddedActiveMQResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java index 7f6cbb4..9e2e2ba 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java @@ -36,6 +36,9 @@ public class ActiveMQDynamicProducerResourceWithoutAddressExceptionTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); } EmbeddedActiveMQResource server = new EmbeddedActiveMQResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java index e57e175..b516029 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java @@ -45,6 +45,9 @@ public class ActiveMQDynamicProducerResourceWithoutAddressTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); } EmbeddedActiveMQResource server = new EmbeddedActiveMQResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java index df9977d..1405dbc 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java @@ -43,6 +43,9 @@ public class ActiveMQProducerResourceTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); } EmbeddedActiveMQResource server = new EmbeddedActiveMQResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java index 180ef91..27dbf7e 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java @@ -36,6 +36,12 @@ public class EmbeddedActiveMQResourceCustomConfigurationTest { static final String TEST_QUEUE = "test.queue"; static final String TEST_ADDRESS = "test.address"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); + } + CoreQueueConfiguration queueConfiguration = new CoreQueueConfiguration().setAddress(TEST_ADDRESS).setName(TEST_QUEUE); Configuration customConfiguration = new ConfigurationImpl().setPersistenceEnabled(false).setSecurityEnabled(true).addQueueConfiguration(queueConfiguration); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java index 6731f9f..9e98e81 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java @@ -32,6 +32,12 @@ public class EmbeddedActiveMQResourceFileConfigurationTest { static final String TEST_QUEUE = "test.queue"; static final String TEST_ADDRESS = "test.address"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); + } + private EmbeddedActiveMQResource server = new EmbeddedActiveMQResource("embedded-artemis-server.xml"); @Rule http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java index 36f8ad9..a0b321a 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java @@ -45,6 +45,9 @@ public class EmbeddedActiveMQResourceTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); } public EmbeddedActiveMQResource server = new EmbeddedActiveMQResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java index 868f2e4..a5d695b 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java @@ -43,6 +43,12 @@ public class EmbeddedJMSResourceMultipleFileConfigurationTest { static final String ASSERT_PUSHED_FORMAT = "Message should have been pushed a message to %s"; static final String ASSERT_COUNT_FORMAT = "Unexpected message count in destination %s"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); + } + public EmbeddedJMSResource jmsServer = new EmbeddedJMSResource("embedded-artemis-minimal-server.xml", "embedded-artemis-jms-only.xml"); @Rule http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java index 09051c9..8f9c9c3 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java @@ -47,6 +47,10 @@ public class EmbeddedJMSResourceQueueTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); } public EmbeddedJMSResource jmsServer = new EmbeddedJMSResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java index 3cf0cb5..7f2a675 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java @@ -43,6 +43,12 @@ public class EmbeddedJMSResourceSingleFileConfigurationTest { static final String ASSERT_PUSHED_FORMAT = "Message should have been pushed a message to %s"; static final String ASSERT_COUNT_FORMAT = "Unexpected message count in destination %s"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); + } + public EmbeddedJMSResource jmsServer = new EmbeddedJMSResource("embedded-artemis-jms-server.xml"); @Rule http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java index ebe0dc4..0e89de2 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java @@ -54,6 +54,10 @@ public class EmbeddedJMSResourceTopicTest { TEST_PROPERTIES = new HashMap<String, Object>(2); TEST_PROPERTIES.put("PropertyOne", "Property Value 1"); TEST_PROPERTIES.put("PropertyTwo", "Property Value 2"); + + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + ThreadLeakCheckRule.addKownThread("SeedGenerator Thread"); } public EmbeddedJMSResource jmsServer = new EmbeddedJMSResource(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java index 2fa1057..fd8c053 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java @@ -38,6 +38,11 @@ public class MultipleEmbeddedActiveMQResourcesTest { static final String ASSERT_RECEIVED_FORMAT = "Message should have been received from %s"; static final String ASSERT_COUNT_FORMAT = "Unexpected message count in queue %s"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + } + public EmbeddedActiveMQResource serverOne = new EmbeddedActiveMQResource(0); public EmbeddedActiveMQResource serverTwo = new EmbeddedActiveMQResource(1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java index 084b7a2..0c9d90d 100644 --- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java +++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java @@ -34,6 +34,11 @@ public class MultipleEmbeddedJMSResourcesTest { static final String ASSERT_PUSHED_FORMAT = "Message should have been pushed a message to %s"; static final String ASSERT_COUNT_FORMAT = "Unexpected message count in destination %s"; + static { + ThreadLeakCheckRule.addKownThread("MemoryPoolMXBean notification dispatcher"); + ThreadLeakCheckRule.addKownThread("threadDeathWatcher"); + } + public EmbeddedJMSResource jmsServerOne = new EmbeddedJMSResource(0); public EmbeddedJMSResource jmsServerTwo = new EmbeddedJMSResource(1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java ---------------------------------------------------------------------- diff --git a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java index 3660f60..43d9b28 100644 --- a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java +++ b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java @@ -20,6 +20,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import java.net.URI; import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -43,7 +45,9 @@ import io.netty.handler.ssl.SslHandler; import io.netty.util.CharsetUtil; import org.apache.activemq.artemis.component.WebServerComponent; import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; +import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.dto.WebServerDTO; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -54,12 +58,21 @@ public class WebServerComponentTest extends Assert { static final String SECURE_URL = System.getProperty("url", "https://localhost:8448/WebServerComponentTest.txt";); private Bootstrap bootstrap; private EventLoopGroup group; + private List<ActiveMQComponent> testedComponents; @Before public void setupNetty() throws URISyntaxException { // Configure the client. group = new NioEventLoopGroup(); bootstrap = new Bootstrap(); + testedComponents = new ArrayList<>(); + } + + @After + public void tearDown() throws Exception { + for (ActiveMQComponent c : testedComponents) { + c.stop(); + } } @Test @@ -70,6 +83,7 @@ public class WebServerComponentTest extends Assert { WebServerComponent webServerComponent = new WebServerComponent(); Assert.assertFalse(webServerComponent.isStarted()); webServerComponent.configure(webServerDTO, "./src/test/resources/", "./src/test/resources/"); + testedComponents.add(webServerComponent); webServerComponent.start(); // Make the connection attempt. CountDownLatch latch = new CountDownLatch(1); @@ -152,6 +166,7 @@ public class WebServerComponentTest extends Assert { WebServerComponent webServerComponent = new WebServerComponent(); Assert.assertFalse(webServerComponent.isStarted()); webServerComponent.configure(webServerDTO, "./src/test/resources/", "./src/test/resources/"); + testedComponents.add(webServerComponent); webServerComponent.start(); // Make the connection attempt. String keyStoreProvider = "JKS"; @@ -205,6 +220,7 @@ public class WebServerComponentTest extends Assert { WebServerComponent webServerComponent = new WebServerComponent(); Assert.assertFalse(webServerComponent.isStarted()); webServerComponent.configure(webServerDTO, "./src/test/resources/", "./src/test/resources/"); + testedComponents.add(webServerComponent); webServerComponent.start(); // Make the connection attempt. String keyStoreProvider = "JKS"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java index c36404c..89b4b77 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ReceiveTest.java @@ -133,7 +133,7 @@ public class ReceiveTest extends ActiveMQTestBase { public void testReceiveImmediate() throws Exception { // forces perfect round robin - locator.setConsumerWindowSize(1); + locator.setConsumerMaxRate(1); ClientSessionFactory cf = createSessionFactory(locator); ClientSession sendSession = cf.createSession(false, true, true); ClientProducer cp = sendSession.createProducer(addressA); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java index 4a3c62f..9180532 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java @@ -55,6 +55,7 @@ public class PendingDeliveriesTest extends ClientTestBase { private static final String AMQP_URI = "amqp://localhost:61616?amqp.saslLayer=false"; private static final String CORE_URI_NO_RECONNECT = "tcp://localhost:61616?confirmationWindowSize=-1"; private static final String CORE_URI_WITH_RECONNECT = "tcp://localhost:61616?confirmationWindowSize=" + (1024 * 1024); + private static final int NUMBER_OF_MESSAGES = 100; public static void main(String[] arg) { if (arg.length != 3) { @@ -80,7 +81,7 @@ public class PendingDeliveriesTest extends ClientTestBase { MessageConsumer consumer = session.createConsumer(destination); MessageProducer producer = session.createProducer(destination); - for (int i = 0; i < 100; i++) { + for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { producer.send(session.createTextMessage("hello")); } @@ -128,8 +129,10 @@ public class PendingDeliveriesTest extends ClientTestBase { Destination destination = session.createQueue(destinationName); MessageConsumer consumer = session.createConsumer(destination); - for (int i = 0; i < 100; i++) { - Assert.assertNotNull(consumer.receive(1000)); + for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { + // give more time to receive first message but do not wait so long for last as all message were most likely sent + Assert.assertNotNull("consumer.receive(...) returned null for " + i + "th message. Number of expected messages" + + " to be received is " + NUMBER_OF_MESSAGES, i == NUMBER_OF_MESSAGES - 1 ? consumer.receive(500) : consumer.receive(5000)); } } finally { connection.stop(); @@ -155,14 +158,14 @@ public class PendingDeliveriesTest extends ClientTestBase { MessageConsumer consumer = session.createConsumer(destination); int i = 0; - for (; i < 100; i++) { - Message msg = consumer.receive(100); + for (; i < NUMBER_OF_MESSAGES; i++) { + Message msg = consumer.receive(1000); if (msg == null) { break; } } - Assert.assertTrue(i < 100); + Assert.assertTrue(i < NUMBER_OF_MESSAGES); } finally { connection.stop(); connection.close(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java index def63a6..f5cf764 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java @@ -44,6 +44,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.MessageHandler; import org.apache.activemq.artemis.api.core.client.ServerLocator; +import org.apache.activemq.artemis.api.core.client.SessionFailureListener; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal; import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.cluster.ha.BackupPolicy; @@ -337,6 +338,23 @@ public class FailoverTest extends FailoverTestBase { session.createQueue(FailoverTestBase.ADDRESS, RoutingType.MULTICAST, FailoverTestBase.ADDRESS, null, true); + final CountDownLatch connectionFailed = new CountDownLatch(1); + + session.addFailureListener(new SessionFailureListener() { + @Override + public void beforeReconnect(ActiveMQException exception) { + } + + @Override + public void connectionFailed(ActiveMQException exception, boolean failedOver) { + } + + @Override + public void connectionFailed(ActiveMQException exception, boolean failedOver, String scaleDownTargetNodeID) { + connectionFailed.countDown(); + } + }); + final ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS); Xid xid = new XidImpl("uhuhuhu".getBytes(), 126512, "auhsduashd".getBytes()); @@ -358,6 +376,7 @@ public class FailoverTest extends FailoverTestBase { session.commit(xid, false); } catch (XAException e) { //there is still an edge condition that we must deal with + Assert.assertTrue(connectionFailed.await(10, TimeUnit.SECONDS)); session.commit(xid, false); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 75b7832..eb83031 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -53,6 +53,7 @@ import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; +import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy; @@ -1019,6 +1020,12 @@ public class ActiveMQServerControlTest extends ManagementTestBase { session.commit(); + // flush executors on queues so we can get precise number of messages + Queue queue1 = server.locateQueue(SimpleString.toSimpleString(random1)); + queue1.flushExecutor(); + Queue queue2 = server.locateQueue(SimpleString.toSimpleString(random1)); + queue2.flushExecutor(); + assertEquals(2, serverControl.getTotalMessageCount()); session.deleteQueue(random1); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c64cbfa/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java index 57bc23a..703c848 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java @@ -90,7 +90,8 @@ public final class SpawnedVMSupport { final String... args) throws Exception { ProcessBuilder builder = new ProcessBuilder(); final String javaPath = Paths.get(System.getProperty("java.home"), "bin", "java").toAbsolutePath().toString(); - builder.command(javaPath, memoryArg1, memoryArg2, "-cp", System.getProperty("java.class.path")); + builder.command(javaPath, memoryArg1, memoryArg2); + builder.environment().put("CLASSPATH", System.getProperty("java.class.path")); List<String> commandList = builder.command();
