optimizing test case processing (#433)

Author: dixonwhitmire

src/test/java/com/linuxforhealth/connect/builder/EtlRouteTest.java

@@ -12,15 +12,21 @@
 import com.linuxforhealth.connect.support.etl.PractitionerCsvFormat;
 import com.linuxforhealth.connect.support.etl.PractitionerCsvTransform;
 
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelException;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
 
 /**
  * Tests {@link EtlRouteBuilder}
  */
+@TestInstance(Lifecycle.PER_CLASS)
 public class EtlRouteTest extends RouteTestSupport{
 
     private MockEndpoint mockError;
@@ -53,26 +59,29 @@ protected RoutesBuilder[] createRouteBuilders() throws Exception {
             };
     }
 
-    /**
-     * Configures mock endppoints for the ETLRoute and the supporting LinuxForHealthRoute error handling route.
-     * @throws Exception if an error occurs applying advice
-     */
-    @BeforeEach
     @Override
-    protected void configureContext() throws Exception {
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext context = super.createCamelContext();
         context.getRegistry().bind("LFHKafkaConsumer", new LFHKafkaConsumer());
         context.getRegistry().bind("practitionercsvformat", new PractitionerCsvFormat());
         context.getRegistry().bind("practitionercsvtransform", new PractitionerCsvTransform());
+        return context;
+    }
 
-        mockError = mockProducerEndpointById(LinuxForHealthRouteBuilder.ERROR_ROUTE_ID,
-                                            LinuxForHealthRouteBuilder.ERROR_PRODUCER_ID,
-                                            "mock:error");
-
-        mockPersist = mockProducerEndpointById(EtlRouteBuilder.ROUTE_ID,
-                            EtlRouteBuilder.DATA_PERSIST_PRODUCER_ID,
-                            "mock:dataPersist");
-
-        super.configureContext();
+    @Override
+    public void beforeTestExecution(ExtensionContext context) throws Exception {
+        super.beforeTestExecution(context);
+        if (mockError == null) {
+            mockError = mockProducerEndpointById(LinuxForHealthRouteBuilder.ERROR_ROUTE_ID,
+                LinuxForHealthRouteBuilder.ERROR_PRODUCER_ID,
+                "mock:error");
+        }
+
+        if (mockPersist == null) {
+            mockPersist = mockProducerEndpointById(EtlRouteBuilder.ROUTE_ID,
+                EtlRouteBuilder.DATA_PERSIST_PRODUCER_ID,
+                "mock:dataPersist");
+        }
     }
 
     /**

src/test/java/com/linuxforhealth/connect/builder/Hl7v2RouteTest.java

@@ -25,7 +25,7 @@
  */
 public class Hl7v2RouteTest extends RouteTestSupport {
 
-    private MockEndpoint mockResult;
+    private MockEndpoint mockStoreAndNotify;
 
     @Override
     protected RoutesBuilder createRouteBuilder() throws Exception {
@@ -45,15 +45,11 @@ protected void configureContext() throws Exception {
         context.getRegistry().bind("hl7encoder", hl7encoder);
         context.getRegistry().bind("hl7decoder", hl7decoder);
 
-        mockProducerEndpointById(
-                Hl7v2RouteBuilder.ROUTE_ID,
-                Hl7v2RouteBuilder.ROUTE_PRODUCER_ID,
-                "mock:result"
-        );
+        mockStoreAndNotify = mockProducerEndpoint(Hl7v2RouteBuilder.ROUTE_ID,
+                             LinuxForHealthRouteBuilder.STORE_AND_NOTIFY_CONSUMER_URI,
+                             "mock:storeAndNotify");
 
         super.configureContext();
-
-        mockResult = MockEndpoint.resolve(context, "mock:result");
     }
 
     @Test
@@ -65,23 +61,24 @@ void testRoute() throws Exception {
 
         String expectedMessage = Base64.getEncoder().encodeToString(testMessage.getBytes(StandardCharsets.UTF_8));
 
-        mockResult.expectedMessageCount(1);
+        mockStoreAndNotify.expectedMessageCount(1);
         // the camel hl7 data format removes trailing delimiters from segments and fields
         // test files do not include trailing delimiters to simplify test assertions
         // the data format will include a terminating carriage return, \r, which is translated above from a new line \n
-        mockResult.expectedBodiesReceived(expectedMessage);
-        mockResult.expectedPropertyReceived("dataStoreUri", "kafka:HL7-V2_ADT?brokers=localhost:9094");
-        mockResult.expectedPropertyReceived("dataFormat", "HL7-V2");
-        mockResult.expectedPropertyReceived("messageType", "ADT");
-        mockResult.expectedPropertyReceived("routeId", "hl7-v2");
+        mockStoreAndNotify.expectedBodiesReceived(expectedMessage);
+        mockStoreAndNotify
+            .expectedPropertyReceived("dataStoreUri", "kafka:HL7-V2_ADT?brokers=localhost:9094");
+        mockStoreAndNotify.expectedPropertyReceived("dataFormat", "HL7-V2");
+        mockStoreAndNotify.expectedPropertyReceived("messageType", "ADT");
+        mockStoreAndNotify.expectedPropertyReceived("routeId", "hl7-v2");
 
         fluentTemplate.to("netty:tcp://localhost:2576?sync=true&encoders=#hl7encoder&decoders=#hl7decoder")
                 .withBody(testMessage)
                 .send();
 
-        mockResult.assertIsSatisfied();
+        mockStoreAndNotify.assertIsSatisfied();
 
-        Exchange mockExchange = mockResult.getExchanges().get(0);
+        Exchange mockExchange = mockStoreAndNotify.getExchanges().get(0);
         String expectedRouteUri = "netty://tcp://0.0.0.0:2576?sync=true&encoders=#hl7encoder&decoders=#hl7decoder";
         String actualRouteUri = mockExchange.getProperty("routeUri", String.class);
         LinuxForHealthAssertions.assertEndpointUriSame(expectedRouteUri, actualRouteUri);

src/test/java/com/linuxforhealth/connect/builder/RouteTestSupport.java

@@ -8,14 +8,17 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import org.apache.camel.CamelContext;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.language.ConstantExpression;
 import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
 import com.linuxforhealth.connect.support.TestUtils;
@@ -229,12 +232,18 @@ protected void addLast(String routeId, String mockUri) throws Exception {
      */
     @BeforeEach
     protected void configureContext() throws Exception {
+        if (isCreateCamelContextPerClass() && context.isStarted()) {
+            return;
+        }
         context.start();
         fluentTemplate.start();
     }
 
     @AfterEach
     protected void stopContext() {
+        if (isCreateCamelContextPerClass()) {
+            return;
+        }
         fluentTemplate.stop();
         context.stop();
     }