You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/01/12 11:29:18 UTC
[camel] branch main updated: CAMEL-18892: Restore MLLP tests (#9057)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2a5c7bf857c CAMEL-18892: Restore MLLP tests (#9057)
2a5c7bf857c is described below
commit 2a5c7bf857c53a1e2091ec2723b09b042cfb66a8
Author: Federico Mariani <34...@users.noreply.github.com>
AuthorDate: Thu Jan 12 12:29:11 2023 +0100
CAMEL-18892: Restore MLLP tests (#9057)
---
components/camel-mllp/pom.xml | 1 -
.../mllp/MllpTcpServerConsumerTransactionTest.java | 25 ++++++++--------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index cb53020abab..86df02ec1fd 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -87,7 +87,6 @@
</dependencies>
<build>
- <testSourceDirectory>src/test/dummy</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
index 19cfb7acf80..21ad2b22495 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
@@ -18,8 +18,7 @@ package org.apache.camel.component.mllp;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
@@ -29,8 +28,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedService;
-import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedServiceBuilder;
+import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory;
import org.apache.camel.test.junit.rule.mllp.MllpClientResource;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
@@ -42,14 +41,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
@RegisterExtension
- public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
- .bare()
- .withBrokerId("broker")
- .withPersistent(false)
- .withUseJmx(false)
- .withPersistenceAdapter(new MemoryPersistenceAdapter())
- .withTcpTransport()
- .buildWithRecycle();
+ public ArtemisService service = ArtemisServiceFactory.createVMService();
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -77,7 +69,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
public SjmsComponent addTargetComponent() {
SjmsComponent target = new SjmsComponent();
- target.setConnectionFactory(new ActiveMQConnectionFactory(service.getVmURL()));
+ target.setConnectionFactory(new ActiveMQConnectionFactory(service.serviceAddress()));
return target;
}
@@ -114,6 +106,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
from("target://test-queue")
.routeId("jms-consumer")
+ .process(exchange -> System.out.println(exchange.getIn().getBody()))
.log(LoggingLevel.INFO, routeId, "Test JMS Consumer received message")
.to(result);
@@ -124,7 +117,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
@Test
public void testReceiveSingleMessage() throws Exception {
result.expectedMessageCount(1);
- complete.expectedMessageCount(1);
+ complete.expectedMessageCount(2);
failure.expectedMessageCount(0);
mllpClient.connect();
@@ -136,9 +129,9 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
@Test
public void testAcknowledgementWriteFailure() throws Exception {
- result.expectedMessageCount(0);
+ result.expectedMessageCount(1);
result.setAssertPeriod(1000);
- complete.expectedMessageCount(0);
+ complete.expectedMessageCount(1);
failure.expectedMessageCount(1);
mllpClient.connect();