Finishing the tests

Author: n-o-u-r-h-a-n

foundation-models/openai/pom.xml

@@ -38,12 +38,12 @@
   </scm>
   <properties>
     <project.rootdir>${project.basedir}/../../</project.rootdir>
-    <coverage.complexity>70%</coverage.complexity>
-    <coverage.line>80%</coverage.line>
-    <coverage.instruction>76%</coverage.instruction>
-    <coverage.branch>70%</coverage.branch>
-    <coverage.method>75%</coverage.method>
-    <coverage.class>84%</coverage.class>
+    <coverage.complexity>83%</coverage.complexity>
+    <coverage.line>92%</coverage.line>
+    <coverage.instruction>90%</coverage.instruction>
+    <coverage.branch>81%</coverage.branch>
+    <coverage.method>90%</coverage.method>
+    <coverage.class>92%</coverage.class>
   </properties>
   <dependencies>
     <dependency>
@@ -158,6 +158,7 @@
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-client-chat</artifactId>
       <scope>test</scope>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 

foundation-models/openai/src/test/java/com/sap/ai/sdk/foundationmodels/openai/spring/OpenAiChatModelTest.java

@@ -11,7 +11,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -88,16 +87,6 @@ void testCompletion() {
     assertThat(result.getResult().getOutput().getText()).isNotEmpty();
   }
 
-  @Test
-  void testThrowsOnMissingChatOptions() {
-    assertThatThrownBy(() -> client.call(new Prompt("test")))
-        .isExactlyInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Please add OrchestrationChatOptions to the Prompt");
-    assertThatThrownBy(() -> client.stream(new Prompt("test")))
-        .isExactlyInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Please add OrchestrationChatOptions to the Prompt");
-  }
-
   @Test
   void testStreamCompletion() throws IOException {
     try (val inputStream = spy(fileLoader.apply("streamChatCompletion.txt"))) {
@@ -117,15 +106,13 @@ void testStreamCompletion() throws IOException {
       Flux<ChatResponse> flux = client.stream(prompt);
       val deltaList = flux.toStream().toList();
 
-      assertThat(deltaList).hasSize(3);
+      assertThat(deltaList).hasSize(5);
       // the first delta doesn't have any content
       assertThat(deltaList.get(0).getResult().getOutput().getText()).isEqualTo("");
-      assertThat(deltaList.get(1).getResult().getOutput().getText()).isEqualTo("Sure");
-      assertThat(deltaList.get(2).getResult().getOutput().getText()).isEqualTo("!");
-
-      assertThat(deltaList.get(0).getResult().getMetadata().getFinishReason()).isEqualTo("");
-      assertThat(deltaList.get(1).getResult().getMetadata().getFinishReason()).isEqualTo("");
-      assertThat(deltaList.get(2).getResult().getMetadata().getFinishReason()).isEqualTo("stop");
+      assertThat(deltaList.get(1).getResult().getOutput().getText()).isEqualTo("");
+      assertThat(deltaList.get(2).getResult().getOutput().getText()).isEqualTo("Sure");
+      assertThat(deltaList.get(3).getResult().getOutput().getText()).isEqualTo("!");
+      assertThat(deltaList.get(4).getResult().getOutput().getText()).isEqualTo("");
 
       Mockito.verify(inputStream, times(1)).close();
     }
@@ -217,7 +204,7 @@ void testChatMemory() throws IOException {
             .willSetStateTo("Second Call"));
 
     stubFor(
-        post(urlPathEqualTo("/v2/completion"))
+        post(urlPathEqualTo("/chat/completions"))
             .inScenario("Chat Memory")
             .whenScenarioStateIs("Second Call")
             .willReturn(