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

This closes #2224

This commit is contained in:
Clebert Suconic 2018-08-08 11:35:14 -04:00
parent 7480452bdd 8274703153
commit 99469b1cff
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
View File

@ -326,7 +326,7 @@ public class AmqpClientTestSupport extends AmqpTestSupport {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
AmqpMessage message = new AmqpMessage(); AmqpMessage message = new AmqpMessage();
message.setMessageId("MessageID:" + i); message.setMessageId("MessageID:" + i);
message.setDurable(true); message.setDurable(durable);
if (routingType != null) { if (routingType != null) {
message.setMessageAnnotation(AMQPMessageSupport.ROUTING_TYPE.toString(), routingType.getType()); message.setMessageAnnotation(AMQPMessageSupport.ROUTING_TYPE.toString(), routingType.getType());
} }

22
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
View File

@ -112,7 +112,7 @@ public class QueueControlTest extends ManagementTestBase {
Assert.assertEquals(address.toString(), queueControl.getAddress()); Assert.assertEquals(address.toString(), queueControl.getAddress());
Assert.assertEquals(filter.toString(), queueControl.getFilter()); Assert.assertEquals(filter.toString(), queueControl.getFilter());
Assert.assertEquals(durable, queueControl.isDurable()); Assert.assertEquals(durable, queueControl.isDurable());
Assert.assertEquals(false, queueControl.isTemporary()); Assert.assertFalse(queueControl.isTemporary());
session.deleteQueue(queue); session.deleteQueue(queue);
} }
@ -126,7 +126,7 @@ public class QueueControlTest extends ManagementTestBase {
QueueControl queueControl = createManagementControl(address, queue); QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(queue.toString(), queueControl.getName()); Assert.assertEquals(queue.toString(), queueControl.getName());
Assert.assertEquals(null, queueControl.getFilter()); Assert.assertNull(queueControl.getFilter());
session.deleteQueue(queue); session.deleteQueue(queue);
} }
@ -1027,7 +1027,7 @@ public class QueueControlTest extends ManagementTestBase {
//Verify that original queue has a memory size greater than 0 and DLQ is 0 //Verify that original queue has a memory size greater than 0 and DLQ is 0
assertTrue(queueMemorySize1.get() > 0); assertTrue(queueMemorySize1.get() > 0);
assertTrue(queueMemorySize2.get() == 0); assertEquals(0, queueMemorySize2.get());
// Read and rollback all messages to DLQ // Read and rollback all messages to DLQ
ClientConsumer clientConsumer = session.createConsumer(qName); ClientConsumer clientConsumer = session.createConsumer(qName);
@ -1042,7 +1042,7 @@ public class QueueControlTest extends ManagementTestBase {
Assert.assertNull(clientConsumer.receiveImmediate()); Assert.assertNull(clientConsumer.receiveImmediate());
//Verify that original queue has a memory size of 0 and DLQ is greater than 0 after rollback //Verify that original queue has a memory size of 0 and DLQ is greater than 0 after rollback
assertTrue(queueMemorySize1.get() == 0); assertEquals(0, queueMemorySize1.get());
assertTrue(queueMemorySize2.get() > 0); assertTrue(queueMemorySize2.get() > 0);
QueueControl dlqQueueControl = createManagementControl(dla, dlq); QueueControl dlqQueueControl = createManagementControl(dla, dlq);
@ -1056,7 +1056,7 @@ public class QueueControlTest extends ManagementTestBase {
//Verify that original queue has a memory size of greater than 0 and DLQ is 0 after move //Verify that original queue has a memory size of greater than 0 and DLQ is 0 after move
assertTrue(queueMemorySize1.get() > 0); assertTrue(queueMemorySize1.get() > 0);
assertTrue(queueMemorySize2.get() == 0); assertEquals(0, queueMemorySize2.get());
// .. and that the messages is now on the original queue once more. // .. and that the messages is now on the original queue once more.
for (int i = 0; i < numMessagesToTest; i++) { for (int i = 0; i < numMessagesToTest; i++) {
@ -1069,8 +1069,8 @@ public class QueueControlTest extends ManagementTestBase {
clientConsumer.close(); clientConsumer.close();
//Verify that original queue and DLQ have a memory size of 0 //Verify that original queue and DLQ have a memory size of 0
assertTrue(queueMemorySize1.get() == 0); assertEquals(0, queueMemorySize1.get());
assertTrue(queueMemorySize2.get() == 0); assertEquals(0, queueMemorySize2.get());
} }
/** /**
@ -1521,7 +1521,7 @@ public class QueueControlTest extends ManagementTestBase {
session.createQueue(address, RoutingType.MULTICAST, queueName, null, durable); session.createQueue(address, RoutingType.MULTICAST, queueName, null, durable);
Queue queue = server.locateQueue(queueName); Queue queue = server.locateQueue(queueName);
Assert.assertEquals(false, queue.getPageSubscription().isPaging()); Assert.assertFalse(queue.getPageSubscription().isPaging());
ClientProducer producer = session.createProducer(address); ClientProducer producer = session.createProducer(address);
@ -1545,7 +1545,7 @@ public class QueueControlTest extends ManagementTestBase {
producer.send(message); producer.send(message);
} }
Assert.assertEquals(true, queue.getPageSubscription().isPaging()); Assert.assertTrue(queue.getPageSubscription().isPaging());
QueueControl queueControl = createManagementControl(address, queueName); QueueControl queueControl = createManagementControl(address, queueName);
assertMessageMetrics(queueControl, numberOfMessages, durable); assertMessageMetrics(queueControl, numberOfMessages, durable);
@ -2570,7 +2570,7 @@ public class QueueControlTest extends ManagementTestBase {
final LocalQueueBinding binding = (LocalQueueBinding) server.getPostOffice().getBinding(queue); final LocalQueueBinding binding = (LocalQueueBinding) server.getPostOffice().getBinding(queue);
Queue q = binding.getQueue(); Queue q = binding.getQueue();
AtomicInteger queueMemorySize1 = (AtomicInteger) queueMemorySizeField.get(q); AtomicInteger queueMemorySize1 = (AtomicInteger) queueMemorySizeField.get(q);
assertTrue(queueMemorySize1.get() == 0); assertEquals(0, queueMemorySize1.get());
ClientProducer producer = session.createProducer(address); ClientProducer producer = session.createProducer(address);
ClientMessage message = session.createMessage(durable); ClientMessage message = session.createMessage(durable);
@ -2582,7 +2582,7 @@ public class QueueControlTest extends ManagementTestBase {
Assert.assertEquals(0, queueControl.getMessageCount()); Assert.assertEquals(0, queueControl.getMessageCount());
//Verify that original queue has a memory size of 0 //Verify that original queue has a memory size of 0
assertTrue(queueMemorySize1.get() == 0); assertEquals(0, queueMemorySize1.get());
session.deleteQueue(queue); session.deleteQueue(queue);
} }