From 3f0aa6e13cba9b96fbe2839a9ad232dab574c720 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Fri, 16 Mar 2018 12:07:33 -0400 Subject: [PATCH] Changed some unit tests to Integration Tests because they are creating embedded JMS Brokers (implicitly) and commnicating with it. This becomes brittle in a full build, especially if any other unit test attempts to create a broker implicitly due to the way that the activemq broker implicit creation works. --- .../nifi/jms/processors/CommonTest.java | 26 ------------------- ...{ConsumeJMSTest.java => ConsumeJMSIT.java} | 2 +- ...{PublishJMSTest.java => PublishJMSIT.java} | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) rename nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/{ConsumeJMSTest.java => ConsumeJMSIT.java} (99%) rename nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/{PublishJMSTest.java => PublishJMSIT.java} (99%) diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/CommonTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/CommonTest.java index 5e963d2907..bb1a8ae410 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/CommonTest.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/CommonTest.java @@ -16,41 +16,15 @@ */ package org.apache.nifi.jms.processors; -import static org.junit.Assert.assertTrue; - -import java.util.Iterator; -import java.util.ServiceLoader; - import javax.jms.ConnectionFactory; import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.nifi.processor.Processor; -import org.junit.Test; import org.springframework.jms.connection.CachingConnectionFactory; import org.springframework.jms.core.JmsTemplate; public class CommonTest { - @Test - public void validateServiceIsLocatableViaServiceLoader() { - ServiceLoader loader = ServiceLoader. load(Processor.class); - Iterator iter = loader.iterator(); - boolean pubJmsPresent = false; - boolean consumeJmsPresent = false; - while (iter.hasNext()) { - Processor p = iter.next(); - if (p.getClass().getSimpleName().equals(PublishJMS.class.getSimpleName())) { - pubJmsPresent = true; - } else if (p.getClass().getSimpleName().equals(ConsumeJMS.class.getSimpleName())) { - consumeJmsPresent = true; - } - - } - assertTrue(pubJmsPresent); - assertTrue(consumeJmsPresent); - } - static JmsTemplate buildJmsTemplateForDestination(boolean pubSub) { ConnectionFactory activeMqConnectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false"); final ConnectionFactory connectionFactory = new CachingConnectionFactory(activeMqConnectionFactory); diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java similarity index 99% rename from nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java rename to nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java index 23cf806ced..d3012e92de 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSTest.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java @@ -33,7 +33,7 @@ import org.springframework.jms.connection.CachingConnectionFactory; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.JmsHeaders; -public class ConsumeJMSTest { +public class ConsumeJMSIT { @Test public void validateSuccessfulConsumeAndTransferToSuccess() throws Exception { diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSIT.java similarity index 99% rename from nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java rename to nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSIT.java index 281d39d616..a365ad5b75 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSIT.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class PublishJMSTest { +public class PublishJMSIT { @Test(timeout = 10000) public void validateSuccessfulPublishAndTransferToSuccess() throws Exception {