[Form Recognizer] Enable AAD authentication for tests (Azure#24696)

Author: samvaity

eng/versioning/version_client.txt

@@ -328,6 +328,7 @@ com.azure.resourcemanager:azure-resourcemanager-storagepool;1.0.0-beta.1;1.0.0-b
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
 # In the pom, the version update tag after the version should name the unreleased package and the dependency version:
 # <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
+unreleased_com.azure:azure-core;1.22.0-beta.1
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
 # version and set the version to the released beta. Released beta dependencies are only valid

sdk/formrecognizer/azure-ai-formrecognizer/pom.xml

@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.22.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClient.java

@@ -81,7 +81,7 @@ public final class DocumentAnalysisAsyncClient {
      * or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}..
-     * @throws NullPointerException If {@code documentUrl} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code documentUrl} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<DocumentOperationResult, AnalyzeResult>
@@ -107,7 +107,7 @@ public final class DocumentAnalysisAsyncClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}.
-     * @throws NullPointerException If {@code documentUrl} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code documentUrl} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<DocumentOperationResult, AnalyzeResult>
@@ -121,9 +121,13 @@ public final class DocumentAnalysisAsyncClient {
                                    AnalyzeDocumentOptions analyzeDocumentOptions,
                                    Context context) {
         try {
-            Objects.requireNonNull(documentUrl, "'documentUrl' is required and cannot be null.");
-            Objects.requireNonNull(modelId, "'modelId' is required and cannot be null.");
-
+            if (CoreUtils.isNullOrEmpty(documentUrl)) {
+                throw logger.logExceptionAsError(new IllegalArgumentException("'documentUrl' is required and cannot"
+                    + " be null or empty"));
+            }            if (CoreUtils.isNullOrEmpty(modelId)) {
+                throw logger.logExceptionAsError(new IllegalArgumentException("'modelId' is required and cannot"
+                    + " be null or empty"));
+            }
             final AnalyzeDocumentOptions finalAnalyzeDocumentOptions
                 = getAnalyzeDocumentOptions(analyzeDocumentOptions);
             return new PollerFlux<>(
@@ -180,7 +184,7 @@ public final class DocumentAnalysisAsyncClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}.
-     * @throws NullPointerException If {@code document} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code document} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<DocumentOperationResult, AnalyzeResult>
@@ -211,7 +215,7 @@ public final class DocumentAnalysisAsyncClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}..
-     * @throws NullPointerException If {@code document} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code document} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<DocumentOperationResult, AnalyzeResult>
@@ -225,7 +229,10 @@ public final class DocumentAnalysisAsyncClient {
                              AnalyzeDocumentOptions analyzeDocumentOptions, Context context) {
         try {
             Objects.requireNonNull(document, "'document' is required and cannot be null.");
-            Objects.requireNonNull(modelId, "'modelId' is required and cannot be null.");
+            if (CoreUtils.isNullOrEmpty(modelId)) {
+                throw logger.logExceptionAsError(new IllegalArgumentException("'modelId' is required and cannot"
+                    + " be null or empty"));
+            }
 
             final AnalyzeDocumentOptions finalAnalyzeDocumentOptions
                 = getAnalyzeDocumentOptions(analyzeDocumentOptions);

sdk/formrecognizer/azure-ai-formrecognizer/src/main/java/com/azure/ai/formrecognizer/DocumentAnalysisClient.java

@@ -62,7 +62,7 @@ public final class DocumentAnalysisClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}..
-     * @throws NullPointerException If {@code documentUrl} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code documentUrl} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<DocumentOperationResult, AnalyzeResult>
@@ -90,7 +90,7 @@ public final class DocumentAnalysisClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation}returns
      * with an {@link OperationStatus#FAILED}.
-     * @throws NullPointerException If {@code documentUrl} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code documentUrl} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<DocumentOperationResult, AnalyzeResult>
@@ -118,7 +118,7 @@ public final class DocumentAnalysisClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation}returns
      * with an {@link OperationStatus#FAILED}.
-     * @throws NullPointerException If {@code document} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code document} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<DocumentOperationResult, AnalyzeResult>
@@ -147,7 +147,7 @@ public final class DocumentAnalysisClient {
      * has failed, or has been cancelled. The completed operation returns an {@link AnalyzeResult}.
      * @throws DocumentAnalysisException If analyze operation fails and the {@link AnalyzeResultOperation} returns
      * with an {@link OperationStatus#FAILED}.
-     * @throws NullPointerException If {@code document} or {@code modelId} is null.
+     * @throws IllegalArgumentException If {@code document} or {@code modelId} is null.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<DocumentOperationResult, AnalyzeResult>

sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientTest.java

@@ -3,11 +3,11 @@
 
 package com.azure.ai.formrecognizer;
 
+import com.azure.ai.formrecognizer.administration.models.FormRecognizerError;
 import com.azure.ai.formrecognizer.implementation.util.Utility;
 import com.azure.ai.formrecognizer.models.AnalyzeDocumentOptions;
-import com.azure.ai.formrecognizer.models.DocumentOperationResult;
 import com.azure.ai.formrecognizer.models.AnalyzeResult;
-import com.azure.ai.formrecognizer.administration.models.FormRecognizerError;
+import com.azure.ai.formrecognizer.models.DocumentOperationResult;
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.HttpClient;
 import com.azure.core.util.polling.SyncPoller;
@@ -63,7 +63,7 @@ static void afterAll() {
 
     private DocumentAnalysisAsyncClient getDocumentAnalysisAsyncClient(HttpClient httpClient,
                                                                        DocumentAnalysisServiceVersion serviceVersion) {
-        return getDocumentAnalysisBuilder(httpClient, serviceVersion).buildAsyncClient();
+        return getDocumentAnalysisBuilder(httpClient, serviceVersion, false).buildAsyncClient();
     }
 
     // Receipt recognition

sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/DocumentAnalysisClientTest.java

@@ -18,7 +18,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import reactor.test.StepVerifier;
@@ -72,12 +71,12 @@ static void afterAll() {
 
     private DocumentAnalysisClient getDocumentAnalysisClient(HttpClient httpClient,
                                                              DocumentAnalysisServiceVersion serviceVersion) {
-        return getDocumentAnalysisBuilder(httpClient, serviceVersion).buildClient();
+        return getDocumentAnalysisBuilder(httpClient, serviceVersion, false).buildClient();
     }
 
     private DocumentModelAdministrationClient getDocumentModelAdminClient(HttpClient httpClient,
                                                                           DocumentAnalysisServiceVersion serviceVersion) {
-        return getDocumentModelAdminClientBuilder(httpClient, serviceVersion).buildClient();
+        return getDocumentModelAdminClientBuilder(httpClient, serviceVersion, false).buildClient();
     }
 
     // Receipt recognition
@@ -543,9 +542,7 @@ public void analyzeGermanContentFromUrl(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocument(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         dataRunner((data, dataLength) ->
@@ -576,10 +573,8 @@ public void analyzeCustomDocument(HttpClient httpClient, DocumentAnalysisService
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentBlankPdf(HttpClient httpClient,
                                               DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         dataRunner((data, dataLength) ->
@@ -610,10 +605,9 @@ public void analyzeCustomDocumentBlankPdf(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentWithNullData(HttpClient httpClient,
                                                   DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
+
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         dataRunner((data, dataLength) ->
@@ -659,22 +653,16 @@ public void analyzeCustomDocumentWithNullModelId(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentWithEmptyModelId(HttpClient httpClient,
                                                       DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
 
         dataRunner((data, dataLength) -> {
-            HttpResponseException errorResponseException = Assertions.assertThrows(HttpResponseException.class,
+            Assertions.assertThrows(IllegalArgumentException.class,
                 () -> client.beginAnalyzeDocument("",
                         data,
                         dataLength)
                     .setPollInterval(durationTestMode));
-            FormRecognizerError errorInformation
-                = (FormRecognizerError) errorResponseException.getValue();
-            Assertions.assertEquals(404, errorResponseException.getResponse().getStatusCode());
-            Assertions.assertEquals("ModelNotFound", errorInformation.getInnerError().getCode());
         }, INVOICE_6_PDF);
     }
 
@@ -683,10 +671,9 @@ public void analyzeCustomDocumentWithEmptyModelId(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentWithContentTypeAutoDetection(HttpClient httpClient,
                                                                   DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
+
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
@@ -715,10 +702,9 @@ public void analyzeCustomDocumentWithContentTypeAutoDetection(HttpClient httpCli
 
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentMultiPage(HttpClient httpClient,
                                                DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
+
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         dataRunner((data, dataLength) -> multipageTrainingRunner((trainingFilesUrl) -> {
@@ -744,10 +730,8 @@ public void analyzeCustomDocumentMultiPage(HttpClient httpClient,
 
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentWithSelectionMark(HttpClient httpClient,
                                                        DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         dataRunner((data, dataLength) ->
@@ -779,14 +763,11 @@ public void analyzeCustomDocumentWithSelectionMark(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentUrl(HttpClient httpClient,
                                          DocumentAnalysisServiceVersion serviceVersion) {
-        // null values reported
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
-        urlRunner((fileUrl) -> multipageTrainingRunner((trainingFilesUrl) -> {
+        urlRunner((fileUrl) -> buildModelRunner((trainingFilesUrl) -> {
             SyncPoller<DocumentOperationResult, DocumentModel> buildModelPoller
                 = adminClient
                 .beginBuildModel(trainingFilesUrl, null)
@@ -904,10 +885,8 @@ public void analyzeCustomDocumentUrlNonExistModelId(HttpClient httpClient,
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentDamagedPdf(HttpClient httpClient,
                                                 DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         client = getDocumentAnalysisClient(httpClient, serviceVersion);
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         damagedPdfDataRunner((data, dataLength) ->
@@ -929,16 +908,14 @@ public void analyzeCustomDocumentDamagedPdf(HttpClient httpClient,
 
                 FormRecognizerError errorInformation
                     = (FormRecognizerError) httpResponseException.getValue();
-                Assertions.assertEquals("Invalid input file.", errorInformation.getMessage());
+                Assertions.assertEquals("InvalidContent", errorInformation.getInnerError().getCode());
             })));
     }
 
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled
     public void analyzeCustomDocumentUrlWithSelectionMark(HttpClient httpClient,
                                                           DocumentAnalysisServiceVersion serviceVersion) {
-        // TODO: (https://github.com/Azure/azure-sdk-for-java-pr/issues/1353)
         DocumentModelAdministrationClient adminClient = getDocumentModelAdminClient(httpClient, serviceVersion);
         urlRunner(fileUrl -> selectionMarkTrainingRunner((trainingFilesUrl) -> {
             client = getDocumentAnalysisClient(httpClient, serviceVersion);
@@ -1278,7 +1255,6 @@ public void analyzeInvoiceSourceUrl(HttpClient httpClient, DocumentAnalysisServi
      */
     @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
-    @Disabled("https://github.com/Azure/azure-sdk-for-java/issues/21687")
     public void analyzeInvoiceFromUrlWithEncodedBlankSpaceSourceUrl(HttpClient httpClient,
                                                                     DocumentAnalysisServiceVersion serviceVersion) {
         client = getDocumentAnalysisClient(httpClient, serviceVersion);