Update for Disabled tests in Text Analytics (#7061)

Azure · Dec 27, 2019 · 8b5531c · 8b5531c
1 parent 05d3b81
commit 8b5531c
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 15 deletions.
diff --git a/...-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java b/...-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClientTest.java
@@ -15,7 +15,6 @@
 import com.azure.ai.textanalytics.models.TextSentimentClass;
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.util.Context;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
@@ -37,7 +36,6 @@ protected void beforeTest() {
     }
 
     // Detected Languages
-
     /**
      * Verify that we can get statistics on the collection result when given a batch input with options.
      */
@@ -136,7 +134,6 @@ public void detectLanguageFaultyText() {
      * Verifies that a Bad request exception is returned for input documents with same ids.
      */
     @Test
-    @Disabled
     public void detectLanguageDuplicateIdInput() {
         detectLanguageDuplicateIdRunner((inputs, options) -> {
             StepVerifier.create(client.detectBatchLanguagesWithResponse(inputs, options, Context.NONE))
@@ -163,7 +160,7 @@ public void recognizeEntitiesForEmptyText() {
             .verifyComplete();
     }
 
-    @Override
+    @Test
     public void recognizeEntitiesForFaultyText() {
         // TODO: (savaity) confirm with service team this returns no error-ed document, no exception but empty documents and error list.
         StepVerifier.create(client.recognizeEntities("!@#%%"))
@@ -289,7 +286,7 @@ public void recognizePiiEntitiesForEmptyText() {
             .verifyComplete();
     }
 
-    @Override
+    @Test
     public void recognizePiiEntitiesForFaultyText() {
         // TODO: (savaity) confirm with service team this returns no error-ed document, no exception but empty documents and error list.
         StepVerifier.create(client.recognizePiiEntities("!@#%%"))

diff --git a/...re-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java b/...re-ai-textanalytics/src/test/java/com/azure/ai/textanalytics/TextAnalyticsClientTest.java
@@ -14,7 +14,6 @@
 import com.azure.ai.textanalytics.models.TextAnalyticsError;
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.util.Context;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -131,7 +130,6 @@ public void detectLanguageInvalidCountryHint() {
      * Verifies that a Bad request exception is returned for input documents with same ids.
      */
     @Test
-    @Disabled
     public void detectLanguageDuplicateIdInput() {
         detectLanguageDuplicateIdRunner((inputs, options) -> {
             assertRestException(() -> client.detectBatchLanguagesWithResponse(inputs, options, Context.NONE),
@@ -155,7 +153,6 @@ public void recognizeEntitiesForEmptyText() {
     }
 
     @Test
-    @Disabled
     public void recognizeEntitiesForFaultyText() {
         // TODO: (savaity) confirm with service team.
         assertEquals(client.recognizeEntities("!@#%%").getNamedEntities().size(), 0);
@@ -189,7 +186,6 @@ public void recognizePiiEntitiesForEmptyText() {
     }
 
     @Test
-    @Disabled
     public void recognizePiiEntitiesForFaultyText() {
         assertEquals(client.recognizePiiEntities("!@#%%").getNamedEntities().size(), 0);
     }

diff --git a/...e-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json b/...e-ai-textanalytics/src/test/resources/session-records/detectLanguageDuplicateIdInput.json
@@ -1,7 +1,7 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages?showStats=true",
+    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/languages",
     "Headers" : {
       "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.4; Windows 10 10.0)",
       "x-ms-client-request-id" : "aabc5399-ae00-4ead-8ead-bca8b1989d7d",

diff --git a/...e-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json b/...e-ai-textanalytics/src/test/resources/session-records/recognizeEntitiesForFaultyText.json
@@ -1,4 +1,27 @@
 {
-  "networkCallRecords" : [ ],
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/general",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
+      "x-ms-client-request-id" : "ea8835bd-4259-4867-9c01-e1845882c1bf",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "29",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
+      "apim-request-id" : "64334c9b-a767-419f-b5d0-cfb331a405e8",
+      "x-aml-ta-request-id" : "84ca812c-7b19-48b3-b254-8b27ac149336",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Fri, 27 Dec 2019 22:10:43 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
   "variables" : [ ]
-}
+}
diff --git a/...i-textanalytics/src/test/resources/session-records/recognizePiiEntitiesForFaultyText.json b/...i-textanalytics/src/test/resources/session-records/recognizePiiEntitiesForFaultyText.json
@@ -1,4 +1,27 @@
 {
-  "networkCallRecords" : [ ],
+  "networkCallRecords" : [ {
+    "Method" : "POST",
+    "Uri" : "https://javatextanalyticstestresources.cognitiveservices.azure.com/text/analytics/v3.0-preview.1/entities/recognition/pii",
+    "Headers" : {
+      "User-Agent" : "azsdk-java-azure-ai-textanalytics/1.0.0-beta.1 (11.0.5; Windows 10 10.0)",
+      "x-ms-client-request-id" : "5e42a69b-f818-42d2-8720-25e6c136e0cc",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Transfer-Encoding" : "chunked",
+      "x-envoy-upstream-service-time" : "26",
+      "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
+      "x-content-type-options" : "nosniff",
+      "csp-billing-usage" : "CognitiveServices.TextAnalytics.BatchScoring=1",
+      "apim-request-id" : "29e4f8de-9b8a-496f-bbf2-c3cbea8c0fff",
+      "x-aml-ta-request-id" : "12f4043a-d75f-4516-bcaf-19d7b163c30d",
+      "retry-after" : "0",
+      "StatusCode" : "200",
+      "Body" : "{\"documents\":[{\"id\":\"0\",\"entities\":[]}],\"errors\":[],\"modelVersion\":\"2019-10-01\"}",
+      "Date" : "Fri, 27 Dec 2019 22:07:03 GMT",
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Exception" : null
+  } ],
   "variables" : [ ]
-}
+}
diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
@@ -6,7 +6,6 @@ jobs:
       ServiceDirectory: textanalytics
       EnvVars:
         AZURE_TEST_MODE: RECORD
-        AZURE_TEXT_ANALYTICS_SUBSCRIPTION_KEY: $(java-textanalytics-test-subscription-key)
         AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
         AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
         AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)