tpalfy commented on code in PR #6930: URL: https://github.com/apache/nifi/pull/6930#discussion_r1106136128
########## nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/helpers/AssertionUtils.java: ########## @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.jms.processors.helpers; + +import org.apache.commons.lang3.exception.ExceptionUtils; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.fail; + +public class AssertionUtils { + + public static <T extends Throwable> void assertCausedBy(Class<T> expectedType, Runnable runnable) { + assertCausedBy(expectedType, null, runnable); + } + + public static <T extends Throwable> void assertCausedBy(Class<T> expectedType, String expectedMessage, Runnable runnable) { + try { + runnable.run(); + fail(String.format("Expected an exception to be thrown with a cause of %s, but nothing was thrown.", expectedType.getCanonicalName())); + } catch (Throwable throwable) { + final List<Throwable> causes = ExceptionUtils.getThrowableList(throwable); + for (Throwable cause : causes) { + if (expectedType.isInstance(cause)) { + if (expectedMessage != null) { + if (cause.getMessage() != null && cause.getMessage().startsWith(expectedMessage)) { + return; + } + } else { + return; + } + } + } + fail(String.format("Exception is thrown but not found %s as a cause. Received exception is: %s", expectedType.getCanonicalName(), throwable), throwable); + } + } + + public static void assertCausedBy(Throwable expectedException, Runnable runnable) { Review Comment: This is only used in `ConsumeJMSIT.whenExceptionIsRaisedInAcceptTheProcessorShouldYieldAndRollback` like this: ```java assertCausedBy(expectedException, () -> runner.run(1, false)); ``` We could remove this method altogether and change the call to this: ```java assertCausedBy(expectedException.getClass(), () -> runner.run(1, false)); ``` I think checking an `equals` on an `Exception` is a questionable practice in general to put it in a util class. ########## nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java: ########## @@ -409,29 +418,75 @@ public void whenExceptionIsRaisedTheProcessorShouldBeYielded() throws Exception runner.setProperty(ConsumeJMS.DESTINATION, "foo"); runner.setProperty(ConsumeJMS.DESTINATION_TYPE, ConsumeJMS.TOPIC); - assertThrows(AssertionError.class, () -> runner.run()); - assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); + assertCausedBy(UnknownHostException.class, runner::run); + + assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); } @Test public void whenExceptionIsRaisedDuringConnectionFactoryInitializationTheProcessorShouldBeYielded() throws Exception { + final String nonExistentClassName = "DummyJMSConnectionFactoryClass"; + TestRunner runner = TestRunners.newTestRunner(ConsumeJMS.class); // using (non-JNDI) JMS Connection Factory via controller service JMSConnectionFactoryProvider cfProvider = new JMSConnectionFactoryProvider(); runner.addControllerService("cfProvider", cfProvider); - runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_CONNECTION_FACTORY_IMPL, "DummyJMSConnectionFactoryClass"); + runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_CONNECTION_FACTORY_IMPL, nonExistentClassName); runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_BROKER_URI, "DummyBrokerUri"); runner.enableControllerService(cfProvider); runner.setProperty(ConsumeJMS.CF_SERVICE, "cfProvider"); runner.setProperty(ConsumeJMS.DESTINATION, "myTopic"); runner.setProperty(ConsumeJMS.DESTINATION_TYPE, ConsumeJMS.TOPIC); - assertThrows(AssertionError.class, () -> runner.run()); + assertCausedBy(ClassNotFoundException.class, nonExistentClassName, runner::run); + assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); } + @Test + @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) + public void whenExceptionIsRaisedInAcceptTheProcessorShouldYieldAndRollback() throws Exception { + final String destination = "testQueue"; + final RuntimeException expectedException = new RuntimeException(); + + final ConsumeJMS processor = new ConsumeJMS() { + @Override + protected void rendezvousWithJms(ProcessContext context, ProcessSession processSession, JMSConsumer consumer) throws ProcessException { + ProcessSession spiedSession = spy(processSession); + doThrow(expectedException).when(spiedSession).write(any(FlowFile.class), any(OutputStreamCallback.class)); + super.rendezvousWithJms(context, spiedSession, consumer); + } + }; + + JmsTemplate jmsTemplate = CommonTest.buildJmsTemplateForDestination(false); + try { + JMSPublisher sender = new JMSPublisher((CachingConnectionFactory) jmsTemplate.getConnectionFactory(), jmsTemplate, mock(ComponentLog.class)); + + sender.jmsTemplate.send(destination, session -> session.createTextMessage("msg")); + + TestRunner runner = TestRunners.newTestRunner(processor); + JMSConnectionFactoryProviderDefinition cs = mock(JMSConnectionFactoryProviderDefinition.class); + when(cs.getIdentifier()).thenReturn("cfProvider"); + when(cs.getConnectionFactory()).thenReturn(jmsTemplate.getConnectionFactory()); + runner.addControllerService("cfProvider", cs); + runner.enableControllerService(cs); + + runner.setProperty(PublishJMS.CF_SERVICE, "cfProvider"); + runner.setProperty(ConsumeJMS.DESTINATION, destination); + runner.setProperty(ConsumeJMS.DESTINATION_TYPE, ConsumeJMS.QUEUE); + + ((MockSessionFactory) runner.getProcessSessionFactory()).getCreatedSessions(); Review Comment: Do we need this? ########## nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java: ########## @@ -332,14 +332,21 @@ public void accept(JMSResponse response) { @Test @Timeout(value = 20000, unit = TimeUnit.MILLISECONDS) public void testMultipleThreads() throws Exception { + final int threadCount = 4; + final int totalMessageCount = 1000; + final int messagesPerThreadCount = totalMessageCount / threadCount; + String destinationName = "testMultipleThreads"; JmsTemplate publishTemplate = CommonTest.buildJmsTemplateForDestination(false); - final CountDownLatch consumerTemplateCloseCount = new CountDownLatch(4); + final CountDownLatch consumerTemplateCloseCount = new CountDownLatch(threadCount); + + final AtomicInteger test = new AtomicInteger(0); Review Comment: Do we need this? ########## nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/ConsumeJMSIT.java: ########## @@ -409,29 +418,75 @@ public void whenExceptionIsRaisedTheProcessorShouldBeYielded() throws Exception runner.setProperty(ConsumeJMS.DESTINATION, "foo"); runner.setProperty(ConsumeJMS.DESTINATION_TYPE, ConsumeJMS.TOPIC); - assertThrows(AssertionError.class, () -> runner.run()); - assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); + assertCausedBy(UnknownHostException.class, runner::run); + + assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); } @Test public void whenExceptionIsRaisedDuringConnectionFactoryInitializationTheProcessorShouldBeYielded() throws Exception { + final String nonExistentClassName = "DummyJMSConnectionFactoryClass"; + TestRunner runner = TestRunners.newTestRunner(ConsumeJMS.class); // using (non-JNDI) JMS Connection Factory via controller service JMSConnectionFactoryProvider cfProvider = new JMSConnectionFactoryProvider(); runner.addControllerService("cfProvider", cfProvider); - runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_CONNECTION_FACTORY_IMPL, "DummyJMSConnectionFactoryClass"); + runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_CONNECTION_FACTORY_IMPL, nonExistentClassName); runner.setProperty(cfProvider, JMSConnectionFactoryProperties.JMS_BROKER_URI, "DummyBrokerUri"); runner.enableControllerService(cfProvider); runner.setProperty(ConsumeJMS.CF_SERVICE, "cfProvider"); runner.setProperty(ConsumeJMS.DESTINATION, "myTopic"); runner.setProperty(ConsumeJMS.DESTINATION_TYPE, ConsumeJMS.TOPIC); - assertThrows(AssertionError.class, () -> runner.run()); + assertCausedBy(ClassNotFoundException.class, nonExistentClassName, runner::run); + assertTrue(((MockProcessContext) runner.getProcessContext()).isYieldCalled(), "In case of an exception, the processor should be yielded."); } + @Test + @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) + public void whenExceptionIsRaisedInAcceptTheProcessorShouldYieldAndRollback() throws Exception { + final String destination = "testQueue"; + final RuntimeException expectedException = new RuntimeException(); + + final ConsumeJMS processor = new ConsumeJMS() { + @Override + protected void rendezvousWithJms(ProcessContext context, ProcessSession processSession, JMSConsumer consumer) throws ProcessException { + ProcessSession spiedSession = spy(processSession); + doThrow(expectedException).when(spiedSession).write(any(FlowFile.class), any(OutputStreamCallback.class)); + super.rendezvousWithJms(context, spiedSession, consumer); + } + }; + + JmsTemplate jmsTemplate = CommonTest.buildJmsTemplateForDestination(false); + try { + JMSPublisher sender = new JMSPublisher((CachingConnectionFactory) jmsTemplate.getConnectionFactory(), jmsTemplate, mock(ComponentLog.class)); + + sender.jmsTemplate.send(destination, session -> session.createTextMessage("msg")); Review Comment: ```suggestion jmsTemplate.send(destination, session -> session.createTextMessage("msg")); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
