Skip to content

Commit 1d70b0f

Browse files
authored
Fixed test recording for SecretClientTestBase (#13817)
* Modified when the RecordPolicy is obtained from InterceptorManager for recording tests in KeyEncryptionKeyClientTestBase and SecretClientTestBase. * Made sure to only add a record policy when in RECORD test mode for KeyVault tests. * Made sure we only add a recording policy when in RECORD TestMode.
1 parent c7ceb97 commit 1d70b0f

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/CertificateClientTestBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.azure.core.http.policy.RetryStrategy;
2020
import com.azure.core.http.policy.UserAgentPolicy;
2121
import com.azure.core.test.TestBase;
22+
import com.azure.core.test.TestMode;
2223
import com.azure.core.util.Configuration;
2324
import com.azure.core.util.CoreUtils;
2425
import com.azure.identity.ClientSecretCredentialBuilder;
@@ -103,7 +104,7 @@ HttpPipeline getHttpPipeline(HttpClient httpClient, CertificateServiceVersion se
103104
HttpPolicyProviders.addAfterRetryPolicies(policies);
104105
policies.add(new HttpLoggingPolicy(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)));
105106

106-
if (!interceptorManager.isPlaybackMode()) {
107+
if (getTestMode() == TestMode.RECORD) {
107108
policies.add(interceptorManager.getRecordPolicy());
108109
}
109110

sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTestBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.azure.core.http.policy.UserAgentPolicy;
2121
import com.azure.core.http.rest.Response;
2222
import com.azure.core.test.TestBase;
23+
import com.azure.core.test.TestMode;
2324
import com.azure.core.util.Configuration;
2425
import com.azure.core.util.CoreUtils;
2526
import com.azure.identity.ClientSecretCredentialBuilder;
@@ -89,7 +90,7 @@ HttpPipeline getHttpPipeline(HttpClient httpClient, KeyServiceVersion serviceVer
8990
HttpPolicyProviders.addAfterRetryPolicies(policies);
9091
policies.add(new HttpLoggingPolicy(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)));
9192

92-
if (!interceptorManager.isPlaybackMode()) {
93+
if (getTestMode() == TestMode.RECORD) {
9394
policies.add(interceptorManager.getRecordPolicy());
9495
}
9596

sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTestBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.azure.core.http.policy.RetryStrategy;
2020
import com.azure.core.http.policy.UserAgentPolicy;
2121
import com.azure.core.test.TestBase;
22+
import com.azure.core.test.TestMode;
2223
import com.azure.core.util.Configuration;
2324
import com.azure.core.util.ServiceVersion;
2425
import com.azure.identity.ClientSecretCredentialBuilder;
@@ -80,7 +81,7 @@ HttpPipeline getHttpPipeline(HttpClient httpClient, ServiceVersion serviceVersio
8081
HttpPolicyProviders.addAfterRetryPolicies(policies);
8182
policies.add(new HttpLoggingPolicy(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)));
8283

83-
if (!interceptorManager.isPlaybackMode()) {
84+
if (getTestMode() == TestMode.RECORD) {
8485
policies.add(interceptorManager.getRecordPolicy());
8586
}
8687

sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/KeyEncryptionKeyClientTestBase.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.azure.core.http.policy.RetryStrategy;
2020
import com.azure.core.http.policy.UserAgentPolicy;
2121
import com.azure.core.test.TestBase;
22+
import com.azure.core.test.TestMode;
2223
import com.azure.core.util.Configuration;
2324
import com.azure.identity.ClientSecretCredentialBuilder;
2425
import org.junit.jupiter.api.Test;
@@ -71,7 +72,10 @@ HttpPipeline getHttpPipeline(HttpClient httpClient, CryptographyServiceVersion s
7172
}
7273
HttpPolicyProviders.addAfterRetryPolicies(policies);
7374
policies.add(new HttpLoggingPolicy(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)));
74-
policies.add(interceptorManager.getRecordPolicy());
75+
76+
if (getTestMode() == TestMode.RECORD) {
77+
policies.add(interceptorManager.getRecordPolicy());
78+
}
7579

7680
return new HttpPipelineBuilder()
7781
.policies(policies.toArray(new HttpPipelinePolicy[0]))

sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTestBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.azure.core.http.policy.UserAgentPolicy;
2121
import com.azure.core.http.rest.Response;
2222
import com.azure.core.test.TestBase;
23+
import com.azure.core.test.TestMode;
2324
import com.azure.core.util.Configuration;
2425
import com.azure.core.util.CoreUtils;
2526
import com.azure.identity.ClientSecretCredentialBuilder;
@@ -89,7 +90,7 @@ HttpPipeline getHttpPipeline(HttpClient httpClient, SecretServiceVersion service
8990
HttpPolicyProviders.addAfterRetryPolicies(policies);
9091
policies.add(new HttpLoggingPolicy(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)));
9192

92-
if (interceptorManager.isPlaybackMode()) {
93+
if (getTestMode() == TestMode.RECORD) {
9394
policies.add(interceptorManager.getRecordPolicy());
9495
}
9596

0 commit comments

Comments
 (0)