Skip to content

Commit 81bac18

Browse files
authored
[Purview-Scanning] TestProxy Migration (Azure#35851)
1 parent 8b2f61a commit 81bac18

File tree

5 files changed

+24
-47
lines changed

5 files changed

+24
-47
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"AssetsRepo": "Azure/azure-sdk-assets",
3+
"AssetsRepoPrefixPath": "java",
4+
"TagPrefix": "java/purview/azure-analytics-purview-scanning",
5+
"Tag": "java/purview/azure-analytics-purview-scanning_fea6bf1c51"
6+
}

sdk/purview/azure-analytics-purview-scanning/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<jacoco.min.linecoverage>0.1</jacoco.min.linecoverage>
3535
<jacoco.min.branchcoverage>0.05</jacoco.min.branchcoverage>
3636
<javaModulesSurefireArgLine>
37-
--add-exports com.azure.core/com.azure.core.implementation.jackson=ALL-UNNAMED
37+
--add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
3838
</javaModulesSurefireArgLine>
3939
</properties>
4040

sdk/purview/azure-analytics-purview-scanning/src/test/java/com/azure/analytics/purview/scanning/PurviewScanningClientTestBase.java

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,15 @@
33

44
package com.azure.analytics.purview.scanning;
55

6-
import com.azure.core.credential.AccessToken;
76
import com.azure.core.http.HttpClient;
8-
import com.azure.core.http.policy.HttpLogDetailLevel;
9-
import com.azure.core.http.policy.HttpLogOptions;
10-
import com.azure.core.test.TestBase;
11-
import com.azure.core.test.TestMode;
7+
import com.azure.core.test.TestProxyTestBase;
8+
import com.azure.core.test.utils.MockTokenCredential;
129
import com.azure.core.util.Configuration;
1310
import com.azure.identity.DefaultAzureCredentialBuilder;
14-
import reactor.core.publisher.Mono;
1511

16-
import java.time.OffsetDateTime;
1712
import java.util.Objects;
1813

19-
public class PurviewScanningClientTestBase extends TestBase {
14+
public class PurviewScanningClientTestBase extends TestProxyTestBase {
2015

2116
protected String getEndpoint() {
2217
String endpoint = interceptorManager.isPlaybackMode()
@@ -27,22 +22,23 @@ protected String getEndpoint() {
2722
}
2823

2924
PurviewScanningClientBuilder builderSetUp() {
30-
PurviewScanningClientBuilder builder =
31-
new PurviewScanningClientBuilder()
25+
PurviewScanningClientBuilder builder = new PurviewScanningClientBuilder();
26+
if (interceptorManager.isPlaybackMode()) {
27+
builder
28+
.httpClient(interceptorManager.getPlaybackClient())
29+
.credential(new MockTokenCredential());
30+
} else {
31+
builder
3232
.httpClient(HttpClient.createDefault())
33-
.httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS));
34-
if (getTestMode() == TestMode.PLAYBACK) {
35-
builder.httpClient(interceptorManager.getPlaybackClient())
36-
.credential(request -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)));
37-
} else if (getTestMode() == TestMode.RECORD) {
38-
builder.addPolicy(interceptorManager.getRecordPolicy())
3933
.credential(new DefaultAzureCredentialBuilder().build());
40-
} else if (getTestMode() == TestMode.LIVE) {
41-
builder.credential(new DefaultAzureCredentialBuilder().build());
4234
}
43-
return Objects.requireNonNull(builder);
44-
}
4535

36+
if (interceptorManager.isRecordMode()) {
37+
builder.addPolicy(interceptorManager.getRecordPolicy());
38+
}
4639

40+
builder.endpoint(getEndpoint());
4741

42+
return Objects.requireNonNull(builder);
43+
}
4844
}

sdk/purview/azure-analytics-purview-scanning/src/test/java/com/azure/analytics/purview/scanning/SystemScanRulesetsClientTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ public class SystemScanRulesetsClientTests extends PurviewScanningClientTestBase
1717

1818
@Override
1919
protected void beforeTest() {
20-
PurviewScanningClientBuilder builder = builderSetUp();
21-
client = builder.endpoint(getEndpoint()).buildSystemScanRulesetsClient();
20+
client = builderSetUp().buildSystemScanRulesetsClient();
2221
}
2322

24-
2523
@Test
2624
public void testListAll() {
2725
PagedIterable<BinaryData> response = client.listAll(null);

sdk/purview/azure-analytics-purview-scanning/src/test/resources/session-records/SystemScanRulesetsClientTests.testListAll.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)