Skip to content

Commit 1b3d57f

Browse files
samvaitysamvaity
authored
Fix Form recognizer test pipeline issues (Azure#34705)
1 parent 4b3c64a commit 1b3d57f

File tree

8 files changed

+66
-2201
lines changed

8 files changed

+66
-2201
lines changed

‎sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormRecognizerClientTestBase.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import com.azure.ai.formrecognizer.models.SelectionMarkState;
2121
import com.azure.ai.formrecognizer.models.TextStyleName;
2222
import com.azure.ai.formrecognizer.training.FormTrainingClientBuilder;
23-
import com.azure.core.credential.AccessToken;
24-
import com.azure.core.credential.TokenCredential;
25-
import com.azure.core.credential.TokenRequestContext;
2623
import com.azure.core.http.HttpClient;
2724
import com.azure.core.http.policy.HttpLogDetailLevel;
2825
import com.azure.core.http.policy.HttpLogOptions;
@@ -34,7 +31,6 @@
3431
import org.junit.jupiter.api.Assertions;
3532
import org.junit.jupiter.api.Disabled;
3633
import org.junit.jupiter.api.Test;
37-
import reactor.core.publisher.Mono;
3834

3935
import java.io.ByteArrayInputStream;
4036
import java.io.File;
@@ -43,7 +39,6 @@
4339
import java.io.InputStream;
4440
import java.time.Duration;
4541
import java.time.LocalDate;
46-
import java.time.OffsetDateTime;
4742
import java.util.Arrays;
4843
import java.util.List;
4944
import java.util.Map;
@@ -151,9 +146,12 @@ FormRecognizerClientBuilder getFormRecognizerClientBuilder(HttpClient httpClient
151146
} else if (interceptorManager.isRecordMode()) {
152147
builder.credential(new DefaultAzureCredentialBuilder().build());
153148
builder.addPolicy(interceptorManager.getRecordPolicy());
149+
} else if (interceptorManager.isLiveMode()) {
150+
builder.credential(new DefaultAzureCredentialBuilder().build());
151+
}
152+
if (!interceptorManager.isLiveMode()) {
153+
interceptorManager.addSanitizers(getTestProxySanitizers());
154154
}
155-
156-
interceptorManager.addSanitizers(getTestProxySanitizers());
157155
return builder;
158156
}
159157

@@ -170,18 +168,17 @@ FormTrainingClientBuilder getFormTrainingClientBuilder(HttpClient httpClient,
170168
.audience(audience);
171169

172170
if (interceptorManager.isPlaybackMode()) {
173-
builder.credential(new TokenCredential() {
174-
@Override
175-
public Mono<AccessToken> getToken(TokenRequestContext tokenRequestContext) {
176-
return Mono.just(new AccessToken("mockToken", OffsetDateTime.now().plusHours(2)));
177-
}
178-
});
171+
builder.credential(new MockTokenCredential());
179172
interceptorManager.addMatchers(Arrays.asList(new BodilessMatcher()));
180173
} else if (interceptorManager.isRecordMode()) {
181174
builder.credential(new DefaultAzureCredentialBuilder().build());
182175
builder.addPolicy(interceptorManager.getRecordPolicy());
176+
} else if (interceptorManager.isLiveMode()) {
177+
builder.credential(new DefaultAzureCredentialBuilder().build());
178+
}
179+
if (!interceptorManager.isLiveMode()) {
180+
interceptorManager.addSanitizers(getTestProxySanitizers());
183181
}
184-
interceptorManager.addSanitizers(getTestProxySanitizers());
185182
return builder;
186183
}
187184

‎sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormTrainingClientBuilderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* Tests for Form Training client builder
4747
*/
4848
public class FormTrainingClientBuilderTest extends TestProxyTestBase {
49-
private static final String FORM_JPG = "Form_1.jpg";
49+
private static final String TEST_FILE = URL_TEST_FILE_FORMAT + "Form_1.jpg";
5050

5151
/**
5252
* Test client builder with invalid API key
@@ -197,7 +197,7 @@ void clientBuilderWithRotateToValidKeyRunner(HttpClient httpClient, FormRecogniz
197197
getEndpoint(), credential);
198198
// Update to valid key
199199
credential.update(getApiKey());
200-
testRunner.apply(clientBuilder).accept(URL_TEST_FILE_FORMAT + FORM_JPG);
200+
testRunner.apply(clientBuilder).accept(TEST_FILE);
201201
}
202202

203203
void clientBuilderWithNullServiceVersionRunner(HttpClient httpClient, FormRecognizerServiceVersion serviceVersion,
@@ -206,7 +206,7 @@ void clientBuilderWithNullServiceVersionRunner(HttpClient httpClient, FormRecogn
206206
createClientBuilder(httpClient, serviceVersion, getEndpoint(), new AzureKeyCredential(getApiKey()))
207207
.retryPolicy(new RetryPolicy())
208208
.serviceVersion(null);
209-
testRunner.apply(clientBuilder).accept(URL_TEST_FILE_FORMAT + FORM_JPG);
209+
testRunner.apply(clientBuilder).accept(TEST_FILE);
210210
}
211211

212212
void clientBuilderWithDefaultPipelineRunner(HttpClient httpClient, FormRecognizerServiceVersion serviceVersion,
@@ -215,7 +215,7 @@ void clientBuilderWithDefaultPipelineRunner(HttpClient httpClient, FormRecognize
215215
createClientBuilder(httpClient, serviceVersion, getEndpoint(), new AzureKeyCredential(getApiKey()))
216216
.configuration(Configuration.getGlobalConfiguration())
217217
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS));
218-
testRunner.apply(clientBuilder).accept(URL_TEST_FILE_FORMAT + FORM_JPG);
218+
testRunner.apply(clientBuilder).accept(TEST_FILE);
219219
}
220220

221221
String getEndpoint() {

‎sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/FormTrainingClientTestBase.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,12 @@ FormTrainingClientBuilder getFormTrainingClientBuilder(HttpClient httpClient,
9898
} else if (interceptorManager.isRecordMode()) {
9999
builder.credential(new DefaultAzureCredentialBuilder().build());
100100
builder.addPolicy(interceptorManager.getRecordPolicy());
101+
} else if (interceptorManager.isLiveMode()) {
102+
builder.credential(new DefaultAzureCredentialBuilder().build());
103+
}
104+
if (!interceptorManager.isLiveMode()) {
105+
interceptorManager.addSanitizers(getTestProxySanitizers());
101106
}
102-
interceptorManager.addSanitizers(getTestProxySanitizers());
103-
104107
return builder;
105108
}
106109

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ public static List<TestProxySanitizer> getTestProxySanitizers() {
186186
new TestProxySanitizer("$..urlSource", null, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY),
187187
new TestProxySanitizer("$..azureBlobSource.containerUrl", null, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY),
188188
new TestProxySanitizer("$..source", null, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY),
189-
new TestProxySanitizer("$..resourceLocation", null, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY),
190-
new TestProxySanitizer("Location", URL_REGEX, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY));
189+
new TestProxySanitizer("$..resourceLocation", null, REDACTED_VALUE, TestProxySanitizerType.BODY_KEY));
191190
}
192191
}
193192

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,7 @@ public void invoiceValidLocale(HttpClient httpClient, DocumentAnalysisServiceVer
10591059

10601060
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
10611061
@MethodSource("com.azure.ai.formrecognizer.documentanalysis.TestUtils#getTestParameters")
1062+
@Disabled("Deserialization error as amount missing in CurrencyValue")
10621063
public void analyzeInvoiceWithPage(HttpClient httpClient, DocumentAnalysisServiceVersion serviceVersion) {
10631064
client = getDocumentAnalysisAsyncClient(httpClient, serviceVersion);
10641065
urlRunner(sourceUrl -> {

‎sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/documentanalysis/DocumentAnalysisClientTestBase.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
import com.azure.ai.formrecognizer.documentanalysis.models.DocumentSelectionMarkState;
1616
import com.azure.ai.formrecognizer.documentanalysis.models.DocumentTable;
1717
import com.azure.ai.formrecognizer.documentanalysis.models.Point;
18-
import com.azure.core.credential.AccessToken;
1918
import com.azure.core.credential.AzureKeyCredential;
2019
import com.azure.core.credential.TokenCredential;
21-
import com.azure.core.credential.TokenRequestContext;
2220
import com.azure.core.exception.HttpResponseException;
2321
import com.azure.core.http.HttpClient;
2422
import com.azure.core.http.policy.HttpLogDetailLevel;
@@ -31,15 +29,13 @@
3129
import com.azure.identity.ClientSecretCredentialBuilder;
3230
import com.azure.identity.DefaultAzureCredentialBuilder;
3331
import org.junit.jupiter.api.Assertions;
34-
import reactor.core.publisher.Mono;
3532
import reactor.test.StepVerifier;
3633

3734
import java.io.InputStream;
3835
import java.nio.charset.StandardCharsets;
3936
import java.time.Duration;
4037
import java.time.LocalDate;
4138
import java.time.LocalTime;
42-
import java.time.OffsetDateTime;
4339
import java.util.Arrays;
4440
import java.util.List;
4541
import java.util.Map;
@@ -82,7 +78,7 @@ public DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpC
8278

8379
DocumentAnalysisClientBuilder builder = new DocumentAnalysisClientBuilder()
8480
.endpoint(endpoint)
85-
.httpClient(httpClient == null ? interceptorManager.getPlaybackClient() : httpClient)
81+
.httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
8682
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
8783
.serviceVersion(serviceVersion)
8884
.audience(audience);
@@ -94,6 +90,8 @@ public DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpC
9490
} else if (interceptorManager.isRecordMode()) {
9591
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
9692
builder.addPolicy(interceptorManager.getRecordPolicy());
93+
} else if (interceptorManager.isLiveMode()) {
94+
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
9795
}
9896
} else {
9997
if (interceptorManager.isPlaybackMode()) {
@@ -102,9 +100,13 @@ public DocumentAnalysisClientBuilder getDocumentAnalysisBuilder(HttpClient httpC
102100
} else if (interceptorManager.isRecordMode()) {
103101
builder.credential(getCredentialByAuthority(endpoint));
104102
builder.addPolicy(interceptorManager.getRecordPolicy());
103+
} else if (interceptorManager.isLiveMode()) {
104+
builder.credential(getCredentialByAuthority(endpoint));
105105
}
106106
}
107-
interceptorManager.addSanitizers(getTestProxySanitizers());
107+
if (!interceptorManager.isLiveMode()) {
108+
interceptorManager.addSanitizers(getTestProxySanitizers());
109+
}
108110
return builder;
109111
}
110112

@@ -119,7 +121,7 @@ public DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuild
119121

120122
DocumentModelAdministrationClientBuilder builder = new DocumentModelAdministrationClientBuilder()
121123
.endpoint(endpoint)
122-
.httpClient(httpClient == null ? interceptorManager.getPlaybackClient() : httpClient)
124+
.httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
123125
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
124126
.serviceVersion(serviceVersion)
125127
.audience(audience);
@@ -131,22 +133,23 @@ public DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuild
131133
} else if (interceptorManager.isRecordMode()) {
132134
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
133135
builder.addPolicy(interceptorManager.getRecordPolicy());
136+
} else if (interceptorManager.isLiveMode()) {
137+
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
134138
}
135139
} else {
136140
if (interceptorManager.isPlaybackMode()) {
137-
builder.credential(new TokenCredential() {
138-
@Override
139-
public Mono<AccessToken> getToken(TokenRequestContext tokenRequestContext) {
140-
return Mono.just(new AccessToken("mockToken", OffsetDateTime.now().plusHours(2)));
141-
}
142-
});
141+
builder.credential(new MockTokenCredential());
143142
setMatchers();
144143
} else if (interceptorManager.isRecordMode()) {
145144
builder.credential(getCredentialByAuthority(endpoint));
146145
builder.addPolicy(interceptorManager.getRecordPolicy());
146+
} else if (interceptorManager.isLiveMode()) {
147+
builder.credential(getCredentialByAuthority(endpoint));
147148
}
148149
}
149-
interceptorManager.addSanitizers(getTestProxySanitizers());
150+
if (!interceptorManager.isLiveMode()) {
151+
interceptorManager.addSanitizers(getTestProxySanitizers());
152+
}
150153
return builder;
151154
}
152155
static TokenCredential getCredentialByAuthority(String endpoint) {

‎sdk/formrecognizer/azure-ai-formrecognizer/src/test/java/com/azure/ai/formrecognizer/documentanalysis/administration/DocumentModelAdministrationClientTestBase.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static org.junit.jupiter.api.Assertions.assertNotNull;
4242

4343
public abstract class DocumentModelAdministrationClientTestBase extends TestProxyTestBase {
44+
private static final String BLANK_PDF_PATH = TestUtils.LOCAL_FILE_PATH + TestUtils.BLANK_PDF;
4445
Duration durationTestMode;
4546

4647
/**
@@ -64,14 +65,15 @@ DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuilder(Http
6465
.serviceVersion(serviceVersion)
6566
.audience(audience);
6667

67-
6868
if (useKeyCredential) {
6969
if (interceptorManager.isPlaybackMode()) {
7070
builder.credential(new AzureKeyCredential(INVALID_KEY));
7171
setMatchers();
7272
} else if (interceptorManager.isRecordMode()) {
7373
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
7474
builder.addPolicy(interceptorManager.getRecordPolicy());
75+
} else if (interceptorManager.isLiveMode()) {
76+
builder.credential(new AzureKeyCredential(TestUtils.AZURE_FORM_RECOGNIZER_API_KEY_CONFIGURATION));
7577
}
7678
} else {
7779
if (interceptorManager.isPlaybackMode()) {
@@ -80,9 +82,13 @@ DocumentModelAdministrationClientBuilder getDocumentModelAdminClientBuilder(Http
8082
} else if (interceptorManager.isRecordMode()) {
8183
builder.credential(getCredentialByAuthority(endpoint));
8284
builder.addPolicy(interceptorManager.getRecordPolicy());
85+
} else if (interceptorManager.isLiveMode()) {
86+
builder.credential(getCredentialByAuthority(endpoint));
8387
}
8488
}
85-
interceptorManager.addSanitizers(getTestProxySanitizers());
89+
if (!interceptorManager.isLiveMode()) {
90+
interceptorManager.addSanitizers(getTestProxySanitizers());
91+
}
8692
return builder;
8793
}
8894
private void setMatchers() {
@@ -131,10 +137,10 @@ void validateClassifierModelData(DocumentClassifierDetails documentClassifierDet
131137
}
132138

133139
void blankPdfDataRunner(BiConsumer<InputStream, Long> testRunner) {
134-
final long fileLength = new File(TestUtils.LOCAL_FILE_PATH + TestUtils.BLANK_PDF).length();
140+
final long fileLength = new File(BLANK_PDF_PATH).length();
135141

136142
try {
137-
testRunner.accept(new FileInputStream(TestUtils.LOCAL_FILE_PATH + TestUtils.BLANK_PDF), fileLength);
143+
testRunner.accept(new FileInputStream(BLANK_PDF_PATH), fileLength);
138144
} catch (FileNotFoundException e) {
139145
throw new RuntimeException("Local file not found.", e);
140146
}

0 commit comments

Comments
 (0)