[Health insights ] Migrate to Test proxy (#35752)

Azure · Jul 6, 2023 · dc114e6 · dc114e6
1 parent 2f40427
commit dc114e6
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 278 deletions.
diff --git a/sdk/healthinsights/azure-health-insights-cancerprofiling/assets.json b/sdk/healthinsights/azure-health-insights-cancerprofiling/assets.json
@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "java",
+  "TagPrefix": "java/healthinsights/azure-health-insights-cancerprofiling",
+  "Tag": "java/healthinsights/azure-health-insights-cancerprofiling_6e4a38da99"
+}
diff --git a/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml b/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml
@@ -44,6 +44,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.min.linecoverage>0.1</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0.1</jacoco.min.branchcoverage>
+    <javaModulesSurefireArgLine>
+      --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+    </javaModulesSurefireArgLine>
   </properties>
   <dependencies>
     <dependency>

diff --git a/...rc/test/java/com/azure/health/insights/cancerprofiling/CancerProfilingClientTestBase.java b/...rc/test/java/com/azure/health/insights/cancerprofiling/CancerProfilingClientTestBase.java
@@ -4,24 +4,22 @@
 package com.azure.health.insights.cancerprofiling;
 
 import com.azure.core.credential.AzureKeyCredential;
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.AzureKeyCredentialPolicy;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.core.test.TestBase;
 import com.azure.core.test.TestMode;
+import com.azure.core.test.TestProxyTestBase;
+import com.azure.core.test.models.CustomMatcher;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.Configuration;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 
 /**
  * Base class for OncoPhenotype clients test.
  */
-public class CancerProfilingClientTestBase extends TestBase {
+public class CancerProfilingClientTestBase extends TestProxyTestBase {
     private static final String FAKE_API_KEY = "fakeKeyPlaceholder";
     private static final String OCP_APIM_SUBSCRIPTION_KEY = "Ocp-Apim-Subscription-Key";
 
@@ -30,23 +28,19 @@ void testCancerProfilingWithResponse(Consumer<BinaryData> testRunner) {
     }
 
     CancerProfilingClientBuilder getClientBuilder() {
-        String endpoint = getEndpoint();
+        CancerProfilingClientBuilder builder = new CancerProfilingClientBuilder()
+            .endpoint(getEndpoint())
+            .addPolicy(new AzureKeyCredentialPolicy(OCP_APIM_SUBSCRIPTION_KEY,
+                new AzureKeyCredential(getKey())));
 
-        HttpPipelinePolicy authPolicy = new AzureKeyCredentialPolicy(OCP_APIM_SUBSCRIPTION_KEY,
-            new AzureKeyCredential(getKey()));
-        HttpClient httpClient;
-        if (getTestMode() == TestMode.RECORD || getTestMode() == TestMode.LIVE) {
-            httpClient = HttpClient.createDefault();
-        } else {
-            httpClient = interceptorManager.getPlaybackClient();
+        if (getTestMode() == TestMode.RECORD) {
+            builder.addPolicy(interceptorManager.getRecordPolicy());
+        } else if (getTestMode() == TestMode.PLAYBACK) {
+            builder.httpClient(interceptorManager.getPlaybackClient());
+            interceptorManager.addMatchers(Arrays.asList(new CustomMatcher()
+                .setHeadersKeyOnlyMatch(Arrays.asList("repeatability-first-sent", "repeatability-request-id"))));
         }
-        HttpPipeline httpPipeline = new HttpPipelineBuilder()
-            .httpClient(httpClient)
-            .policies(authPolicy, interceptorManager.getRecordPolicy()).build();
-
-        return new CancerProfilingClientBuilder()
-            .pipeline(httpPipeline)
-            .endpoint(endpoint);
+        return builder;
     }
 
     private String getKey() {
@@ -59,8 +53,8 @@ private String getKey() {
 
     String getEndpoint() {
         return interceptorManager.isPlaybackMode()
-               ? "https://localhost:8080"
-               : Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT");
+            ? "https://localhost:8080"
+            : Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT");
     }
 
     private BinaryData getOncoPhenotypeRequest() {

diff --git a/...cancerprofiling/src/test/resources/session-records/CancerProfilingClientTest.request.json b/...cancerprofiling/src/test/resources/session-records/CancerProfilingClientTest.request.json
diff --git a/...ts-cancerprofiling/src/test/resources/session-records/CancerProfilingClientTest.test.json b/...ts-cancerprofiling/src/test/resources/session-records/CancerProfilingClientTest.test.json
diff --git a/sdk/healthinsights/azure-health-insights-clinicalmatching/assets.json b/sdk/healthinsights/azure-health-insights-clinicalmatching/assets.json
@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "java",
+  "TagPrefix": "java/healthinsights/azure-health-insights-clinicalmatching",
+  "Tag": "java/healthinsights/azure-health-insights-clinicalmatching_4d2cbbf458"
+}
diff --git a/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml b/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml
@@ -44,6 +44,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.min.linecoverage>0.1</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0.1</jacoco.min.branchcoverage>
+    <javaModulesSurefireArgLine>
+      --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
+    </javaModulesSurefireArgLine>
   </properties>
   <dependencies>
     <dependency>