ci: Fix jacoco coverage (#296)

* current coverage on local run

* increase coverage threshold

* increase coverage threshold

* change POM of core to support coverage check

* Revert "change POM of core to support coverage check"

This reverts commit 8a44aed.

* fix jacoco command in CI

* set orchestration test coverage to 100% for testing

* set core threshold to actual coverage

* Revert "set core threshold to actual coverage"

This reverts commit a8fc127.

* CI test

* test for OpenAI coverage

* fix orchestration

* test

* test

* test pom config

* test pom config

* original pom config

* Update AiCoreServiceTest.java

* run with new test

* fix

* with report

* fix with report

* fix with report

* final test

* final test

* final coverage orchestration

* final coverage openAI

---------

Co-authored-by: I750911 <[email protected]>
Co-authored-by: Alexander Dümont <[email protected]>

Author: 3 people

.github/workflows/continuous-integration.yaml

@@ -67,7 +67,7 @@ jobs:
 
       - name: "Run Unit Tests"
         run: |
-          MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} org.jacoco:jacoco-maven-plugin:prepare-agent surefire:test org.jacoco:jacoco-maven-plugin:report"
+          MVN_ARGS="${{ env.MVN_MULTI_THREADED_ARGS }} org.jacoco:jacoco-maven-plugin:prepare-agent surefire:test org.jacoco:jacoco-maven-plugin:report org.jacoco:jacoco-maven-plugin:check@default-check"
           mvn $MVN_ARGS
 
       - name: "Slack Notification"

core/pom.xml

@@ -30,11 +30,11 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>62%</coverage.complexity>
-    <coverage.line>76%</coverage.line>
-    <coverage.instruction>76%</coverage.instruction>
+    <coverage.complexity>64%</coverage.complexity>
+    <coverage.line>78%</coverage.line>
+    <coverage.instruction>79%</coverage.instruction>
     <coverage.branch>60%</coverage.branch>
-    <coverage.method>74%</coverage.method>
+    <coverage.method>77%</coverage.method>
     <coverage.class>90%</coverage.class>
   </properties>
 

core/src/test/java/com/sap/ai/sdk/core/AiCoreServiceTest.java

@@ -1,9 +1,14 @@
 package com.sap.ai.sdk.core;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.okJson;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination;
 import com.sap.cloud.sdk.cloudplatform.connectivity.Header;
 import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestination;
@@ -63,17 +68,30 @@ void testCustomBaseDestination() {
 
   @Test
   void testGetInferenceDestination() {
-    var builder = service.getInferenceDestination();
+    // default resource group destination
+    val builder = service.getInferenceDestination();
     assertThatThrownBy(() -> builder.forScenario("doesn't exist"))
         .isExactlyInstanceOf(DeploymentResolutionException.class);
 
+    // custom resource group destination
     val destination = service.getInferenceDestination("foo").usingDeploymentId("123");
-
     assertThat(destination.getUri())
         .hasHost("api.ai.com")
         .hasPath("/v2/inference/deployments/123/");
-
     assertThat(destination.getHeaders()).containsExactly(new Header("AI-Resource-Group", "foo"));
+
+    // scenario-based destination
+    val d = "{\"count\":1,\"resources\":[{\"id\":\"0123456789abcdef\",\"scenarioId\":\"foobar\"}]}";
+    val server = new WireMockServer(wireMockConfig().dynamicPort());
+    server.start();
+    server.stubFor(get(urlEqualTo("/v2/lm/deployments")).willReturn(okJson(d)));
+    HttpDestination foobar =
+        service
+            .withBaseDestination(DefaultHttpDestination.builder(server.baseUrl() + "/v2/").build())
+            .getInferenceDestination()
+            .forScenario("foobar");
+    assertThat(foobar.getUri()).hasPath("/v2/inference/deployments/0123456789abcdef/");
+    server.stop();
   }
 
   @Test

foundation-models/openai/pom.xml

@@ -33,10 +33,10 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <coverage.complexity>71%</coverage.complexity>
+    <coverage.complexity>72%</coverage.complexity>
     <coverage.line>80%</coverage.line>
     <coverage.instruction>76%</coverage.instruction>
-    <coverage.branch>69%</coverage.branch>
+    <coverage.branch>70%</coverage.branch>
     <coverage.method>83%</coverage.method>
     <coverage.class>84%</coverage.class>
   </properties>

orchestration/pom.xml

@@ -31,11 +31,11 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>76%</coverage.complexity>
-    <coverage.line>90%</coverage.line>
-    <coverage.instruction>91%</coverage.instruction>
-    <coverage.branch>69%</coverage.branch>
-    <coverage.method>70%</coverage.method>
+    <coverage.complexity>77%</coverage.complexity>
+    <coverage.line>92%</coverage.line>
+    <coverage.instruction>92%</coverage.instruction>
+    <coverage.branch>70%</coverage.branch>
+    <coverage.method>92%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>