This is an automated email from the ASF dual-hosted git repository.
quinn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9823a8a NO JIRA - Fix failing camel-mllp tests
9823a8a is described below
commit 9823a8ab0cf56186e61e4b092c93d2eb8f687967
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
AuthorDate: Tue Jul 2 17:29:06 2019 -0600
NO JIRA - Fix failing camel-mllp tests
---
.../MllpTcpServerConsumerOptionalEndOfDataWithValidationTest.java | 2 +-
...lpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java | 2 +-
.../MllpTcpServerConsumerRequiredEndOfDataWithValidationTest.java | 2 +-
...lpTcpServerConsumerRequiredEndOfDataWithoutValidationTest.java | 2 +-
.../mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithValidationTest.java
index a4cda43..4760ff1 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithValidationTest.java
@@ -76,7 +76,7 @@ public class
MllpTcpServerConsumerOptionalEndOfDataWithValidationTest extends Tc
NotifyBuilder done = new NotifyBuilder(context()).whenDone(1).create();
-
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("EVN",
"EVN" + MllpProtocolConstants.END_OF_BLOCK));
+
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("PID",
"PID" + MllpProtocolConstants.END_OF_BLOCK));
assertTrue("Exchange should have completed", done.matches(5,
TimeUnit.SECONDS));
}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
index ef2c2e8..61c89e8 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
@@ -68,7 +68,7 @@ public class
MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest extends
NotifyBuilder done = new NotifyBuilder(context()).whenDone(1).create();
-
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("EVN",
"EVN" + MllpProtocolConstants.END_OF_BLOCK));
+
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("PID",
"PID" + MllpProtocolConstants.END_OF_BLOCK));
assertTrue("Exchange should have completed", done.matches(5,
TimeUnit.SECONDS)); }
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithValidationTest.java
index ae61e1d..641faf5 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithValidationTest.java
@@ -75,7 +75,7 @@ public class
MllpTcpServerConsumerRequiredEndOfDataWithValidationTest extends Tc
NotifyBuilder done = new NotifyBuilder(context()).whenDone(1).create();
-
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("EVN",
"EVN" + MllpProtocolConstants.END_OF_BLOCK));
+
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("PID",
"PID" + MllpProtocolConstants.END_OF_BLOCK));
assertFalse("Exchange should not have completed", done.matches(5,
TimeUnit.SECONDS));
}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithoutValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithoutValidationTest.java
index 8e63a9d..3de1c24 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithoutValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerRequiredEndOfDataWithoutValidationTest.java
@@ -69,7 +69,7 @@ public class
MllpTcpServerConsumerRequiredEndOfDataWithoutValidationTest extends
NotifyBuilder done = new NotifyBuilder(context()).whenDone(1).create();
-
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("EVN",
"EVN" + MllpProtocolConstants.END_OF_BLOCK));
+
mllpClient.sendFramedData(Hl7TestMessageGenerator.generateMessage().replaceFirst("PID",
"PID" + MllpProtocolConstants.END_OF_BLOCK));
assertFalse("Exchange should not have completed", done.matches(5,
TimeUnit.SECONDS));
}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
index fcf1f6e..44c24b0 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
@@ -306,7 +306,7 @@ public abstract class
TcpServerConsumerEndOfDataAndValidationTestSupport extends
NotifyBuilder done = new NotifyBuilder(context()).whenDone(1).create();
-
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage().replaceFirst("EVN",
"EVN" + MllpProtocolConstants.START_OF_BLOCK));
+
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage().replaceFirst("PID",
"PID" + MllpProtocolConstants.START_OF_BLOCK));
assertTrue("Exchange should have completed", done.matches(15,
TimeUnit.SECONDS));
}
@@ -324,7 +324,7 @@ public abstract class
TcpServerConsumerEndOfDataAndValidationTestSupport extends
for (int i = 0; i < messageCount; ++i) {
String message = (i == (messageCount / 2))
- ? Hl7TestMessageGenerator.generateMessage(i +
1).replaceFirst("EVN", "EVN" + MllpProtocolConstants.START_OF_BLOCK)
+ ? Hl7TestMessageGenerator.generateMessage(i +
1).replaceFirst("PID", "PID" + MllpProtocolConstants.START_OF_BLOCK)
: Hl7TestMessageGenerator.generateMessage(i + 1);
log.debug("Sending message {}",
Hl7Util.convertToPrintFriendlyString(message));
@@ -354,7 +354,7 @@ public abstract class
TcpServerConsumerEndOfDataAndValidationTestSupport extends
String message = Hl7TestMessageGenerator.generateMessage(i);
if (i == invalidMessageNumber) {
- mllpClient.sendFramedData(message.replaceFirst("EVN", "EVN" +
MllpProtocolConstants.END_OF_BLOCK));
+ mllpClient.sendFramedData(message.replaceFirst("PID", "PID" +
MllpProtocolConstants.END_OF_BLOCK));
assertTrue("Exchange containing invalid message should have
completed", invalidMessageDone.matches(5, TimeUnit.SECONDS));
// The component may reset the connection in this case, so
reconnect if needed
/*
@@ -389,7 +389,7 @@ public abstract class
TcpServerConsumerEndOfDataAndValidationTestSupport extends
for (int i = 1; i <= messageCount; ++i) {
String message = Hl7TestMessageGenerator.generateMessage(i);
if (i == messageCount / 2) {
- mllpClient.sendFramedData(message.replaceFirst("EVN", "EVN" +
MllpProtocolConstants.END_OF_BLOCK));
+ mllpClient.sendFramedData(message.replaceFirst("PID", "PID" +
MllpProtocolConstants.END_OF_BLOCK));
assertTrue("Invalid message should have completed",
done.matches(15, TimeUnit.SECONDS));
mllpClient.disconnect();
mllpClient.connect();
