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

NO-JIRA fix Intermittent failures in artemis-junit

This commit is contained in:
Clebert Suconic 2019-05-20 15:37:44 -04:00
parent 57cfb5d192
commit 2cf7c32128
14 changed files with 16 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ThreadLeakCheckRule.java
View File

@ -41,6 +41,13 @@ public class ThreadLeakCheckRule extends ExternalResource {
private static Set<String> knownThreads = new HashSet<>();
static {
addKownThread("MemoryPoolMXBean notification dispatcher");
addKownThread("threadDeathWatcher");
addKownThread("SeedGenerator Thread");
addKownThread("Attach Listener");
}
boolean enabled = true;
private Map<Thread, StackTraceElement[]> previousThreads;

14
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java
View File

@ -26,7 +26,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class ActiveMQDynamicProducerResourceTest {
@ -44,9 +43,6 @@ 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();
@ -63,14 +59,8 @@ public class ActiveMQDynamicProducerResourceTest {
public void tearDown() throws Exception {
assertNotNull(String.format(ASSERT_SENT_FORMAT, TEST_QUEUE_ONE), sentOne);
assertNotNull(String.format(ASSERT_SENT_FORMAT, TEST_QUEUE_TWO), sentTwo);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return server.getMessageCount(TEST_QUEUE_ONE) == 1 && server.getMessageCount(TEST_QUEUE_TWO) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_ONE), 1, server.getMessageCount(TEST_QUEUE_ONE));
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_TWO), 1, server.getMessageCount(TEST_QUEUE_TWO));
Wait.assertEquals(1L, () -> server.getMessageCount(TEST_QUEUE_ONE), 30_000, 10);
Wait.assertEquals(1L, () -> server.getMessageCount(TEST_QUEUE_TWO), 30_000, 10);
ClientMessage receivedOne = server.receiveMessage(TEST_QUEUE_ONE);
assertNotNull(String.format(ASSERT_RECEIVED_FORMAT, TEST_QUEUE_ONE), receivedOne);

3
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java
View File

@ -37,9 +37,6 @@ 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();

14
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class ActiveMQDynamicProducerResourceWithoutAddressTest {
@ -45,9 +44,6 @@ 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();
@ -71,14 +67,8 @@ public class ActiveMQDynamicProducerResourceWithoutAddressTest {
public void tearDown() throws Exception {
assertNotNull(String.format(ASSERT_SENT_FORMAT, TEST_QUEUE_ONE), sentOne);
assertNotNull(String.format(ASSERT_SENT_FORMAT, TEST_QUEUE_TWO), sentTwo);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return server.getMessageCount(TEST_QUEUE_ONE) == 1 && server.getMessageCount(TEST_QUEUE_TWO) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_ONE), 1, server.getMessageCount(TEST_QUEUE_ONE));
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_TWO), 1, server.getMessageCount(TEST_QUEUE_TWO));
Wait.assertEquals(1L, ()-> server.getMessageCount(TEST_QUEUE_ONE), 30_000, 10);
Wait.assertEquals(1L, ()-> server.getMessageCount(TEST_QUEUE_TWO), 30_000, 10);
ClientMessage receivedOne = server.receiveMessage(TEST_QUEUE_ONE);
assertNotNull(String.format(ASSERT_RECEIVED_FORMAT, TEST_QUEUE_ONE), receivedOne);

3
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java
View File

@ -43,9 +43,6 @@ 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();

6
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java
View File

@ -37,12 +37,6 @@ 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);

6
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java
View File

@ -33,12 +33,6 @@ 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

12
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java
View File

@ -27,7 +27,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class EmbeddedActiveMQResourceTest {
@ -45,9 +44,6 @@ 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();
@ -65,13 +61,7 @@ public class EmbeddedActiveMQResourceTest {
@After
public void tearDown() throws Exception {
assertNotNull(String.format(ASSERT_SENT_FORMAT, TEST_ADDRESS), sent);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return server.getMessageCount(TEST_QUEUE) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE), 1, server.getMessageCount(TEST_QUEUE));
Wait.assertEquals(1L, () -> server.getMessageCount(TEST_QUEUE), 30_000, 10);
ClientMessage received = server.receiveMessage(TEST_QUEUE);
assertNotNull(String.format(ASSERT_RECEIVED_FORMAT, TEST_ADDRESS), received);

6
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceMultipleFileConfigurationTest.java
View File

@ -43,12 +43,6 @@ 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

13
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java
View File

@ -26,7 +26,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class EmbeddedJMSResourceQueueTest {
@ -47,10 +46,6 @@ 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();
@ -63,13 +58,7 @@ public class EmbeddedJMSResourceQueueTest {
@After
public void tearDown() throws Exception {
assertNotNull(String.format(ASSERT_PUSHED_FORMAT, TEST_DESTINATION_NAME), pushed);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return jmsServer.getMessageCount(TEST_DESTINATION_NAME) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_DESTINATION_NAME), 1, jmsServer.getMessageCount(TEST_DESTINATION_NAME));
Wait.assertEquals(1L, () -> jmsServer.getMessageCount(TEST_DESTINATION_NAME), (long)30_000, (long)10);
}
@Test

6
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceSingleFileConfigurationTest.java
View File

@ -43,12 +43,6 @@ 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

13
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceTopicTest.java
View File

@ -33,7 +33,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class EmbeddedJMSResourceTopicTest {
@ -54,10 +53,6 @@ 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();
@ -84,13 +79,7 @@ public class EmbeddedJMSResourceTopicTest {
@After
public void tearDown() throws Exception {
assertNotNull(String.format(ASSERT_PUSHED_FORMAT, TEST_DESTINATION_NAME), pushed);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return jmsServer.getMessageCount(TEST_DESTINATION_NAME) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_DESTINATION_NAME), 1, jmsServer.getMessageCount(TEST_DESTINATION_NAME));
Wait.assertEquals(1L, () -> jmsServer.getMessageCount(TEST_DESTINATION_NAME), (long)30_000, (long)10);
consumer.close();
session.close();

5
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java
View File

@ -39,11 +39,6 @@ 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);

17
artemis-junit/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedJMSResourcesTest.java
View File

@ -24,7 +24,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class MultipleEmbeddedJMSResourcesTest {
@ -36,11 +35,6 @@ 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);
@ -58,15 +52,8 @@ public class MultipleEmbeddedJMSResourcesTest {
Message pushedTwo = jmsServerTwo.pushMessage(TEST_QUEUE_TWO, TEST_BODY);
assertNotNull(String.format(ASSERT_PUSHED_FORMAT, TEST_QUEUE_TWO), pushedTwo);
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
return jmsServerOne.getMessageCount(TEST_QUEUE_ONE) == 1 && jmsServerTwo.getMessageCount(TEST_QUEUE_TWO) == 1;
}
}, 5000, 100);
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_ONE), 1, jmsServerOne.getMessageCount(TEST_QUEUE_ONE));
assertEquals(String.format(ASSERT_COUNT_FORMAT, TEST_QUEUE_TWO), 1, jmsServerTwo.getMessageCount(TEST_QUEUE_TWO));
Wait.assertEquals(1L, () -> jmsServerOne.getMessageCount(TEST_QUEUE_ONE), 30_000, 10);
Wait.assertEquals(1L, () -> jmsServerTwo.getMessageCount(TEST_QUEUE_TWO), 30_000, 10);
}
}