From 78ddb155db6a0eec568d99d28b7cb9b7b4a74181 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Tue, 7 Aug 2018 16:42:04 +0200 Subject: [PATCH 1/2] NO-JIRA fix unused parameter `durable` in AmqpClientTestSupport#sendMessages --- .../artemis/tests/integration/amqp/AmqpClientTestSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java index d7cf3f493ca..5d8c68100c4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java @@ -326,7 +326,7 @@ protected void sendMessages(String destinationName, int count, RoutingType routi for (int i = 0; i < count; ++i) { AmqpMessage message = new AmqpMessage(); message.setMessageId("MessageID:" + i); - message.setDurable(true); + message.setDurable(durable); if (routingType != null) { message.setMessageAnnotation(AMQPMessageSupport.ROUTING_TYPE.toString(), routingType.getType()); } From 4fb3f5efe786bfd36c8699650e4675bea7058109 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Tue, 7 Aug 2018 21:01:04 +0200 Subject: [PATCH 2/2] NO-JIRA improve assertions in QueueControlTest This commit replaces assert{True,Equals} with more specific assertion methods. --- .../management/QueueControlTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index da8ea17df05..66270dd5994 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -112,7 +112,7 @@ public void testAttributes() throws Exception { Assert.assertEquals(address.toString(), queueControl.getAddress()); Assert.assertEquals(filter.toString(), queueControl.getFilter()); Assert.assertEquals(durable, queueControl.isDurable()); - Assert.assertEquals(false, queueControl.isTemporary()); + Assert.assertFalse(queueControl.isTemporary()); session.deleteQueue(queue); } @@ -126,7 +126,7 @@ public void testGetNullFilter() throws Exception { QueueControl queueControl = createManagementControl(address, queue); Assert.assertEquals(queue.toString(), queueControl.getName()); - Assert.assertEquals(null, queueControl.getFilter()); + Assert.assertNull(queueControl.getFilter()); session.deleteQueue(queue); } @@ -1031,7 +1031,7 @@ public void testRetryMultipleMessages() throws Exception { //Verify that original queue has a memory size greater than 0 and DLQ is 0 assertTrue(queueMemorySize1.get() > 0); - assertTrue(queueMemorySize2.get() == 0); + assertEquals(0, queueMemorySize2.get()); // Read and rollback all messages to DLQ ClientConsumer clientConsumer = session.createConsumer(qName); @@ -1046,7 +1046,7 @@ public void testRetryMultipleMessages() throws Exception { Assert.assertNull(clientConsumer.receiveImmediate()); //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); QueueControl dlqQueueControl = createManagementControl(dla, dlq); @@ -1060,7 +1060,7 @@ public void testRetryMultipleMessages() throws Exception { //Verify that original queue has a memory size of greater than 0 and DLQ is 0 after move assertTrue(queueMemorySize1.get() > 0); - assertTrue(queueMemorySize2.get() == 0); + assertEquals(0, queueMemorySize2.get()); // .. and that the messages is now on the original queue once more. for (int i = 0; i < numMessagesToTest; i++) { @@ -1073,8 +1073,8 @@ public void testRetryMultipleMessages() throws Exception { clientConsumer.close(); //Verify that original queue and DLQ have a memory size of 0 - assertTrue(queueMemorySize1.get() == 0); - assertTrue(queueMemorySize2.get() == 0); + assertEquals(0, queueMemorySize1.get()); + assertEquals(0, queueMemorySize2.get()); } /** @@ -1525,7 +1525,7 @@ public void testRemoveAllWithPagingMode() throws Exception { session.createQueue(address, RoutingType.MULTICAST, queueName, null, durable); Queue queue = server.locateQueue(queueName); - Assert.assertEquals(false, queue.getPageSubscription().isPaging()); + Assert.assertFalse(queue.getPageSubscription().isPaging()); ClientProducer producer = session.createProducer(address); @@ -1549,7 +1549,7 @@ public void testRemoveAllWithPagingMode() throws Exception { producer.send(message); } - Assert.assertEquals(true, queue.getPageSubscription().isPaging()); + Assert.assertTrue(queue.getPageSubscription().isPaging()); QueueControl queueControl = createManagementControl(address, queueName); assertMessageMetrics(queueControl, numberOfMessages, durable); @@ -2573,7 +2573,7 @@ public void testGetScheduledCountOnRemove() throws Exception { final LocalQueueBinding binding = (LocalQueueBinding) server.getPostOffice().getBinding(queue); Queue q = binding.getQueue(); AtomicInteger queueMemorySize1 = (AtomicInteger) queueMemorySizeField.get(q); - assertTrue(queueMemorySize1.get() == 0); + assertEquals(0, queueMemorySize1.get()); ClientProducer producer = session.createProducer(address); ClientMessage message = session.createMessage(durable); @@ -2585,7 +2585,7 @@ public void testGetScheduledCountOnRemove() throws Exception { Assert.assertEquals(0, queueControl.getMessageCount()); //Verify that original queue has a memory size of 0 - assertTrue(queueMemorySize1.get() == 0); + assertEquals(0, queueMemorySize1.get()); session.deleteQueue(queue); }