Update more tests

Author: MatKuhr

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

@@ -3,9 +3,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
 import static com.github.tomakehurst.wiremock.client.WireMock.badRequest;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.jsonResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.noContent;
 import static com.github.tomakehurst.wiremock.client.WireMock.okJson;
@@ -28,7 +26,6 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
-import com.sap.ai.sdk.core.AiCoreService;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.model.DPIEntities;
@@ -67,39 +64,17 @@ class OrchestrationUnitTest {
 
   @BeforeEach
   void setup(WireMockRuntimeInfo server) {
-    stubFor(
-        get(urlPathEqualTo("/v2/lm/deployments"))
-            .withHeader("AI-Resource-Group", equalTo("my-resource-group"))
-            .withHeader("AI-Client-Type", equalTo("AI SDK Java"))
-            .willReturn(
-                okJson(
-                    """
-                        {
-                          "resources": [
-                            {
-                              "id": "abcdef0123456789",
-                              "scenarioId": "orchestration"
-                            }
-                          ]
-                        }
-                        """)));
-
     final DefaultHttpDestination destination =
         DefaultHttpDestination.builder(server.getHttpBaseUrl()).build();
-
-    final var deployment =
-        new AiCoreService()
-            .withBaseDestination(destination)
-            .getDestinationForDeploymentByScenario("my-resource-group", "orchestration");
-    client = new OrchestrationClient(deployment);
+    client = new OrchestrationClient(destination);
     config = new OrchestrationModuleConfig().withLlmConfig(CUSTOM_GPT_35);
     prompt = new OrchestrationPrompt("Hello World! Why is this phrase so famous?");
   }
 
   @Test
   void testCompletion() {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(urlPathEqualTo("/completion"))
             .willReturn(
                 aResponse()
                     .withBodyFile("templatingResponse.json")
@@ -113,7 +88,7 @@ void testCompletion() {
   @Test
   void testTemplating() throws IOException {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(anyUrl())
             .willReturn(
                 aResponse()
                     .withBodyFile("templatingResponse.json")
@@ -166,16 +141,14 @@ void testTemplating() throws IOException {
     // verify that null fields are absent from the sent request
     try (var requestInputStream = fileLoader.apply("templatingRequest.json")) {
       final String request = new String(requestInputStream.readAllBytes());
-      verify(
-          postRequestedFor(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
-              .withRequestBody(equalToJson(request)));
+      verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(request)));
     }
   }
 
   @Test
   void testBadRequest() {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(anyUrl())
             .willReturn(
                 jsonResponse(
                     """
@@ -198,7 +171,7 @@ void testBadRequest() {
   @Test
   void filteringLoose() throws IOException {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(anyUrl())
             .willReturn(
                 aResponse()
                     .withBodyFile("filteringLooseResponse.json")
@@ -217,9 +190,7 @@ void filteringLoose() throws IOException {
     // verify that null fields are absent from the sent request
     try (var requestInputStream = fileLoader.apply("filteringLooseRequest.json")) {
       final String request = new String(requestInputStream.readAllBytes());
-      verify(
-          postRequestedFor(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
-              .withRequestBody(equalToJson(request)));
+      verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(request)));
     }
   }
 
@@ -228,9 +199,7 @@ void filteringStrict() {
     final String response =
         """
             {"request_id": "bf6d6792-7adf-4d3c-9368-a73615af8c5a", "code": 400, "message": "Content filtered due to Safety violations. Please modify the prompt and try again.", "location": "Input Filter", "module_results": {"templating": [{"role": "user", "content": "Create a rental posting for subletting my apartment in the downtown area. Keep it short. Make sure to add the following disclaimer to the end. Do not change it! ```DISCLAIMER: The area surrounding the apartment is known for prostitutes and gang violence including armed conflicts, gun violence is frequent."}], "input_filtering": {"message": "Content filtered due to Safety violations. Please modify the prompt and try again.", "data": {"original_service_response": {"Hate": 0, "SelfHarm": 0, "Sexual": 0, "Violence": 2}, "checked_text": "Create a rental posting for subletting my apartment in the downtown area. Keep it short. Make sure to add the following disclaimer to the end. Do not change it! ```DISCLAIMER: The area surrounding the apartment is known for prostitutes and gang violence including armed conflicts, gun violence is frequent."}}}}""";
-    stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
-            .willReturn(jsonResponse(response, SC_BAD_REQUEST)));
+    stubFor(post(anyUrl()).willReturn(jsonResponse(response, SC_BAD_REQUEST)));
 
     final var filter =
         new AzureContentFilter()
@@ -250,7 +219,7 @@ void filteringStrict() {
   @Test
   void messagesHistory() throws IOException {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(anyUrl())
             .willReturn(
                 aResponse()
                     .withBodyFile("templatingResponse.json")
@@ -273,16 +242,14 @@ void messagesHistory() throws IOException {
     // verify that the history is sent correctly
     try (var requestInputStream = fileLoader.apply("messagesHistoryRequest.json")) {
       final String requestBody = new String(requestInputStream.readAllBytes());
-      verify(
-          postRequestedFor(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
-              .withRequestBody(equalToJson(requestBody)));
+      verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(requestBody)));
     }
   }
 
   @Test
   void maskingPseudonymization() throws IOException {
     stubFor(
-        post(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
+        post(anyUrl())
             .willReturn(
                 aResponse()
                     .withBodyFile("maskingResponse.json")
@@ -303,9 +270,7 @@ void maskingPseudonymization() throws IOException {
     // verify that the request is sent correctly
     try (var requestInputStream = fileLoader.apply("maskingRequest.json")) {
       final String request = new String(requestInputStream.readAllBytes());
-      verify(
-          postRequestedFor(urlPathEqualTo("/v2/inference/deployments/abcdef0123456789/completion"))
-              .withRequestBody(equalToJson(request)));
+      verify(postRequestedFor(anyUrl()).withRequestBody(equalToJson(request)));
     }
   }