From 56c7fb1a954b1c7e545a47651cb345bdc6be660c Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Sat, 14 Jul 2018 23:52:02 +0200 Subject: [PATCH] NO-JIRA Add forgotten @Test annotation and make helper methods private --- .../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(-) 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 691bb0d344..d7cd714f46 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]); 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 145ddec18b..2cccbd1d98 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); 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 26c0b5c758..5194c35f18 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")); 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 ebc6dd7de2..09d9cbbfbc 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());