You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/08/08 15:35:20 UTC
[1/3] activemq-artemis git commit: This closes #2224
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7480452bd -> 99469b1cf
This closes #2224
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/99469b1c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/99469b1c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/99469b1c
Branch: refs/heads/master
Commit: 99469b1cff805f9cac00f8fd4a5e8b6c5b40bc0d
Parents: 7480452 8274703
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Aug 8 11:35:14 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:35:14 2018 -0400
----------------------------------------------------------------------
.../integration/amqp/AmqpClientTestSupport.java | 2 +-
.../management/QueueControlTest.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: NO-JIRA improve assertions in
QueueControlTest
Posted by cl...@apache.org.
NO-JIRA improve assertions in QueueControlTest
This commit replaces assert{True,Equals} with more specific assertion methods.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/82747031
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/82747031
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/82747031
Branch: refs/heads/master
Commit: 8274703153846c964da71e68d61a5c6e4637ccc6
Parents: 05816fe
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 21:01:04 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:35:14 2018 -0400
----------------------------------------------------------------------
.../management/QueueControlTest.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82747031/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
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 123f581..9a68bad 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 class QueueControlTest extends ManagementTestBase {
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 class QueueControlTest extends ManagementTestBase {
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(queue.toString(), queueControl.getName());
- Assert.assertEquals(null, queueControl.getFilter());
+ Assert.assertNull(queueControl.getFilter());
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
assertTrue(queueMemorySize1.get() > 0);
- assertTrue(queueMemorySize2.get() == 0);
+ assertEquals(0, queueMemorySize2.get());
// Read and rollback all messages to DLQ
ClientConsumer clientConsumer = session.createConsumer(qName);
@@ -1042,7 +1042,7 @@ public class QueueControlTest extends ManagementTestBase {
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);
@@ -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
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++) {
@@ -1069,8 +1069,8 @@ public class QueueControlTest extends ManagementTestBase {
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());
}
/**
@@ -1521,7 +1521,7 @@ public class QueueControlTest extends ManagementTestBase {
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);
@@ -1545,7 +1545,7 @@ public class QueueControlTest extends ManagementTestBase {
producer.send(message);
}
- Assert.assertEquals(true, queue.getPageSubscription().isPaging());
+ Assert.assertTrue(queue.getPageSubscription().isPaging());
QueueControl queueControl = createManagementControl(address, queueName);
assertMessageMetrics(queueControl, numberOfMessages, durable);
@@ -2570,7 +2570,7 @@ public class QueueControlTest extends ManagementTestBase {
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);
@@ -2582,7 +2582,7 @@ public class QueueControlTest extends ManagementTestBase {
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);
}
[3/3] activemq-artemis git commit: NO-JIRA fix unused parameter
`durable` in AmqpClientTestSupport#sendMessages
Posted by cl...@apache.org.
NO-JIRA fix unused parameter `durable` in AmqpClientTestSupport#sendMessages
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/05816fef
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/05816fef
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/05816fef
Branch: refs/heads/master
Commit: 05816fefab47a4f440b2d228624294433e8e86e0
Parents: 7480452
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 16:42:04 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:35:14 2018 -0400
----------------------------------------------------------------------
.../artemis/tests/integration/amqp/AmqpClientTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/05816fef/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
----------------------------------------------------------------------
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 d7cf3f4..5d8c681 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 @@ public class AmqpClientTestSupport extends AmqpTestSupport {
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());
}