[activemq-artemis] 01/04: ARTEMIS-2937 Cleanup on tests

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 753dac47d8f407f94f672718bb416c6f5385b0de
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Oct 28 17:34:28 2020 -0400

    ARTEMIS-2937 Cleanup on tests
---
 .../apache/activemq/artemis/utils/collections/LinkedListImpl.java  | 5 ++---
 .../artemis/tests/integration/amqp/connect/AMQPReplicaTest.java    | 1 -
 .../apache/activemq/artemis/tests/unit/util/LinkedListTest.java    | 7 +++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LinkedListImpl.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LinkedListImpl.java
index 1569508..f9a3940 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LinkedListImpl.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LinkedListImpl.java
@@ -131,9 +131,8 @@ public class LinkedListImpl<E> implements LinkedList<E> {
          return null;
       }
 
-      if (node.prev != null) {
-         removeAfter(node.prev);
-      }
+      // the node will always have a prev element
+      removeAfter(node.prev);
       return node.val();
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPReplicaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPReplicaTest.java
index 219eaf7..eb5b202 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPReplicaTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPReplicaTest.java
@@ -668,7 +668,6 @@ public class AMQPReplicaTest extends AmqpClientTestSupport {
       for (int i = START_ID; i <= LAST_ID; i++) {
          Message message = consumer.receive(3000);
          Assert.assertNotNull(message);
-         System.out.println("port " + port + ",i::" + message.getIntProperty("i"));
          Assert.assertEquals(i, message.getIntProperty("i"));
          if (message instanceof TextMessage) {
             Assert.assertEquals(getText(largeMessage, i), ((TextMessage) message).getText());
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
index 7d9e27f..cd22712 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/LinkedListTest.java
@@ -202,6 +202,13 @@ public class LinkedListTest extends ActiveMQTestBase {
       if (deferSupplier) {
          Assert.assertEquals(0, objs.getSizeOfSuppliedIDs());
          objs.setIDSupplier(source -> source.id);
+      } else {
+         // clear the ID supplier
+         objs.clearID();
+         // and redo it
+         Assert.assertEquals(0, objs.getSizeOfSuppliedIDs());
+         objs.setIDSupplier(source -> source.id);
+         Assert.assertEquals(1000, objs.size());
       }
 
       Assert.assertEquals(1000, objs.getSizeOfSuppliedIDs());