Skip to content

Commit 2cac42a

Browse files
mssfangmssfang
authored
[TA] Fixed live tests (Azure#22235)
1 parent e6efc7d commit 2cac42a

File tree

38 files changed

+442
-471
lines changed

38 files changed

+442
-471
lines changed

‎sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TestUtils.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,10 @@ static RecognizeEntitiesResultCollection getExpectedBatchCategorizedEntities() {
238238
* Helper method to get the expected Categorized Entities List 1
239239
*/
240240
static List<CategorizedEntity> getCategorizedEntitiesList1() {
241-
// TODO: [ServiceBug] service currently returns two entities by errors, reuse the result and record again
242-
// after service correct it. https://github.com/Azure/azure-sdk-for-java/issues/18982
243-
// CategorizedEntity categorizedEntity1 = new CategorizedEntity("trip", EntityCategory.EVENT, null, 0.0, 18);
241+
CategorizedEntity categorizedEntity1 = new CategorizedEntity("trip", EntityCategory.EVENT, null, 0.0, 18);
244242
CategorizedEntity categorizedEntity2 = new CategorizedEntity("Seattle", EntityCategory.LOCATION, "GPE", 0.0, 26);
245243
CategorizedEntity categorizedEntity3 = new CategorizedEntity("last week", EntityCategory.DATE_TIME, "DateRange", 0.0, 34);
246-
// return asList(categorizedEntity1, categorizedEntity2, categorizedEntity3);
247-
return asList(categorizedEntity2, categorizedEntity3);
244+
return asList(categorizedEntity1, categorizedEntity2, categorizedEntity3);
248245
}
249246

250247
/**
@@ -452,8 +449,8 @@ static ExtractKeyPhrasesResultCollection getExpectedBatchKeyPhrases() {
452449
TextDocumentStatistics textDocumentStatistics1 = new TextDocumentStatistics(49, 1);
453450
TextDocumentStatistics textDocumentStatistics2 = new TextDocumentStatistics(21, 1);
454451

455-
ExtractKeyPhraseResult extractKeyPhraseResult1 = new ExtractKeyPhraseResult("0", textDocumentStatistics1, null, new KeyPhrasesCollection(new IterableStream<>(asList("input text", "world")), null));
456-
ExtractKeyPhraseResult extractKeyPhraseResult2 = new ExtractKeyPhraseResult("1", textDocumentStatistics2, null, new KeyPhrasesCollection(new IterableStream<>(Collections.singletonList("monde")), null));
452+
ExtractKeyPhraseResult extractKeyPhraseResult1 = new ExtractKeyPhraseResult("0", textDocumentStatistics1, null, new KeyPhrasesCollection(new IterableStream<>(asList("Hello world", "input text")), null));
453+
ExtractKeyPhraseResult extractKeyPhraseResult2 = new ExtractKeyPhraseResult("1", textDocumentStatistics2, null, new KeyPhrasesCollection(new IterableStream<>(asList("Bonjour", "monde")), null));
457454

458455
TextDocumentBatchStatistics textDocumentBatchStatistics = new TextDocumentBatchStatistics(2, 2, 0, 2);
459456
List<ExtractKeyPhraseResult> extractKeyPhraseResultList = asList(extractKeyPhraseResult1, extractKeyPhraseResult2);
@@ -934,9 +931,9 @@ static RecognizePiiEntitiesResultCollection getRecognizePiiEntitiesResultCollect
934931
static ExtractKeyPhrasesResultCollection getExtractKeyPhrasesResultCollection() {
935932
return new ExtractKeyPhrasesResultCollection(
936933
asList(new ExtractKeyPhraseResult("0", new TextDocumentStatistics(44, 1),
937-
null, new KeyPhrasesCollection(new IterableStream<>(asList("wonderful trip", "Seattle", "week")), null)),
934+
null, new KeyPhrasesCollection(new IterableStream<>(asList("wonderful trip", "Seattle")), null)),
938935
new ExtractKeyPhraseResult("1", new TextDocumentStatistics(67, 1),
939-
null, new KeyPhrasesCollection(new IterableStream<>(asList("Microsoft employee", "ssn", "awesome API's")), null))),
936+
null, new KeyPhrasesCollection(new IterableStream<>(asList("Microsoft employee", "ssn", "awesome", "API")), null))),
940937
DEFAULT_MODEL_VERSION,
941938
new TextDocumentBatchStatistics(2, 2, 0, 2));
942939
}
@@ -1078,7 +1075,7 @@ static ExtractKeyPhrasesResultCollection getExtractKeyPhrasesResultCollectionFor
10781075
List<ExtractKeyPhraseResult> extractKeyPhraseResults = new ArrayList<>();
10791076
for (int i = startIndex; i < startIndex + documentCount; i++) {
10801077
extractKeyPhraseResults.add(new ExtractKeyPhraseResult(Integer.toString(i), null, null,
1081-
new KeyPhrasesCollection(new IterableStream<>(asList("Microsoft employee", "ssn", "awesome API's")),
1078+
new KeyPhrasesCollection(new IterableStream<>(asList("Microsoft employee", "ssn", "awesome", "API")),
10821079
null)));
10831080
}
10841081
return new ExtractKeyPhrasesResultCollection(extractKeyPhraseResults, "2020-07-01",

‎sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,8 @@ public void extractKeyPhrasesForTextInput(HttpClient httpClient, TextAnalyticsSe
12191219
client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
12201220
extractKeyPhrasesForSingleTextInputRunner(input ->
12211221
StepVerifier.create(client.extractKeyPhrases(input))
1222-
.assertNext(response -> assertEquals("monde", response.iterator().next()))
1222+
.assertNext(keyPhrasesCollection -> validateKeyPhrases(asList("Bonjour", "monde"),
1223+
keyPhrasesCollection.stream().collect(Collectors.toList())))
12231224
.verifyComplete());
12241225
}
12251226

@@ -1965,6 +1966,7 @@ public void analyzeSentimentZalgoText(HttpClient httpClient, TextAnalyticsServic
19651966
// Healthcare LRO
19661967
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
19671968
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
1969+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
19681970
public void healthcareLroPagination(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
19691971
client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
19701972
healthcareLroPaginationRunner((documents, options) -> {
@@ -1983,6 +1985,7 @@ public void healthcareLroPagination(HttpClient httpClient, TextAnalyticsServiceV
19831985

19841986
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
19851987
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
1988+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
19861989
public void healthcareLroWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
19871990
client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
19881991
healthcareLroRunner((documents, options) -> {
@@ -2144,6 +2147,7 @@ public void analyzeHealthcareEntitiesEmojiFamilyWithSkinToneModifier(HttpClient
21442147

21452148
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
21462149
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
2150+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
21472151
public void analyzeHealthcareEntitiesDiacriticsNfc(HttpClient httpClient,
21482152
TextAnalyticsServiceVersion serviceVersion) {
21492153
client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);
@@ -2171,6 +2175,7 @@ public void analyzeHealthcareEntitiesDiacriticsNfc(HttpClient httpClient,
21712175

21722176
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
21732177
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
2178+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
21742179
public void analyzeHealthcareEntitiesDiacriticsNfd(HttpClient httpClient,
21752180
TextAnalyticsServiceVersion serviceVersion) {
21762181
client = getTextAnalyticsAsyncClient(httpClient, serviceVersion);

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,11 @@ public void clientBuilderWithDefaultLanguageForBatchOperation(HttpClient httpCli
202202
clientBuilderWithDefaultLanguageForBatchOperationRunner(httpClient, serviceVersion,
203203
clientBuilder -> (input, output) -> {
204204
final List<ExtractKeyPhraseResult> result =
205-
clientBuilder.buildClient().extractKeyPhrasesBatch(input, "FR", null).stream().collect(Collectors.toList());
205+
clientBuilder.buildClient().extractKeyPhrasesBatch(input, "FR", null)
206+
.stream().collect(Collectors.toList());
206207
for (int i = 0; i < result.size(); i++) {
207-
validateKeyPhrases(output.get(i), result.get(i).getKeyPhrases().stream().collect(Collectors.toList()));
208+
validateKeyPhrases(output.get(i),
209+
result.get(i).getKeyPhrases().stream().collect(Collectors.toList()));
208210
}
209211
});
210212
}
@@ -365,15 +367,15 @@ void clientBuilderWithDefaultLanguageRunner(HttpClient httpClient, TextAnalytics
365367
testRunner.apply(
366368
createClientBuilder(httpClient, serviceVersion,
367369
getEndpoint(), new AzureKeyCredential(getApiKey())).defaultLanguage("FR"))
368-
.accept(KEY_PHRASE_FRENCH_INPUTS.get(1), "Mondly");
370+
.accept(KEY_PHRASE_FRENCH_INPUTS.get(0), "monde");
369371
}
370372

371373
void clientBuilderWithNewLanguageRunner(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion,
372374
Function<TextAnalyticsClientBuilder, BiConsumer<String, String>> testRunner) {
373375
testRunner.apply(
374376
createClientBuilder(httpClient, serviceVersion,
375377
getEndpoint(), new AzureKeyCredential(getApiKey())).defaultLanguage("FR"))
376-
.accept(KEY_PHRASE_FRENCH_INPUTS.get(1), "Je m'appelle Mondly");
378+
.accept(KEY_PHRASE_FRENCH_INPUTS.get(0), "monde");
377379
}
378380

379381
void clientBuilderWithDefaultLanguageForBatchOperationRunner(HttpClient httpClient,
@@ -384,7 +386,7 @@ void clientBuilderWithDefaultLanguageForBatchOperationRunner(HttpClient httpClie
384386
createClientBuilder(httpClient, serviceVersion,
385387
getEndpoint(), new AzureKeyCredential(getApiKey())).defaultLanguage("FR"))
386388
.accept(KEY_PHRASE_FRENCH_INPUTS,
387-
Arrays.asList(Collections.singletonList("monde"), Collections.singletonList("Mondly")));
389+
Arrays.asList(Collections.singletonList("monde"), Collections.emptyList()));
388390
}
389391

390392
void clientBuilderWithNewLanguageForBatchOperationRunner(HttpClient httpClient,
@@ -395,7 +397,7 @@ void clientBuilderWithNewLanguageForBatchOperationRunner(HttpClient httpClient,
395397
createClientBuilder(httpClient, serviceVersion,
396398
getEndpoint(), new AzureKeyCredential(getApiKey())).defaultLanguage("EN"))
397399
.accept(KEY_PHRASE_FRENCH_INPUTS,
398-
Arrays.asList(Collections.singletonList("monde"), Collections.singletonList("Je m'appelle Mondly")));
400+
Arrays.asList(Collections.singletonList("monde"), Collections.emptyList()));
399401
}
400402

401403
String getEndpoint() {

‎sdk/textanalytics/azure-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.azure.ai.textanalytics.models.DocumentSentiment;
1515
import com.azure.ai.textanalytics.models.EntityConditionality;
1616
import com.azure.ai.textanalytics.models.HealthcareEntityAssertion;
17+
import com.azure.ai.textanalytics.models.KeyPhrasesCollection;
1718
import com.azure.ai.textanalytics.models.LinkedEntity;
1819
import com.azure.ai.textanalytics.models.PiiEntityCategory;
1920
import com.azure.ai.textanalytics.models.PiiEntityCollection;
@@ -1172,9 +1173,11 @@ public void recognizeLinkedEntitiesZalgoText(HttpClient httpClient, TextAnalytic
11721173
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
11731174
public void extractKeyPhrasesForTextInput(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
11741175
client = getTextAnalyticsClient(httpClient, serviceVersion);
1175-
extractKeyPhrasesForSingleTextInputRunner(input ->
1176-
assertEquals("monde",
1177-
client.extractKeyPhrases(input).iterator().next()));
1176+
extractKeyPhrasesForSingleTextInputRunner(input -> {
1177+
final KeyPhrasesCollection keyPhrasesCollection = client.extractKeyPhrases(input);
1178+
validateKeyPhrases(asList("Bonjour", "monde"),
1179+
keyPhrasesCollection.stream().collect(Collectors.toList()));
1180+
});
11781181
}
11791182

11801183
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@@ -1874,6 +1877,7 @@ public void analyzeSentimentZalgoText(HttpClient httpClient, TextAnalyticsServic
18741877

18751878
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
18761879
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
1880+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
18771881
public void healthcareLroWithOptions(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
18781882
client = getTextAnalyticsClient(httpClient, serviceVersion);
18791883
healthcareLroRunner((documents, options) -> {
@@ -1891,6 +1895,7 @@ public void healthcareLroWithOptions(HttpClient httpClient, TextAnalyticsService
18911895

18921896
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
18931897
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
1898+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
18941899
public void healthcareLroPagination(HttpClient httpClient, TextAnalyticsServiceVersion serviceVersion) {
18951900
client = getTextAnalyticsClient(httpClient, serviceVersion);
18961901
healthcareLroPaginationRunner((documents, options) -> {
@@ -2046,6 +2051,7 @@ public void analyzeHealthcareEntitiesEmojiFamilyWithSkinToneModifier(HttpClient
20462051

20472052
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
20482053
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
2054+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
20492055
public void analyzeHealthcareEntitiesDiacriticsNfc(HttpClient httpClient,
20502056
TextAnalyticsServiceVersion serviceVersion) {
20512057
client = getTextAnalyticsClient(httpClient, serviceVersion);
@@ -2071,6 +2077,7 @@ public void analyzeHealthcareEntitiesDiacriticsNfc(HttpClient httpClient,
20712077

20722078
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
20732079
@MethodSource("com.azure.ai.textanalytics.TestUtils#getTestParameters")
2080+
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/22208")
20742081
public void analyzeHealthcareEntitiesDiacriticsNfd(HttpClient httpClient,
20752082
TextAnalyticsServiceVersion serviceVersion) {
20762083
client = getTextAnalyticsClient(httpClient, serviceVersion);

0 commit comments

Comments
 (0)