Skip to content

Commit

Permalink
Enable Form Recognizer disabled tests (#29545)
Browse files Browse the repository at this point in the history
  • Loading branch information
@samvaity
samvaity authored Jun 22, 2022
1 parent df98d84 commit bca6088
Show file tree
Hide file tree
Showing 48 changed files with 1,541 additions and 1,190 deletions.
28 changes: 6 additions & 22 deletions ...recognizer/src/test/java/com/azure/ai/formrecognizer/DocumentAnalysisAsyncClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ private DocumentAnalysisAsyncClient getDocumentAnalysisAsyncClient(HttpClient ht
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptData(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
dataRunner((data, dataLength) -> {
Expand Down Expand Up @@ -116,7 +115,6 @@ public void analyzeReceiptDataNullData(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptDataWithContentTypeAutoDetection(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -171,7 +169,6 @@ public void analyzeReceiptDataWithBlankPdf(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
public void analyzeReceiptFromDataMultiPage(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -211,7 +208,6 @@ public void analyzeReceiptFromDamagedPdf(HttpClient httpClient, DocumentAnalysis
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptSourceUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
Expand Down Expand Up @@ -268,14 +264,12 @@ public void analyzeReceiptInvalidSourceUrl(HttpClient httpClient, DocumentAnalys
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("Until file available on main")
public void analyzeReceiptSourceUrlWithPngFile(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
SyncPoller<DocumentOperationResult, AnalyzeResult> syncPoller
= client.beginAnalyzeDocumentFromUrl("prebuilt-receipt", sourceUrl,
new AnalyzeDocumentOptions())
= client.beginAnalyzeDocumentFromUrl("prebuilt-receipt", sourceUrl)
.setPollInterval(durationTestMode)
.getSyncPoller();
syncPoller.waitForCompletion();
Expand All @@ -285,7 +279,7 @@ public void analyzeReceiptSourceUrlWithPngFile(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
@Disabled("Until file available on github main")
public void analyzeReceiptFromUrlMultiPage(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
urlRunner(documentUrl -> {
Expand All @@ -307,7 +301,6 @@ public void analyzeReceiptFromUrlMultiPage(HttpClient httpClient, DocumentAnalys
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContent(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
dataRunner((data, dataLength) -> {
Expand Down Expand Up @@ -341,7 +334,6 @@ public void analyzeContentResultWithNullData(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentResultWithContentTypeAutoDetection(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -411,7 +403,6 @@ public void analyzeContentFromDamagedPdf(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentWithSelectionMarks(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -481,7 +472,6 @@ dataLength, new AnalyzeDocumentOptions().setPages(Arrays.asList("1-2", "3")))
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentFromUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
Expand Down Expand Up @@ -562,7 +552,6 @@ public void analyzeContentFromUrlMultiPage(HttpClient httpClient, DocumentAnalys

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentWithSelectionMarksFromUrl(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -639,8 +628,7 @@ public void analyzeBusinessCardDataWithContentTypeAutoDetection(HttpClient httpC
syncPoller =
client.beginAnalyzeDocument("prebuilt-businessCard",
Utility.toFluxByteBuffer(getContentDetectionFileData(filePath)),
dataLength,
new AnalyzeDocumentOptions())
dataLength)
.setPollInterval(durationTestMode)
.getSyncPoller();
syncPoller.waitForCompletion();
Expand Down Expand Up @@ -740,8 +728,7 @@ public void analyzeBusinessCardSourceUrl(HttpClient httpClient, DocumentAnalysis
urlRunner(sourceUrl -> {
SyncPoller<DocumentOperationResult, AnalyzeResult>
syncPoller
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl,
new AnalyzeDocumentOptions())
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl)
.setPollInterval(durationTestMode)
.getSyncPoller();

Expand Down Expand Up @@ -798,8 +785,7 @@ public void analyzeBusinessCardSourceUrlWithPngFile(HttpClient httpClient,
urlRunner(sourceUrl -> {
SyncPoller<DocumentOperationResult, AnalyzeResult>
syncPoller
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl,
new AnalyzeDocumentOptions())
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl)
.setPollInterval(durationTestMode)
.getSyncPoller();
syncPoller.waitForCompletion();
Expand All @@ -819,8 +805,7 @@ public void analyzeMultipageBusinessCardUrl(HttpClient httpClient,
urlRunner(sourceUrl -> {
SyncPoller<DocumentOperationResult, AnalyzeResult>
syncPoller
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl,
new AnalyzeDocumentOptions())
= client.beginAnalyzeDocumentFromUrl("prebuilt-businessCard", sourceUrl)
.setPollInterval(durationTestMode)
.getSyncPoller();
syncPoller.waitForCompletion();
Expand Down Expand Up @@ -1170,7 +1155,6 @@ public void analyzeIDDocumentFromDamagedPdf(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("Enable once file uploaded on github main")
public void analyzeLicenseSourceUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
Expand Down
15 changes: 1 addition & 14 deletions ...-formrecognizer/src/test/java/com/azure/ai/formrecognizer/DocumentAnalysisClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ private DocumentModelAdministrationClient getDocumentModelAdminClient(HttpClient
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptData(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
dataRunner((data, dataLength) -> {
Expand Down Expand Up @@ -120,7 +119,6 @@ public void analyzeReceiptDataNullData(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptDataWithContentTypeAutoDetection(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -170,7 +168,6 @@ public void analyzeReceiptDataWithBlankPdf(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
public void analyzeReceiptFromDataMultiPage(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -211,7 +208,6 @@ public void analyzeReceiptFromDamagedPdf(HttpClient httpClient, DocumentAnalysis
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeReceiptSourceUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
urlRunner((sourceUrl) -> {
Expand Down Expand Up @@ -261,7 +257,6 @@ public void analyzeReceiptInvalidSourceUrl(HttpClient httpClient, DocumentAnalys
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("Until file available on main")
public void analyzeReceiptSourceUrlWithPngFile(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand All @@ -276,7 +271,7 @@ public void analyzeReceiptSourceUrlWithPngFile(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
@Disabled("Until file available on github main")
public void analyzeReceiptFromUrlMultiPage(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
urlRunner(receiptUrl -> {
Expand All @@ -297,7 +292,6 @@ public void analyzeReceiptFromUrlMultiPage(HttpClient httpClient, DocumentAnalys
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContent(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
dataRunner((data, dataLength) -> {
Expand Down Expand Up @@ -327,7 +321,6 @@ public void analyzeContentResultWithNullData(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentResultWithContentTypeAutoDetection(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -396,7 +389,6 @@ public void analyzeContentFromDamagedPdf(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentWithSelectionMarks(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -443,7 +435,6 @@ public void analyzeContentWithPages(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/29170")
public void analyzeContentFromUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
Expand Down Expand Up @@ -519,7 +510,6 @@ public void analyzeContentFromUrlMultiPage(HttpClient httpClient, DocumentAnalys

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29170")
public void analyzeContentWithSelectionMarksFromUrl(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -697,7 +687,6 @@ public void analyzeCustomDocumentWithContentTypeAutoDetection(HttpClient httpCli

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
public void analyzeCustomDocumentMultiPage(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {

Expand Down Expand Up @@ -784,7 +773,6 @@ public void analyzeCustomDocumentUrl(HttpClient httpClient,

@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("https://github.com/Azure/azure-sdk-for-java/issues/29171")
public void analyzeCustomDocumentUrlMultiPage(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
Expand Down Expand Up @@ -1423,7 +1411,6 @@ public void analyzeIDDocumentFromDamagedPdf(HttpClient httpClient,
*/
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
@MethodSource("com.azure.ai.formrecognizer.TestUtils#getTestParameters")
@Disabled("Until file available on main")
public void analyzeLicenseSourceUrl(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
client = getDocumentAnalysisClient(httpClient, serviceVersion);
urlRunner(sourceUrl -> {
Expand Down
10 changes: 4 additions & 6 deletions ...mrecognizer/src/test/java/com/azure/ai/formrecognizer/DocumentAnalysisClientTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected void beforeTest() {
durationTestMode = interceptorManager.isPlaybackMode() ? ONE_NANO_DURATION : DEFAULT_POLL_INTERVAL;
}

DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpClient,
public DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion,
boolean useKeyCredential) {
String endpoint = getEndpoint();
Expand All @@ -93,7 +93,7 @@ DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpClient,
}


DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuilder(HttpClient httpClient,
public DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuilder(HttpClient httpClient,
DocumentAnalysisServiceVersion serviceVersion,
boolean useKeyCredential) {
String endpoint = getEndpoint();
Expand Down Expand Up @@ -578,8 +578,7 @@ void validateContentData(AnalyzeResult analyzeResult) {
assertNull(analyzeResult.getKeyValuePairs());
Assertions.assertNotNull(analyzeResult.getStyles());
assertEquals(1, analyzeResult.getStyles().size());
// expected not null confirm?
// assertNull(analyzeResult.getDocuments());
assertNull(analyzeResult.getDocuments());
}

void validateDocumentPage(DocumentPage documentPage) {
Expand Down Expand Up @@ -794,8 +793,7 @@ void validateW2Data(AnalyzeResult analyzeResult) {
Map<String, DocumentField> stateTaxInfoFields1 = stateTaxInfoFieldsList.get(0).getValueMap();
Map<String, DocumentField> stateTaxInfoFields2 = stateTaxInfoFieldsList.get(1).getValueMap();

assertEquals("87654321", stateTaxInfoFields1.get("EmployerStateIdNumber")
.getValueString());
Assertions.assertNotNull(stateTaxInfoFields1.get("EmployerStateIdNumber").getValueString());
assertEquals("PA", stateTaxInfoFields1.get("State")
.getValueString());
assertEquals(1135.65f, stateTaxInfoFields1.get("StateIncomeTax").getValueFloat());
Expand Down
Loading

0 comments on commit bca6088

Please sign in to comment.