[1/3] activemq-artemis git commit: This closes #2441

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/3] activemq-artemis git commit: This closes #2441

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 4231d660c -> 280ea56d8


This closes #2441


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/280ea56d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/280ea56d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/280ea56d

Branch: refs/heads/master
Commit: 280ea56d8b1466a38f044454c00f53fc83f581d8
Parents: 4231d66 56c7fb1
Author: Justin Bertram <[hidden email]>
Authored: Thu Dec 13 10:53:34 2018 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Thu Dec 13 10:53:34 2018 -0600

----------------------------------------------------------------------
 .../artemis/protocol/amqp/broker/AMQPMessageTest.java       | 9 +++++----
 .../converter/message/JMSMappingInboundTransformerTest.java | 1 +
 .../activemq/artemis/rest/test/ClientAckQueueTest.java      | 8 ++++----
 .../activemq/artemis/rest/test/ClientAckTopicTest.java      | 2 +-
 .../cluster/distribution/SimpleSymmetricClusterTest.java    | 5 ++++-
 5 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/3] activemq-artemis git commit: NO-JIRA Add forgotten @Test annotation and make helper methods private

jbertram
NO-JIRA Add forgotten @Test annotation and make helper methods private


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/56c7fb1a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/56c7fb1a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/56c7fb1a

Branch: refs/heads/master
Commit: 56c7fb1a954b1c7e545a47651cb345bdc6be660c
Parents: 94c158e
Author: Jiri Danek <[hidden email]>
Authored: Sat Jul 14 23:52:02 2018 +0200
Committer: Justin Bertram <[hidden email]>
Committed: Thu Dec 13 10:53:34 2018 -0600

----------------------------------------------------------------------
 .../converter/message/JMSMappingInboundTransformerTest.java  | 1 +
 .../activemq/artemis/rest/test/ClientAckQueueTest.java       | 8 ++++----
 .../activemq/artemis/rest/test/ClientAckTopicTest.java       | 2 +-
 .../cluster/distribution/SimpleSymmetricClusterTest.java     | 5 ++++-
 4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56c7fb1a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformerTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformerTest.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformerTest.java
index 691bb0d..d7cd714 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformerTest.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformerTest.java
@@ -150,6 +150,7 @@ public class JMSMappingInboundTransformerTest {
     * @throws Exception
     *         if an error occurs during the test.
     */
+   @Test
    public void testCreateBytesMessageFromDataWithUnknownContentType() throws Exception {
       MessageImpl message = (MessageImpl) Message.Factory.create();
       Binary binary = new Binary(new byte[0]);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56c7fb1a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java
index 145ddec..2cccbd1 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckQueueTest.java
@@ -52,7 +52,7 @@ public class ClientAckQueueTest extends MessageTestBase {
       testAckTimeout();
    }
 
-   public void testAckTimeout() throws Exception {
+   private void testAckTimeout() throws Exception {
       ClientRequest request = new ClientRequest(generateURL("/queues/testAck"));
 
       ClientResponse<?> response = Util.head(request);
@@ -127,7 +127,7 @@ public class ClientAckQueueTest extends MessageTestBase {
       testSuccessFirst(3, testName);
    }
 
-   public void testSuccessFirst(int start, String queueName) throws Exception {
+   private void testSuccessFirst(int start, String queueName) throws Exception {
       ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName)));
 
       ClientResponse<?> response = Util.head(request);
@@ -205,7 +205,7 @@ public class ClientAckQueueTest extends MessageTestBase {
       testPull(4, testName);
    }
 
-   public void testPull(int start, String queueName) throws Exception {
+   private void testPull(int start, String queueName) throws Exception {
       ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName)));
 
       ClientResponse<?> response = Util.head(request);
@@ -287,7 +287,7 @@ public class ClientAckQueueTest extends MessageTestBase {
       testReconnect(testName);
    }
 
-   public void testReconnect(String queueName) throws Exception {
+   private void testReconnect(String queueName) throws Exception {
       ClientRequest request = new ClientRequest(generateURL(Util.getUrlPath(queueName)));
 
       ClientResponse<?> response = Util.head(request);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56c7fb1a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java
index 26c0b5c..5194c35 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/ClientAckTopicTest.java
@@ -51,7 +51,7 @@ public class ClientAckTopicTest extends MessageTestBase {
       testAckTimeout();
    }
 
-   public void testAckTimeout() throws Exception {
+   private void testAckTimeout() throws Exception {
 
       ClientRequest request = new ClientRequest(TestPortProvider.generateURL("/topics/testAck"));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56c7fb1a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index ebc6dd7..09d9cbb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.integration.cluster.distribution;
 
 import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SimpleSymmetricClusterTest extends ClusterTestBase {
@@ -282,7 +283,9 @@ public class SimpleSymmetricClusterTest extends ClusterTestBase {
       verifyReceiveRoundRobinInSomeOrder(33, 2, 0, 1);
    }
 
-   public void _testSimpleRoundRobbinNoFailure() throws Exception {
+   @Test
+   @Ignore("Test not implemented yet")
+   public void testSimpleRoundRobbinNoFailure() throws Exception {
       //TODO make this test to crash a node
       setupServer(0, true, isNetty());
       setupServer(1, true, isNetty());

Reply | Threaded
Open this post in threaded view
|

[3/3] activemq-artemis git commit: NO-JIRA Fix errorprone error (duplicated expression in condition)

jbertram
In reply to this post by jbertram
NO-JIRA Fix errorprone error (duplicated expression in condition)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94c158eb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94c158eb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94c158eb

Branch: refs/heads/master
Commit: 94c158ebee4d35dc0fef3c9ac36b68a623ae5eb5
Parents: 4231d66
Author: Jiri Danek <[hidden email]>
Authored: Thu Nov 22 22:52:45 2018 +0100
Committer: Justin Bertram <[hidden email]>
Committed: Thu Dec 13 10:53:34 2018 -0600

----------------------------------------------------------------------
 .../artemis/protocol/amqp/broker/AMQPMessageTest.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94c158eb/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
index 953dd0b..12b91ea 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.activemq.artemis.protocol.amqp.broker;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -1465,7 +1466,7 @@ public class AMQPMessageTest {
          AMQPMessage readMessage = (AMQPMessage)decoded.getPersister().decode(buffer, null);
          Assert.assertEquals(33, readMessage.getMessageID());
          Assert.assertEquals("someAddress", readMessage.getAddress());
-         Assert.assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
+         assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
       } finally {
          buffer.release();
       }
@@ -1475,7 +1476,7 @@ public class AMQPMessageTest {
          AMQPMessage readMessage = (AMQPMessage) EmbedMessageUtil.extractEmbedded(embeddedMessage);
          Assert.assertEquals(33, readMessage.getMessageID());
          Assert.assertEquals("someAddress", readMessage.getAddress());
-         Assert.assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
+         assertArrayEquals(original, readMessage.getExtraBytesProperty(name));
       }
    }
 
@@ -2231,14 +2232,14 @@ public class AMQPMessageTest {
          byte[] leftArray = leftValue.getValue().getArray();
          byte[] rightArray = rightValue.getValue().getArray();
 
-         if (leftArray == null && leftArray == null) {
+         if (leftArray == null && rightArray == null) {
             return true;
          }
          if (!isNullnessEquals(leftArray, rightArray)) {
             return false;
          }
 
-         assertTrue(Arrays.equals(leftArray, rightArray));
+         assertArrayEquals(leftArray, rightArray);
       } else {
          return false;
       }