This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 34e26e995f74767d8afd9f30a5f358133919ef0e Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 14:23:17 2020 +0200 [CAMEL-11807] Upgrade camel-hl7 to junit5 --- components/camel-hl7/pom.xml | 6 +++--- .../camel/component/hl7/AckExpressionTest.java | 5 +++-- .../camel/component/hl7/ConvertLineFeedTest.java | 5 +++-- .../camel/component/hl7/HL7ByteArrayRouteTest.java | 5 ++++- .../camel/component/hl7/HL7DataFormatTest.java | 7 +++++-- .../component/hl7/HL7MLLPCodecBoundaryTest.java | 4 +++- .../camel/component/hl7/HL7MLLPCodecLongTest.java | 4 +++- .../hl7/HL7MLLPCodecMessageFloodingTest.java | 4 +++- .../component/hl7/HL7MLLPCodecPlainStringTest.java | 4 +++- .../hl7/HL7MLLPCodecStandAndEndBytesTest.java | 4 +++- .../apache/camel/component/hl7/HL7MLLPCodecTest.java | 4 +++- .../component/hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 +++- .../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 5 ++++- .../component/hl7/HL7MLLPNettyCodecLongTest.java | 4 +++- .../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 +++- .../camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 +++- .../hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 6 +++--- .../camel/component/hl7/HL7MLLPNettyRouteToTest.java | 4 +++- .../camel/component/hl7/HL7NettyRouteTest.java | 5 ++++- .../org/apache/camel/component/hl7/HL7RouteTest.java | 5 ++++- .../apache/camel/component/hl7/HL7TestSupport.java | 6 +++--- .../apache/camel/component/hl7/HL7ValidateTest.java | 12 ++++++++---- .../camel/component/hl7/HL7XmlDataFormatTest.java | 7 +++++-- .../camel/component/hl7/MessageValidatorTest.java | 20 ++++++++++++-------- .../camel/component/hl7/TerserExpressionTest.java | 15 +++++++++------ 25 files changed, 103 insertions(+), 50 deletions(-) diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml index ba3b75c..d134dfd 100644 --- a/components/camel-hl7/pom.xml +++ b/components/camel-hl7/pom.xml @@ -114,7 +114,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -123,8 +123,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java index e5beaa9..62a4c91 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java @@ -23,11 +23,12 @@ import ca.uhn.hl7v2.model.v24.message.ACK; import ca.uhn.hl7v2.model.v24.message.ADT_A01; import ca.uhn.hl7v2.model.v24.segment.PID; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.ack; import static org.apache.camel.component.hl7.HL7.hl7terser; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AckExpressionTest extends CamelTestSupport { diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java index 54a0f82d..29e59c4 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/ConvertLineFeedTest.java @@ -17,10 +17,11 @@ package org.apache.camel.component.hl7; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.convertLFToCR; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ConvertLineFeedTest extends CamelTestSupport { diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java index 142f9fe..d4c0c69 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java @@ -28,7 +28,10 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for HL7 routing where the mina endpoint passes on a byte array diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java index e33bc1c..6b1fb0d 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java @@ -27,8 +27,11 @@ import ca.uhn.hl7v2.model.v24.segment.QRD; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for HL7 DataFormat. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java index f0a97fb..937c4bc 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java @@ -26,7 +26,9 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test for situation where the two end bytes are split across different byte diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java index 5be4a17..8eb58e0 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java @@ -25,7 +25,9 @@ import ca.uhn.hl7v2.model.v25.segment.MSH; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLP Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java index 183201f..d4eaea0 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java @@ -28,7 +28,9 @@ import java.util.concurrent.TimeUnit; import ca.uhn.hl7v2.model.Message; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for the HL7MLLP Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java index df6e0d9..99f2839 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.hl7; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test to demonstrate the HL7MLLPCodec is message format agnostic (don't diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java index 28da793..a853017 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java @@ -23,7 +23,9 @@ import ca.uhn.hl7v2.model.v24.segment.MSH; import ca.uhn.hl7v2.model.v24.segment.QRD; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLP Codec using different start and end bytes. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java index 40ebcbd..e8cacaf 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java @@ -23,7 +23,9 @@ import ca.uhn.hl7v2.model.v24.segment.MSH; import ca.uhn.hl7v2.model.v24.segment.QRD; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLP Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java index 57565a5..65868ec 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java @@ -26,7 +26,9 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test for situation where the two end bytes are split across different byte diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java index 9a06460..608fc85 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java @@ -28,7 +28,10 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for HL7 routing where the netty endpoint passes on a byte array diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java index 104fa42..fe20578 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java @@ -27,7 +27,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLP Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java index b6a5605..ea1f9d2 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java @@ -25,7 +25,9 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLP Codec using different start and end bytes. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java index a73a906..ade21a5 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java @@ -25,7 +25,9 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLPNetty Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java index 2fc7285..ecb9550 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java @@ -22,8 +22,8 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class HL7MLLPNettyDecoderResourceLeakTest extends HL7TestSupport { @@ -33,7 +33,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends HL7TestSupport { @BindToRegistry("hl7encoder") HL7MLLPNettyEncoderFactory encoder = new HL7MLLPNettyEncoderFactory(); - @BeforeClass + @BeforeAll // As the ResourceLeakDetector just write error log when it find the leak, // We need to check the log file to see if there is a leak. public static void enableNettyResourceLeakDetector() { diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java index c9a26ad..e8c99db 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java @@ -25,7 +25,9 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for the HL7MLLPNetty Codec. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java index 613d3c6..46e4b81 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java @@ -28,7 +28,10 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for HL7 routing. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java index bb53b63..08c34b5 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java @@ -28,7 +28,10 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.DataFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for HL7 routing. diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java index ae76813..751c64f 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java @@ -17,14 +17,14 @@ package org.apache.camel.component.hl7; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeAll; public abstract class HL7TestSupport extends CamelTestSupport { private static int port; - @BeforeClass + @BeforeAll public static void initPort() throws Exception { port = AvailablePortFinder.getNextAvailable(); } diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java index 59972b1..5a79672 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ValidateTest.java @@ -34,8 +34,12 @@ import ca.uhn.hl7v2.validation.impl.ValidationContextFactory; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class HL7ValidateTest extends CamelTestSupport { @@ -53,7 +57,7 @@ public class HL7ValidateTest extends CamelTestSupport { } catch (CamelExecutionException e) { assertIsInstanceOf(HL7Exception.class, e.getCause()); assertIsInstanceOf(DataTypeException.class, e.getCause()); - assertTrue("Should be a validation error message", e.getCause().getMessage().startsWith("ca.uhn.hl7v2.validation.ValidationException: Validation failed:")); + assertTrue(e.getCause().getMessage().startsWith("ca.uhn.hl7v2.validation.ValidationException: Validation failed:"), "Should be a validation error message"); } assertMockEndpointsSatisfied(); @@ -95,7 +99,7 @@ public class HL7ValidateTest extends CamelTestSupport { assertIsInstanceOf(HL7Exception.class, e.getCause()); assertIsInstanceOf(ValidationException.class, e.getCause().getCause()); System.out.println(e.getCause().getCause().getMessage()); - assertTrue("Should be a validation error message", e.getCause().getCause().getMessage().startsWith("Validation failed:")); + assertTrue(e.getCause().getCause().getMessage().startsWith("Validation failed:"), "Should be a validation error message"); } assertMockEndpointsSatisfied(); diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java index 18581ba..5d5f635 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7XmlDataFormatTest.java @@ -25,8 +25,11 @@ import ca.uhn.hl7v2.util.Terser; import ca.uhn.hl7v2.validation.impl.NoValidation; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HL7XmlDataFormatTest extends CamelTestSupport { diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java index c8d0707..3cb8adb 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/MessageValidatorTest.java @@ -28,11 +28,12 @@ import ca.uhn.hl7v2.validation.impl.ValidationContextFactory; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.messageConforms; import static org.apache.camel.component.hl7.HL7.messageConformsTo; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MessageValidatorTest extends CamelTestSupport { @@ -73,12 +74,13 @@ public class MessageValidatorTest extends CamelTestSupport { assertMockEndpointsSatisfied(); } - @Test(expected = CamelExecutionException.class) + @Test public void testCustomHapiContext() throws Exception { MockEndpoint mock = getMockEndpoint("mock:test5"); mock.expectedMessageCount(0); Message msg = createADT01Message(); - template.sendBody("direct:test5", msg); + assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:test5", msg)); assertMockEndpointsSatisfied(); } @@ -91,12 +93,13 @@ public class MessageValidatorTest extends CamelTestSupport { assertMockEndpointsSatisfied(); } - @Test(expected = CamelExecutionException.class) + @Test public void testCustomValidationContext() throws Exception { MockEndpoint mock = getMockEndpoint("mock:test2"); mock.expectedMessageCount(0); Message msg = createADT01Message(); - template.sendBody("direct:test2", msg); + assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:test2", msg)); assertMockEndpointsSatisfied(); } @@ -119,13 +122,14 @@ public class MessageValidatorTest extends CamelTestSupport { assertMockEndpointsSatisfied(); } - @Test(expected = CamelExecutionException.class) + @Test public void testDynamicCustomHapiContext() throws Exception { MockEndpoint mock = getMockEndpoint("mock:test6"); mock.expectedMessageCount(0); Message msg = createADT01Message(); msg.setParser(customContext.getPipeParser()); - template.sendBody("direct:test6", msg); + assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:test6", msg)); assertMockEndpointsSatisfied(); } diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java index b055ba0..578e1cf 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/TerserExpressionTest.java @@ -22,10 +22,11 @@ import ca.uhn.hl7v2.model.v24.segment.PID; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.hl7.HL7.hl7terser; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TerserExpressionTest extends CamelTestSupport { @@ -56,14 +57,16 @@ public class TerserExpressionTest extends CamelTestSupport { assertMockEndpointsSatisfied(); } - @Test(expected = CamelExecutionException.class) + @Test public void testTerserInvalidExpression() throws Exception { - template.sendBody("direct:test4", createADT01Message()); + assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:test4", createADT01Message())); } - @Test(expected = CamelExecutionException.class) + @Test public void testTerserInvalidMessage() throws Exception { - template.sendBody("direct:test4", "text instead of message"); + assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:test4", "text instead of message")); } @Test
