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

ARTEMIS-3529 Tweaks on test - Removing AssertionLogger and reformat

This commit is contained in:
Clebert Suconic 2021-10-13 19:14:42 -04:00
parent 1d84800d5a
commit fd12209488
1 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MoveMessageDuplicateIDTest.java
View File

@ -23,7 +23,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TextMessage; import javax.jms.TextMessage;
import javax.jms.Topic; import javax.jms.Topic;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -32,7 +31,6 @@ import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
import org.apache.activemq.artemis.tests.util.CFUtil; import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.JMSTestBase; import org.apache.activemq.artemis.tests.util.JMSTestBase;
@ -44,17 +42,15 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public class MoveMessageDuplicateIDTest extends JMSTestBase { public class MoveMessageDuplicateIDTest extends JMSTestBase {
@Parameterized.Parameter(0) @Parameterized.Parameter(0)
public String protocol = "AMQP"; public String protocol = "AMQP";
@Parameterized.Parameters(name = "protocol={0}") @Parameterized.Parameters(name = "protocol={0}")
public static Collection<Object[]> parameters() { public static Collection<Object[]> parameters() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][]{{"AMQP"}, {"CORE"}, {"OPENWIRE"}});
{"AMQP"},
{"CORE"},
{"OPENWIRE"}
});
} }
@Override @Override
protected Configuration createDefaultConfig(boolean netty) throws Exception { protected Configuration createDefaultConfig(boolean netty) throws Exception {
return super.createDefaultConfig(netty).setMessageExpiryScanPeriod(50); return super.createDefaultConfig(netty).setMessageExpiryScanPeriod(50);
@ -63,66 +59,58 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase {
@Test @Test
public void testTwoQueuesSingleDLQ() throws Exception { public void testTwoQueuesSingleDLQ() throws Exception {
AssertionLoggerHandler.startCapture(); server.getAddressSettingsRepository().clear();
try { server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString("JUNKYARD")).setExpiryAddress(SimpleString.toSimpleString("JUNKYARD")).setMaxDeliveryAttempts(1));
server.getAddressSettingsRepository().clear();
server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString("JUNKYARD")).setExpiryAddress(SimpleString.toSimpleString("JUNKYARD")).setMaxDeliveryAttempts(1));
createQueue("JUNKYARD"); createQueue("JUNKYARD");
Queue junkQueue = server.locateQueue("JUNKYARD"); Queue junkQueue = server.locateQueue("JUNKYARD");
Assert.assertNotNull(junkQueue); Assert.assertNotNull(junkQueue);
javax.jms.Queue queue1 = createQueue("q1"); javax.jms.Queue queue1 = createQueue("q1");
javax.jms.Queue queue2 = createQueue("q2"); javax.jms.Queue queue2 = createQueue("q2");
ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616");
Connection conn = factory.createConnection(); Connection conn = factory.createConnection();
Session sess = conn.createSession(true, Session.SESSION_TRANSACTED); Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
MessageProducer prod1 = sess.createProducer(queue1); MessageProducer prod1 = sess.createProducer(queue1);
MessageProducer prod2 = sess.createProducer(queue2); MessageProducer prod2 = sess.createProducer(queue2);
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
TextMessage txt = sess.createTextMessage("txt"); TextMessage txt = sess.createTextMessage("txt");
txt.setStringProperty("_AMQ_DUPL_ID", "" + i); txt.setStringProperty("_AMQ_DUPL_ID", "" + i);
prod1.send(txt); prod1.send(txt);
prod2.send(txt); prod2.send(txt);
}
sess.commit();
conn.start();
MessageConsumer consumer = sess.createConsumer(queue1);
for (int i = 0; i < 100; i++) {
TextMessage textMessage = (TextMessage) consumer.receive(5000);
Assert.assertNotNull(textMessage);
}
sess.rollback();
Assert.assertNull(consumer.receiveNoWait());
consumer.close();
Wait.assertEquals(100L, junkQueue::getMessageCount, 2000, 10);
consumer = sess.createConsumer(queue2);
for (int i = 0; i < 100; i++) {
TextMessage textMessage = (TextMessage) consumer.receive(5000);
Assert.assertNotNull(textMessage);
}
sess.rollback();
Assert.assertNull(consumer.receiveNoWait());
consumer.close();
conn.close();
Wait.assertEquals(200L, junkQueue::getMessageCount, 2000, 10);
} finally {
AssertionLoggerHandler.stopCapture();
} }
sess.commit();
conn.start();
MessageConsumer consumer = sess.createConsumer(queue1);
for (int i = 0; i < 100; i++) {
TextMessage textMessage = (TextMessage) consumer.receive(5000);
Assert.assertNotNull(textMessage);
}
sess.rollback();
Assert.assertNull(consumer.receiveNoWait());
consumer.close();
Wait.assertEquals(100L, junkQueue::getMessageCount, 2000, 10);
consumer = sess.createConsumer(queue2);
for (int i = 0; i < 100; i++) {
TextMessage textMessage = (TextMessage) consumer.receive(5000);
Assert.assertNotNull(textMessage);
}
sess.rollback();
Assert.assertNull(consumer.receiveNoWait());
consumer.close();
conn.close();
Wait.assertEquals(200L, junkQueue::getMessageCount, 2000, 10);
} }
@Test @Test
public void testMultiplSubscriptionSingleExpire() throws Exception { public void testMultiplSubscriptionSingleExpire() throws Exception {
server.getAddressSettingsRepository().clear(); server.getAddressSettingsRepository().clear();
@ -205,9 +193,6 @@ public class MoveMessageDuplicateIDTest extends JMSTestBase {
conn.close(); conn.close();
Wait.assertEquals(200L, junkQueue::getMessageCount, 2000, 10); Wait.assertEquals(200L, junkQueue::getMessageCount, 2000, 10);
} }
} }