Skip to content

Commit 63d5ac4

Browse files
authored
[TA] Enable AAD test and record test (Azure#35422)
1 parent 465039d commit 63d5ac4

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

sdk/textanalytics/azure-ai-textanalytics/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/textanalytics/azure-ai-textanalytics",
5-
"Tag": "java/textanalytics/azure-ai-textanalytics_20f07a95c8"
5+
"Tag": "java/textanalytics/azure-ai-textanalytics_3f063ec504"
66
}

sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilderTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.azure.core.test.annotation.DoNotRecord;
3232
import com.azure.core.test.http.MockHttpResponse;
3333
import com.azure.core.test.models.CustomMatcher;
34+
import com.azure.core.test.utils.MockTokenCredential;
3435
import com.azure.core.util.ClientOptions;
3536
import com.azure.core.util.Configuration;
3637
import com.azure.core.util.Header;
@@ -263,7 +264,6 @@ public void clientBuilderWithNewLanguageForBatchOperation(HttpClient httpClient,
263264
});
264265
}
265266

266-
@Disabled("Waiting for service to enable it")
267267
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
268268
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
269269
public void clientBuilderWithAAD(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
@@ -434,14 +434,17 @@ void clientBuilderWithAadRunner(HttpClient httpClient, TextAnalyticsServiceVersi
434434
.pipeline(getHttpPipeline(httpClient))
435435
.serviceVersion(serviceVersion);
436436

437-
if (interceptorManager.isPlaybackMode()) {
437+
if (interceptorManager.isRecordMode()) {
438+
clientBuilder.addPolicy(interceptorManager.getRecordPolicy());
439+
} else if (interceptorManager.isPlaybackMode()) {
438440
// since running in playback mode won't have the token credential, so skipping matching it.
439441
interceptorManager.addMatchers(Arrays.asList(
440442
new CustomMatcher().setExcludedHeaders(Arrays.asList("Authorization"))));
441-
}
442443

443-
if (interceptorManager.isRecordMode()) {
444-
clientBuilder.addPolicy(interceptorManager.getRecordPolicy());
444+
clientBuilder.credential(new MockTokenCredential());
445+
}
446+
if (!interceptorManager.isPlaybackMode()) {
447+
clientBuilder.credential(new DefaultAzureCredentialBuilder().build());
445448
}
446449

447450
testRunner.apply(clientBuilder).accept(DETECT_LANGUAGE_INPUTS.get(0), DETECTED_LANGUAGE_ENGLISH);

0 commit comments

Comments
 (0)