This is an automated email from the ASF dual-hosted git repository.
quinn pushed a commit to branch camel-2.17.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.17.x by this push:
new b7227485 NO JIRA - Simplify test data
b7227485 is described below
commit b72274851453e0ba89840ce7ec2f9e978a630c0e
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
AuthorDate: Wed Jul 3 09:05:44 2019 -0600
NO JIRA - Simplify test data
---
.../MllpTcpClientProducerAcknowledgementTest.java | 29 ++++++++-----------
...lientProducerAcknowledgementValidationTest.java | 33 +++++++++-------------
...MllpTcpServerConsumerMessageValidationTest.java | 8 +++---
.../camel/component/mllp/impl/Hl7UtilTest.java | 27 +++++++-----------
.../mllp/impl/MllpSocketReaderTestSupport.java | 27 +++++++-----------
.../mllp/impl/MllpSocketWriterTestSupport.java | 27 +++++++-----------
.../camel/test/mllp/Hl7MessageGenerator.java | 26 +++++++----------
7 files changed, 68 insertions(+), 109 deletions(-)
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
index f6df61c..9b608e9 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
@@ -37,35 +37,28 @@ import static
org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
public class MllpTcpClientProducerAcknowledgementTest extends CamelTestSupport
{
static final String TEST_MESSAGE =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|20161206193919|RISTECH|ADT^A08|00001|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|LOS ANGELE|"
- +
"(310)725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||"
- +
"CLR|||||60000013647|SELF|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||"
+ '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO KNOWN
ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS
ANGELE|(310)725-6952^^^^^310^7256952||19700109|F|P/F|SLF|"
- +
"565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||" + '\r'
- + "UB2||||||||" + '\r'
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|20161206193919||ORM^O01|00001|D|2.3|||||||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ '\n';
static final String EXPECTED_AA =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AA|00001|" + '\r'
+ '\n';
static final String EXPECTED_AR =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AR|00001|" + '\r'
+ '\n';
static final String EXPECTED_AE =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AE|00001|" + '\r'
+ '\n';
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementValidationTest.java
index 1ff641c..3261c85 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementValidationTest.java
@@ -36,35 +36,28 @@ import static
org.apache.camel.component.mllp.MllpEndpoint.START_OF_BLOCK;
public class MllpTcpClientProducerAcknowledgementValidationTest extends
CamelTestSupport {
static final String TEST_MESSAGE =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|20161206193919|RISTECH|ADT^A08|00001|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|LOS ANGELE|"
- +
"(310)725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||"
- +
"CLR|||||60000013647|SELF|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||"
+ '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO KNOWN
ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS
ANGELE|(310)725-6952^^^^^310^7256952||19700109|F|P/F|SLF|"
- +
"565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||" + '\r'
- + "UB2||||||||" + '\r'
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|20161206193919||ORM^O01|00001|D|2.3|||||||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ '\n';
static final String EXPECTED_AA =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AA|00001|" + '\r'
+ '\n';
static final String EXPECTED_AR =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AR|00001|" + '\r'
+ '\n';
static final String EXPECTED_AE =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AE|00001|" + '\r'
+ '\n';
@@ -237,7 +230,7 @@ public class
MllpTcpClientProducerAcknowledgementValidationTest extends CamelTes
@Test
public void testInvalidAcknowledgementContainingEmbeddedStartOfBlock()
throws Exception {
- final String badAcknowledgement = EXPECTED_AA.replaceFirst("RISTECH",
"RISTECH" + START_OF_BLOCK);
+ final String badAcknowledgement = EXPECTED_AA.replaceFirst("|ORM",
START_OF_BLOCK + "|ORM");
invalid.expectedBodiesReceived(TEST_MESSAGE);
aa.expectedHeaderReceived(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE,
"AA");
@@ -260,7 +253,7 @@ public class
MllpTcpClientProducerAcknowledgementValidationTest extends CamelTes
@Test
public void testInvalidAcknowledgementContainingEmbeddedEndOfBlock()
throws Exception {
- final String badAcknowledgement = EXPECTED_AA.replaceFirst("RISTECH",
"RISTECH" + END_OF_BLOCK);
+ final String badAcknowledgement = EXPECTED_AA.replaceFirst("|ORM",
END_OF_BLOCK + "|ORM");
invalid.expectedBodiesReceived(TEST_MESSAGE);
aa.expectedHeaderReceived(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE,
"AA");
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
index 17525aa..688f96f 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageValidationTest.java
@@ -253,7 +253,7 @@ public class MllpTcpServerConsumerMessageValidationTest
extends CamelTestSupport
timeout.expectedMessageCount(0);
invalid.expectedMessageCount(1);
-
mllpClient.sendMessageAndWaitForAcknowledgement(generateMessage().replaceFirst("EVN",
"EVN" + START_OF_BLOCK));
+
mllpClient.sendMessageAndWaitForAcknowledgement(generateMessage().replaceFirst("PID",
"PID" + START_OF_BLOCK));
assertMockEndpointsSatisfied();
}
@@ -269,7 +269,7 @@ public class MllpTcpServerConsumerMessageValidationTest
extends CamelTestSupport
for (int i = 0; i < messageCount; ++i) {
String message = (i == (messageCount / 2))
- ? generateMessage(i + 1).replaceFirst("EVN", "EVN" +
START_OF_BLOCK)
+ ? generateMessage(i + 1).replaceFirst("PID", "PID" +
START_OF_BLOCK)
: generateMessage(i + 1);
log.debug("Sending message {}",
MllpComponent.covertToPrintFriendlyString(message));
@@ -287,7 +287,7 @@ public class MllpTcpServerConsumerMessageValidationTest
extends CamelTestSupport
timeout.expectedMessageCount(0);
invalid.expectedMessageCount(1);
-
mllpClient.sendMessageAndWaitForAcknowledgement(generateMessage().replaceFirst("EVN",
"EVN" + END_OF_BLOCK));
+
mllpClient.sendMessageAndWaitForAcknowledgement(generateMessage().replaceFirst("PID",
"PID" + END_OF_BLOCK));
assertMockEndpointsSatisfied();
}
@@ -303,7 +303,7 @@ public class MllpTcpServerConsumerMessageValidationTest
extends CamelTestSupport
for (int i = 0; i < messageCount; ++i) {
String message = (i == (messageCount / 2))
- ? generateMessage(i + 1).replaceFirst("EVN", "EVN" +
END_OF_BLOCK)
+ ? generateMessage(i + 1).replaceFirst("PID", "PID" +
END_OF_BLOCK)
: generateMessage(i + 1);
log.debug("Sending message {}",
MllpComponent.covertToPrintFriendlyString(message));
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/Hl7UtilTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/Hl7UtilTest.java
index e7d443c..37b6a5b 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/Hl7UtilTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/Hl7UtilTest.java
@@ -27,21 +27,14 @@ import static org.junit.Assert.assertNull;
public class Hl7UtilTest {
static final String TEST_MESSAGE =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|20161206193919|RISTECH|ADT^A08|00001|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|"
- + "LOS
ANGELE|(310)725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||"
- +
"CLR|||||60000013647|SELF|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||"
+ '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO KNOWN
ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS
ANGELE|(310)725-6952^^^^^310^7256952||19700109|F|P/F|SLF|"
- +
"565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||" + '\r'
- + "UB2||||||||" + '\r'
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|20161206193919||ORM^O01|00001|D|2.3|||||||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ '\n';
@Test
@@ -64,7 +57,7 @@ public class Hl7UtilTest {
byte[] payload = TEST_MESSAGE.getBytes();
String message =
Hl7Util.generateInvalidPayloadExceptionMessage(payload, 10);
- assertEquals("The HL7 payload terminating bytes [0x7c, 0x41] are
incorrect - expected [0xd, 0xa] {ASCII [<CR>, <LF>]}", message);
+ assertEquals("The HL7 payload terminating bytes [0x7c, 0x52] are
incorrect - expected [0xd, 0xa] {ASCII [<CR>, <LF>]}", message);
}
@Test
@@ -123,4 +116,4 @@ public class Hl7UtilTest {
assertEquals(expected,
Hl7Util.generateInvalidPayloadExceptionMessage(payloadStream.toByteArray()));
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketReaderTestSupport.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketReaderTestSupport.java
index 11a4cfe..578cb03 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketReaderTestSupport.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketReaderTestSupport.java
@@ -40,25 +40,18 @@ import static org.junit.Assert.fail;
public abstract class MllpSocketReaderTestSupport {
static final String TEST_MESSAGE =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|20161206193919|RISTECH|ADT^A08|00001|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|LOS ANGELE|"
- +
"(310)725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||"
- +
"CLR|||||60000013647|SELF|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||"
+ '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO KNOWN
ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS
ANGELE|(310)725-6952^^^^^310^7256952||19700109|F|P/F|SLF|"
- +
"565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||" + '\r'
- + "UB2||||||||" + '\r'
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|20161206193919||ORM^O01|00001|D|2.3|||||||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ '\n';
static final String TEST_ACKNOWLEDGEMENT =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AA|00001|" + '\r'
+ '\n';
@@ -339,4 +332,4 @@ public abstract class MllpSocketReaderTestSupport {
return addPacket(bytes).addPacket(s);
}
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketWriterTestSupport.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketWriterTestSupport.java
index a819771..e596793 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketWriterTestSupport.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/impl/MllpSocketWriterTestSupport.java
@@ -23,25 +23,18 @@ import java.net.Socket;
public abstract class MllpSocketWriterTestSupport {
static final String TEST_MESSAGE =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|20161206193919|RISTECH|ADT^A08|00001|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|LOS ANGELE|"
- +
"(310)725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||"
- +
"CLR|||||60000013647|SELF|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||"
+ '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO KNOWN
ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS
ANGELE|(310)725-6952^^^^^310^7256952||19700109|F|P/F|SLF|"
- +
"565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||" + '\r'
- + "UB2||||||||" + '\r'
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|20161206193919||ORM^O01|00001|D|2.3|||||||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ '\n';
static final String TEST_ACKNOWLEDGEMENT =
-
"MSH|^~\\&|JCAPS|CC|ADT|EPIC|20161206193919|RISTECH|ACK^A08|00001|D|2.3^^|||||||"
+ '\r'
+
"MSH|^~\\&|INHOUSE|RTH00|REQUESTING|ICE|20161206193919||ACK^O01|00001|D|2.3|||||||"
+ '\r'
+ "MSA|AA|00001|" + '\r'
+ '\n';
@@ -129,4 +122,4 @@ public abstract class MllpSocketWriterTestSupport {
}
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/mllp/Hl7MessageGenerator.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/mllp/Hl7MessageGenerator.java
index 0b12037..12afc1e 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/mllp/Hl7MessageGenerator.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/mllp/Hl7MessageGenerator.java
@@ -24,22 +24,16 @@ public final class Hl7MessageGenerator {
static String messageControlIdFormat = "%05d";
static String hl7MessageTemplate =
-
"MSH|^~\\&|ADT|EPIC|JCAPS|CC|<MESSAGE_TIMESTAMP>|RISTECH|ADT^A08|<MESSAGE_CONTROL_ID>|D|2.3^^|||||||"
+ '\r'
- +
"EVN|A08|20150107161440||REG_UPDATE_SEND_VISIT_MESSAGES_ON_PATIENT_CHANGES|RISTECH^RADIOLOGY^TECHNOLOGIST^^^^^^UCLA^^^^^RRMC||"
+ '\r'
- +
"PID|1|2100355^^^MRN^MRN|2100355^^^MRN^MRN||MDCLS9^MC9||19700109|F||U|111 HOVER
STREET^^LOS ANGELES^CA^90032^USA^P^^LOS ANGELE|LOS ANGELE|(310)"
- +
"725-6952^P^PH^^^310^7256952||ENGLISH|U||60000013647|565-33-2222|||U||||||||N||"
+ '\r'
- + "PD1|||UCLA HEALTH
SYSTEM^^10|10002116^ADAMS^JOHN^D^^^^^EPIC^^^^PROVID||||||||||||||" + '\r'
- +
"NK1|1|DOE^MC9^^|OTH|^^^^^USA|(310)888-9999^^^^^310^8889999|(310)999-2222^^^^^310^9992222|Emergency
Contact 1|||||||||||||||||||||||||||" + '\r'
- + "PV1|1|OUTPATIENT|RR
CT^^^1000^^^^^^^DEPID|EL|||017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID|017511^TOBIAS^JONATHAN^^^^^^EPIC^^^^PROVID||||||CLR|||||60000013647|SELF"
- +
"|||||||||||||||||||||HOV_CONF|^^^1000^^^^^^^||20150107161438||||||||||" + '\r'
- + "PV2||||||||20150107161438||||CT BRAIN W WO
CONTRAST||||||||||N|||||||||||||||||||||||||||" + '\r'
- + "ZPV||||||||||||20150107161438|||||||||" + '\r'
- + "AL1|1||33361^NO KNOWN ALLERGIES^^NOTCOMPUTRITION^NO
KNOWN ALLERGIES^EXTELG||||||" + '\r'
- + "DG1|1|DX|784.0^Headache^DX|Headache||VISIT" + '\r'
- + "GT1|1|1000235129|MDCLS9^MC9^^||111 HOVER STREET^^LOS
ANGELES^CA^90032^USA^^^LOS ANGELE|(310)"
- +
"725-6952^^^^^310^7256952||19700109|F|P/F|SLF|565-33-2222|||||^^^^^USA|||UNKNOWN|||||||||||||||||||||||||||||"
+ '\r'
- + "UB2||||||||" + '\r'
- + '\r' + '\n';
+
"MSH|^~\\&|REQUESTING|ICE|INHOUSE|RTH00|<MESSAGE_TIMESTAMP>||ORM^O01|<MESSAGE_CONTROL_ID>|D|2.3|||AL|NE|||"
+ '\r'
+ +
"PID|1||ICE999999^^^ICE^ICE||Testpatient^Testy^^^Mr||19740401|M|||123 Barrel
Drive^^^^SW18 4RT|||||2||||||||||||||" + '\r'
+ + "NTE|1||Free text for entering clinical details|" + '\r'
+ + "PV1|1||^^^^^^^^Admin Location|||||||||||||||NHS|" + '\r'
+ +
"ORC|NW|213||175|REQ||||20080808093202|ahsl^^Administrator||G999999^TestDoctor^GPtests^^^^^^NAT|^^^^^^^^Admin
Location | 819600|200808080932||RTH00||ahsl^^Administrator||" + '\r'
+ + "OBR|1|213||CCOR^Serum Cortisol ^
JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|2|213||GCU^Serum Copper ^ JRH06
|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + "OBR|3|213||THYG^Serum Thyroglobulin
^JRH06|||200808080932||0.100||||||^|G999999^TestDoctor^GPtests^^^^^^NAT|819600|ADM162||||||820|||^^^^^R||||||||"
+ '\r'
+ + '\n';
+
private Hl7MessageGenerator() {
}
