activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [activemq-artemis] branch master updated: ARTEMIS-2775 Cleaning up activemq5-unit-ests
Date Thu, 21 May 2020 21:02:32 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new 4a25cc9  ARTEMIS-2775 Cleaning up activemq5-unit-ests
4a25cc9 is described below

commit 4a25cc9c591eadab7d4d00cc367ac89c1f790002
Author: Clebert Suconic <clebertsuconic@apache.org>
AuthorDate: Thu May 21 11:28:26 2020 -0400

    ARTEMIS-2775 Cleaning up activemq5-unit-ests
    
    Some tests that are ignored, were never really operational.
---
 .../artemiswrapper/OpenwireArtemisBaseTest.java    |  3 --
 .../activemq/ActiveMQXAConnectionFactoryTest.java  |  2 +
 .../activemq/JmsQueueCompositeSendReceiveTest.java |  2 +
 .../activemq/JmsQueueWildcardSendReceiveTest.java  |  2 +
 .../activemq/JmsTopicWildcardSendReceiveTest.java  | 48 ----------------------
 .../org/apache/activemq/RemoveDestinationTest.java |  2 +
 .../transport/failover/FailoverBackupLeakTest.java |  2 +
 .../failover/FailoverComplexClusterTest.java       |  2 +
 .../failover/FailoverConsumerUnconsumedTest.java   |  2 +
 .../transport/failover/FailoverPriorityTest.java   |  2 +
 .../FailoverRedeliveryTransactionTest.java         |  2 +
 .../failover/FailoverTransportBackupsTest.java     |  2 +
 .../transport/tcp/SslBrokerServiceTest.java        |  2 +
 .../transport/tcp/SslTransportBrokerTest.java      |  2 +
 .../transport/tcp/TcpTransportBrokerTest.java      |  2 +
 .../amq/JmsTopicWildcardSendReceiveTest.java       |  2 +
 16 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/OpenwireArtemisBaseTest.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/OpenwireArtemisBaseTest.java
index 8ff33b9..0bb958e 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/OpenwireArtemisBaseTest.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/OpenwireArtemisBaseTest.java
@@ -47,9 +47,6 @@ public class OpenwireArtemisBaseTest {
    public CleanupThreadRule cleanupRules = new CleanupThreadRule();
 
    @Rule
-   public ThreadLeakCheckRule leakCheckRule = new ThreadLeakCheckRule();
-
-   @Rule
    public TemporaryFolder temporaryFolder;
    @Rule
    public TestName name = new TestName();
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
index ef75a9f..acd63da 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionFactoryTest.java
@@ -49,9 +49,11 @@ import org.apache.activemq.command.TransactionInfo;
 import org.apache.activemq.command.XATransactionId;
 import org.apache.activemq.management.JMSConnectionStatsImpl;
 import org.apache.activemq.transport.failover.FailoverTransport;
+import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Ignore
 public class ActiveMQXAConnectionFactoryTest extends CombinationTestSupport {
 
    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQXAConnectionFactoryTest.class);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
index d6272b7..0281a57 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
@@ -30,10 +30,12 @@ import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
 import org.apache.activemq.artemiswrapper.ArtemisBrokerHelper;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.junit.Ignore;
 
 /**
  *
  */
+@Ignore
 public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
 
    private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(JmsQueueCompositeSendReceiveTest.class);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
index e986023..25b2032 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
@@ -27,10 +27,12 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.junit.Ignore;
 
 /**
  * https://issues.apache.org/jira/browse/ARTEMIS-189
  */
+@Ignore
 public class JmsQueueWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
 
    private String destination1String = "TEST.ONE.ONE";
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
index 9a647b4..725a025 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
@@ -153,54 +153,6 @@ public class JmsTopicWildcardSendReceiveTest extends JmsTopicSendReceiveTest
{
 
    }
 
-   public void testReceiveWildcardTopicMatchDoubleWildcard() throws Exception {
-      connection.start();
-      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-      ActiveMQDestination destination1 = (ActiveMQDestination) session.createTopic("a.*.>.>");
-      ActiveMQDestination destination2 = (ActiveMQDestination) session.createTopic("a.b");
-
-      Message m = null;
-      MessageConsumer consumer = null;
-      String text = null;
-
-      consumer = session.createConsumer(destination1);
-      sendMessage(session, destination2, destination3String);
-
-      m = consumer.receive(1000);
-      assertNotNull(m);
-      text = ((TextMessage) m).getText();
-      if (!(text.equals(destination1String) || text.equals(destination3String))) {
-         fail("unexpected message:" + text);
-      }
-
-      assertNull(consumer.receiveNoWait());
-   }
-
-   public void testReceiveWildcardTopicMatchSinglePastTheEndWildcard() throws Exception {
-      connection.start();
-      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-      ActiveMQDestination destination1 = (ActiveMQDestination) session.createTopic("a.>");
-      ActiveMQDestination destination2 = (ActiveMQDestination) session.createTopic("a");
-
-      Message m = null;
-      MessageConsumer consumer = null;
-      String text = null;
-
-      consumer = session.createConsumer(destination1);
-      sendMessage(session, destination2, destination3String);
-
-      m = consumer.receive(1000);
-      assertNotNull(m);
-      text = ((TextMessage) m).getText();
-      if (!(text.equals(destination1String) || text.equals(destination3String))) {
-         fail("unexpected message:" + text);
-      }
-
-      assertNull(consumer.receiveNoWait());
-   }
-
    private void sendMessage(Session session, Destination destination, String text) throws
JMSException {
       MessageProducer producer = session.createProducer(destination);
       producer.send(session.createTextMessage(text));
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
index 4bb0646..774cec6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
@@ -38,6 +38,7 @@ import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
@@ -45,6 +46,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+@Ignore
 public class RemoveDestinationTest {
 
    private static final String TCP_BROKER_URL = "tcp://localhost:61616?create=false";
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
index c87a640..b18bf4c 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverBackupLeakTest.java
@@ -34,6 +34,7 @@ import org.apache.activemq.util.Wait;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -41,6 +42,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Ensures connections aren't leaked when when we use backup=true and randomize=false
  */
+@Ignore
 public class FailoverBackupLeakTest extends OpenwireArtemisBaseTest {
 
    private EmbeddedJMS s1, s2;
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
index f9c4015..f9aaac3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
@@ -38,6 +38,7 @@ import org.apache.activemq.broker.artemiswrapper.OpenwireArtemisBaseTest;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -47,6 +48,7 @@ import org.junit.Test;
  * connections on the client should start with 3, then have two after the 3rd
  * broker is removed and then show 3 after the 3rd broker is reintroduced.
  */
+@Ignore
 public class FailoverComplexClusterTest extends OpenwireArtemisBaseTest {
 
    private static final String BROKER_A_CLIENT_TC_ADDRESS = "tcp://127.0.0.1:61616";
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
index fc6c5d6..74aaeb1 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
@@ -49,6 +49,7 @@ import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -58,6 +59,7 @@ import static org.junit.Assert.assertTrue;
 
 // see https://issues.apache.org/activemq/browse/AMQ-2573
 @RunWith(BMUnitRunner.class)
+@Ignore // This test is using byteMan. it's not really accurate.
 public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest {
 
    private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerUnconsumedTest.class);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java
index 68db9c0..1e4b0a3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverPriorityTest.java
@@ -33,10 +33,12 @@ import org.apache.activemq.broker.artemiswrapper.OpenwireArtemisBaseTest;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Ignore
 public class FailoverPriorityTest extends OpenwireArtemisBaseTest {
 
    protected final Logger LOG = LoggerFactory.getLogger(getClass());
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
index 2ecc023..fd0913a 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
@@ -20,8 +20,10 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class FailoverRedeliveryTransactionTest extends FailoverTransactionTest {
 
    @Override
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
index 564a641..a935b22 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBackupsTest.java
@@ -27,6 +27,7 @@ import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.util.Wait;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+@Ignore
 public class FailoverTransportBackupsTest extends OpenwireArtemisBaseTest {
 
    private static final Logger LOG = LoggerFactory.getLogger(FailoverTransportBackupsTest.class);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
index 3af39ec..8bcccd3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
@@ -44,9 +44,11 @@ import org.apache.activemq.broker.SslContext;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.transport.TransportBrokerTestSupport;
 import org.apache.activemq.transport.TransportFactory;
+import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Ignore
 public class SslBrokerServiceTest extends TransportBrokerTestSupport {
 
    private static final Logger LOG = LoggerFactory.getLogger(SslBrokerServiceTest.class);
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
index 1da2189..0136378 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
@@ -24,7 +24,9 @@ import junit.framework.Test;
 import junit.textui.TestRunner;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.Ignore;
 
+@Ignore
 public class SslTransportBrokerTest extends TransportBrokerTestSupport {
 
    public static final String KEYSTORE_TYPE = "jks";
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
index db780df..b7203cc 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TcpTransportBrokerTest.java
@@ -19,7 +19,9 @@ package org.apache.activemq.transport.tcp;
 import junit.framework.Test;
 
 import org.apache.activemq.transport.TransportBrokerTestSupport;
+import org.junit.Ignore;
 
+@Ignore
 public class TcpTransportBrokerTest extends TransportBrokerTestSupport {
 
    @Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
index c86c6ec..ee8ae0b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JmsTopicWildcardSendReceiveTest.java
@@ -27,11 +27,13 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * adapted from: org.apache.activemq.JmsTopicWildcardSendReceiveTest
  */
+@Ignore
 public class JmsTopicWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
 
    private String destination1String = "TEST.ONE.ONE";


Mime
View raw message