Fix Form Recognizer tests (Azure#27984)

Author: samvaity

sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/administration/DocumentModelAdministrationAsyncClientTest.java

@@ -42,7 +42,6 @@
 import static com.azure.ai.formrecognizer.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -140,11 +139,12 @@ public void deleteModelValidModelIdWithResponse(HttpClient httpClient,
     @MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
     public void copyAuthorization(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
         client = getDocumentModelAdminAsyncClient(httpClient, serviceVersion);
-        StepVerifier.create(client.getCopyAuthorization())
-            .assertNext(DocumentModelAdministrationClientTestBase::validateCopyAuthorizationResult)
+        String modelId = "java_copy_model_test";
+        StepVerifier.create(client.getCopyAuthorizationWithResponse(new CopyAuthorizationOptions().setModelId(modelId)))
+            .assertNext(response -> validateCopyAuthorizationResult(response.getValue()))
             .verifyComplete();
 
-        StepVerifier.create(client.deleteModel("java_copy_model_test")).verifyComplete();
+        StepVerifier.create(client.deleteModel(modelId)).verifyComplete();
     }
 
     /**
@@ -157,15 +157,15 @@ public void beginCreateComposedModel(HttpClient httpClient, DocumentAnalysisServ
         client = getDocumentModelAdminAsyncClient(httpClient, serviceVersion);
         buildModelRunner((trainingFilesUrl) -> {
             SyncPoller<DocumentOperationResult, DocumentModel> syncPoller1 =
-                client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE
-                    )
+                client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE,
+                        new BuildModelOptions().setModelId("async_component_model_1"))
                     .setPollInterval(durationTestMode).getSyncPoller();
             syncPoller1.waitForCompletion();
             DocumentModel createdModel1 = syncPoller1.getFinalResult();
 
             SyncPoller<DocumentOperationResult, DocumentModel> syncPoller2 =
-                client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE
-                    )
+                client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE,
+                        new BuildModelOptions().setModelId("async_component_model_2"))
                     .setPollInterval(durationTestMode).getSyncPoller();
             syncPoller2.waitForCompletion();
             DocumentModel createdModel2 = syncPoller2.getFinalResult();
@@ -335,15 +335,14 @@ public void beginBuildModelFailsWithInvalidPrefix(HttpClient httpClient, Documen
         client = getDocumentModelAdminAsyncClient(httpClient, serviceVersion);
 
         buildModelRunner((trainingFilesUrl) -> {
-            HttpResponseException httpResponseException = assertThrows(HttpResponseException.class,
-                () -> client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE,
-                        new BuildModelOptions().setPrefix("subfolder"))
-                    .setPollInterval(durationTestMode)
-                    .getSyncPoller()
-                    .getFinalResult());
-
-            ResponseError responseError = (ResponseError) httpResponseException.getValue();
-            Assertions.assertEquals("InvalidRequest", responseError.getCode());
+            StepVerifier.create(client.beginBuildModel(trainingFilesUrl, DocumentBuildMode.TEMPLATE,
+                        new BuildModelOptions().setPrefix("invalidPrefix"))
+                    .setPollInterval(durationTestMode))
+                .verifyErrorSatisfies(throwable -> {
+                    assertEquals(HttpResponseException.class, throwable.getClass());
+                    final ResponseError responseError = (ResponseError) ((HttpResponseException) throwable).getValue();
+                    assertEquals("InvalidRequest", responseError.getCode());
+                });
         });
     }
 
@@ -430,14 +429,14 @@ public void beginCopyWithOptions(HttpClient httpClient, DocumentAnalysisServiceV
     public void listModels(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
         client = getDocumentModelAdminAsyncClient(httpClient, serviceVersion);
         StepVerifier.create(client.listModels().byPage().take(4))
-        .thenConsumeWhile(documentModelInfoPagedResponse -> {
-            documentModelInfoPagedResponse.getValue()
-                .forEach(documentModelInfo -> {
-                    assertNotNull(documentModelInfo.getModelId());
-                    assertNotNull(documentModelInfo.getCreatedOn());
-                });
-            return true;
-        }).verifyComplete();
+            .thenConsumeWhile(documentModelInfoPagedResponse -> {
+                documentModelInfoPagedResponse.getValue()
+                    .forEach(documentModelInfo -> {
+                        assertNotNull(documentModelInfo.getModelId());
+                        assertNotNull(documentModelInfo.getCreatedOn());
+                    });
+                return true;
+            }).verifyComplete();
     }
 
     /**

sdk/formrecognizer/azure-ai-formrecognizer/src/test/resources/session-records/DocumentModelAdministrationAsyncClientTest.beginBuildModelFailsWithInvalidPrefix[1].json

@@ -3,20 +3,20 @@
     "Method" : "POST",
     "Uri" : "https://REDACTED.cognitiveservices.azure.com/formrecognizer/documentModels:build?api-version=2022-01-30-preview",
     "Headers" : {
-      "User-Agent" : "azsdk-java-azure-ai-formrecognizer/4.0.0-beta.4 (11.0.9; Windows 10; 10.0)",
-      "x-ms-client-request-id" : "2aa63960-25f3-4ce6-aeba-4dac7f83b338",
+      "User-Agent" : "azsdk-java-azure-ai-formrecognizer/4.0.0-beta.5 (11.0.9; Windows 10; 10.0)",
+      "x-ms-client-request-id" : "7bf5cb23-eaea-445f-909b-f502834b7eb6",
       "Content-Type" : "application/json"
     },
     "Response" : {
       "Transfer-Encoding" : "chunked",
-      "x-envoy-upstream-service-time" : "873",
+      "x-envoy-upstream-service-time" : "779",
       "Strict-Transport-Security" : "max-age=31536000; includeSubDomains; preload",
       "x-content-type-options" : "nosniff",
-      "apim-request-id" : "9f188eb7-9b0d-421b-95b0-4471ffd5a548",
+      "apim-request-id" : "d65fe876-84a0-4929-8748-12aab60974df",
       "retry-after" : "0",
       "StatusCode" : "400",
       "Body" : "{\n  \"error\": {\n    \"code\": \"InvalidRequest\",\n    \"message\": \"Invalid request.\",\n    \"innererror\": {\n      \"code\": \"TrainingContentMissing\",\n      \"message\": \"Training data is missing: Could not find any training data at the given path.\"\n    }\n  }\n}",
-      "Date" : "Thu, 27 Jan 2022 23:47:09 GMT",
+      "Date" : "Tue, 05 Apr 2022 18:44:17 GMT",
       "Content-Type" : "application/json"
     },
     "Exception" : null