fix: added the junit plugin and added the codecoverage reporting capa…

.github/workflows/maven.yml

@@ -0,0 +1,52 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Generate the Jacoco report
+      run: mvn jacoco:report
+
+    - name: Generate JaCoCo Badge
+      id: jacoco
+      uses: cicirello/[email protected]
+    - name: Log coverage percentage
+      run: |
+        echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+        echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
+
+    - name: Upload JaCoCo coverage report
+      uses: actions/upload-artifact@v2
+      with:
+          name: jacoco-report
+          path: target/site/jacoco/
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@v3

pom.xml

@@ -69,6 +69,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.junit</groupId>
+				<artifactId>junit-bom</artifactId>
+				<version>5.10.2</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency> 
 		</dependencies>
 	</dependencyManagement>
 
@@ -102,6 +109,12 @@
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!-- <dependency>
 		  <groupId>org.apache.camel.springboot</groupId>
 		  <artifactId>camel-rest-starter</artifactId>
@@ -298,7 +311,18 @@
 			<version>${camel-version}</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency> 
+    <dependency>
+			<groupId>org.openehealth.ipf.commons</groupId>
+			<artifactId>ipf-commons-ihe-xds</artifactId>
+			<version>${ipf-version}</version>
+			<scope>test</scope>
+			<type>test-jar</type>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -373,7 +397,30 @@
 				</executions>
 			</plugin>
 			<!-- end::unpack[] -->
-
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.2.5</version>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.12</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<!-- attached to Maven test phase -->
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 		</plugins>
 	</build>

src/main/resources/application.yml

@@ -104,3 +104,18 @@ camel:
 spring:
   application:
     name: mobile-access-gateway
+
+management:
+  endpoint:
+    health:
+      probes:
+        enabled: true
+    shutdown:
+      enabled: true
+    info:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+        exclude: "env,beans"

src/test/java/ch.bfh.ti.i4mi.mag.ppqm/Ppq4Test.java

@@ -7,6 +7,7 @@
 import org.apache.camel.support.DefaultExchange;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.OperationOutcome;
+import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
 import org.openehealth.ipf.commons.ihe.fhir.chppqm.ChPpqmUtils;
 import org.openehealth.ipf.platform.camel.core.util.Exchanges;
@@ -166,5 +167,4 @@ public void testDeleteFailure() throws Exception {
         }
         assertTrue(exceptionHandled);
     }
-
 }

src/test/java/ch/bfh/ti/i4mi/mag/TestBase.java

@@ -0,0 +1,46 @@
+package ch.bfh.ti.i4mi.mag;
+
+import ch.bfh.ti.i4mi.mag.MobileAccessGateway;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.junit.jupiter.api.BeforeAll;
+import org.openehealth.ipf.commons.ihe.xacml20.Xacml20Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
+
+import java.util.Locale;
+
+/**
+ * @author Dmytro Rud
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@Import(MobileAccessGateway.class)
+@ActiveProfiles("test")
+@Slf4j
+abstract public class TestBase {
+
+    @Autowired
+    protected CamelContext camelContext;
+
+    @Autowired
+    protected ProducerTemplate producerTemplate;
+
+    @Value("${server.port}")
+    protected Integer serverPort;
+
+    @BeforeAll
+    public static void beforeAll() {
+        Xacml20Utils.initializeHerasaf();
+        Locale.setDefault(Locale.ENGLISH);
+
+//        System.setProperty("javax.net.ssl.keyStore", "src/main/resources/example-server-certificate.p12");
+//        System.setProperty("javax.net.ssl.keyStorePassword", "a1b2c3");
+//        System.setProperty("javax.net.ssl.trustStore", "src/main/resources/example-server-certificate.p12");
+//        System.setProperty("javax.net.ssl.trustStorePassword", "a1b2c3");
+    }
+
+}

src/test/java/ch/bfh/ti/i4mi/mag/mhd/iti66/IdRequestConverterTest.java

@@ -0,0 +1,47 @@
+package ch.bfh.ti.i4mi.mag.mhd.iti66;
+
+import ch.bfh.ti.i4mi.mag.TestBase;
+import org.junit.jupiter.api.Test;
+import org.openehealth.ipf.commons.ihe.xds.core.requests.QueryRegistry;
+import org.openehealth.ipf.commons.ihe.xds.core.requests.query.GetSubmissionSetAndContentsQuery;
+import org.openehealth.ipf.commons.ihe.xds.core.transform.requests.QueryRegistryTransformer;
+import org.openehealth.ipf.commons.ihe.xds.core.validate.requests.AdhocQueryRequestValidator;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.openehealth.ipf.commons.ihe.xds.XDS.Interactions.ITI_18;
+
+public class IdRequestConverterTest extends TestBase {
+
+    private final IdRequestConverter _sut;
+    private final QueryRegistryTransformer _queryRegistryTransformer;
+
+    public IdRequestConverterTest() {
+        _sut = new IdRequestConverter();
+        _queryRegistryTransformer = new QueryRegistryTransformer();
+    }
+
+    @Test
+    public void idToGetDocumentQuery_MissingFhirHeader_null() {
+        QueryRegistry result = _sut.idToGetDocumentsQuery("");
+        assertNull(result);
+    }
+
+    @Test
+    public void idToGetDocumentQuery_NotContainingSlash_null() {
+        QueryRegistry result = _sut.idToGetDocumentsQuery("some-fhir-uri");
+        assertNull(result);
+    }
+
+    @Test
+    public void idToGetDocumentQuery_ValidFhirHttpUri_QueryValidated() {
+        QueryRegistry result = _sut.idToGetDocumentsQuery("some-fhir-uri/12345");
+
+        var uuid = ((GetSubmissionSetAndContentsQuery) result.getQuery()).getUuid();
+
+        assertTrue(result.getQuery() instanceof GetSubmissionSetAndContentsQuery);
+        assertEquals("12345", uuid);
+
+        var ebXmlResult = _queryRegistryTransformer.toEbXML(result);
+        AdhocQueryRequestValidator.getInstance().validate(ebXmlResult, ITI_18);
+    }
+}