Skip to content

Commit e1b23ad

Browse files
authored
Migrate Health Insights libraries to test proxy (#35703)
* Migrate Health Insights libraries to test proxy * refactor test base
1 parent e6ed3b0 commit e1b23ad

File tree

2 files changed

+11
-40
lines changed

2 files changed

+11
-40
lines changed

sdk/healthinsights/azure-health-insights-cancerprofiling/src/test/java/com/azure/health/insights/cancerprofiling/CancerProfilingClientTestBase.java

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package com.azure.health.insights.cancerprofiling;
55

66
import com.azure.core.credential.AzureKeyCredential;
7-
import com.azure.core.http.policy.AzureKeyCredentialPolicy;
87
import com.azure.core.test.TestMode;
98
import com.azure.core.test.TestProxyTestBase;
109
import com.azure.core.test.models.CustomMatcher;
@@ -21,17 +20,18 @@
2120
*/
2221
public class CancerProfilingClientTestBase extends TestProxyTestBase {
2322
private static final String FAKE_API_KEY = "fakeKeyPlaceholder";
24-
private static final String OCP_APIM_SUBSCRIPTION_KEY = "Ocp-Apim-Subscription-Key";
2523

2624
void testCancerProfilingWithResponse(Consumer<BinaryData> testRunner) {
2725
testRunner.accept(getOncoPhenotypeRequest());
2826
}
2927

3028
CancerProfilingClientBuilder getClientBuilder() {
29+
String apiKey = Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_API_KEY", FAKE_API_KEY);
30+
String endpoint = Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT", "https://localhost:8080");
31+
3132
CancerProfilingClientBuilder builder = new CancerProfilingClientBuilder()
32-
.endpoint(getEndpoint())
33-
.addPolicy(new AzureKeyCredentialPolicy(OCP_APIM_SUBSCRIPTION_KEY,
34-
new AzureKeyCredential(getKey())));
33+
.endpoint(endpoint)
34+
.credential(new AzureKeyCredential(apiKey));
3535

3636
if (getTestMode() == TestMode.RECORD) {
3737
builder.addPolicy(interceptorManager.getRecordPolicy());
@@ -43,20 +43,6 @@ CancerProfilingClientBuilder getClientBuilder() {
4343
return builder;
4444
}
4545

46-
private String getKey() {
47-
if (getTestMode() == TestMode.PLAYBACK) {
48-
return FAKE_API_KEY;
49-
} else {
50-
return Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_API_KEY");
51-
}
52-
}
53-
54-
String getEndpoint() {
55-
return interceptorManager.isPlaybackMode()
56-
? "https://localhost:8080"
57-
: Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT");
58-
}
59-
6046
private BinaryData getOncoPhenotypeRequest() {
6147
File requestFile = new File(CancerProfilingClientTestBase.class.getResource("/CancerProfilingClientTest.request.json").getPath());
6248
try {

sdk/healthinsights/azure-health-insights-clinicalmatching/src/test/java/com/azure/health/insights/clinicalmatching/ClinicalMatchingClientTestBase.java

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package com.azure.health.insights.clinicalmatching;
55

66
import com.azure.core.credential.AzureKeyCredential;
7-
import com.azure.core.http.policy.AzureKeyCredentialPolicy;
87
import com.azure.core.test.TestMode;
98
import com.azure.core.test.TestProxyTestBase;
109
import com.azure.core.test.models.CustomMatcher;
@@ -15,47 +14,33 @@
1514
import java.util.Arrays;
1615
import java.util.function.Consumer;
1716

18-
1917
/**
2018
* Base class for TM clients test.
2119
*/
2220
public class ClinicalMatchingClientTestBase extends TestProxyTestBase {
2321
private static final String FAKE_API_KEY = "fakeKeyPlaceholder";
24-
private static final String OCP_APIM_SUBSCRIPTION_KEY = "Ocp-Apim-Subscription-Key";
22+
2523
void testTMWithResponse(Consumer<BinaryData> testRunner) {
2624
testRunner.accept(getTMRequest());
2725
}
2826

2927
ClinicalMatchingClientBuilder getClientBuilder() {
28+
String apiKey = Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_API_KEY", FAKE_API_KEY);
29+
String endpoint = Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT", "https://localhost:8080");
30+
3031
ClinicalMatchingClientBuilder builder = new ClinicalMatchingClientBuilder()
31-
.endpoint(getEndpoint())
32-
.addPolicy(new AzureKeyCredentialPolicy(OCP_APIM_SUBSCRIPTION_KEY,
33-
new AzureKeyCredential(getKey())));
32+
.endpoint(endpoint)
33+
.credential(new AzureKeyCredential(apiKey));
3434
if (getTestMode() == TestMode.RECORD) {
3535
builder.addPolicy(interceptorManager.getRecordPolicy());
3636
} else if (getTestMode() == TestMode.PLAYBACK) {
3737
builder.httpClient(interceptorManager.getPlaybackClient());
3838
interceptorManager.addMatchers(Arrays.asList(new CustomMatcher()
3939
.setHeadersKeyOnlyMatch(Arrays.asList("repeatability-first-sent", "repeatability-request-id"))));
4040
}
41-
4241
return builder;
4342
}
4443

45-
private String getKey() {
46-
if (getTestMode() == TestMode.PLAYBACK) {
47-
return FAKE_API_KEY;
48-
} else {
49-
return Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_API_KEY");
50-
}
51-
}
52-
53-
String getEndpoint() {
54-
return interceptorManager.isPlaybackMode()
55-
? "https://localhost:8080"
56-
: Configuration.getGlobalConfiguration().get("AZURE_HEALTHINSIGHTS_ENDPOINT");
57-
}
58-
5944
private BinaryData getTMRequest() {
6045
File requestFile = new File(ClinicalMatchingClientTestBase.class.getResource("/ClinicalMatchingClientTest.request.json").getPath());
6146
try {

0 commit comments

Comments
 (0)