[Communication - Job] Migrate to Test proxy (#35688)

sdk/communication/azure-communication-jobrouter/assets.json

@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "java",
+  "TagPrefix": "java/communication/azure-communication-jobrouter",
+  "Tag": "java/communication/azure-communication-jobrouter_85c8602573"
+}

sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationsImpl.java

@@ -69,7 +69,7 @@ public final class JobRouterAdministrationsImpl {
     @ServiceInterface(name = "AzureCommunicationSe")
     public interface JobRouterAdministrationsService {
         @Patch("/routing/classificationPolicies/{id}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<ClassificationPolicy>> upsertClassificationPolicy(
                 @HostParam("endpoint") String endpoint,
@@ -110,7 +110,7 @@ Mono<Response<ClassificationPolicyCollection>> listClassificationPolicies(
                 Context context);
 
         @Patch("/routing/distributionPolicies/{id}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<DistributionPolicy>> upsertDistributionPolicy(
                 @HostParam("endpoint") String endpoint,
@@ -151,7 +151,7 @@ Mono<Response<DistributionPolicyCollection>> listDistributionPolicies(
                 Context context);
 
         @Patch("/routing/exceptionPolicies/{id}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<ExceptionPolicy>> upsertExceptionPolicy(
                 @HostParam("endpoint") String endpoint,
@@ -192,7 +192,7 @@ Mono<Response<ExceptionPolicyCollection>> listExceptionPolicies(
                 Context context);
 
         @Patch("/routing/queues/{id}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<JobQueue>> upsertQueue(
                 @HostParam("endpoint") String endpoint,

sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRoutersImpl.java

@@ -73,7 +73,7 @@ public final class JobRoutersImpl {
     @ServiceInterface(name = "AzureCommunicationSe")
     public interface JobRoutersService {
         @Patch("/routing/jobs/{id}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<RouterJob>> upsertJob(
                 @HostParam("endpoint") String endpoint,
@@ -215,7 +215,7 @@ Mono<Response<QueueStatistics>> getQueueStatistics(
                 Context context);
 
         @Patch("/routing/workers/{workerId}")
-        @ExpectedResponses({200})
+        @ExpectedResponses({200, 201})
         @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class)
         Mono<Response<RouterWorker>> upsertWorker(
                 @HostParam("endpoint") String endpoint,

sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/JobRouterTestBase.java

@@ -7,13 +7,9 @@
 import com.azure.communication.common.implementation.HmacAuthenticationPolicy;
 import com.azure.communication.jobrouter.models.DistributionPolicy;
 import com.azure.communication.jobrouter.models.JobQueue;
-import com.azure.communication.jobrouter.models.LabelOperator;
 import com.azure.communication.jobrouter.models.LabelValue;
 import com.azure.communication.jobrouter.models.LongestIdleMode;
-import com.azure.communication.jobrouter.models.RouterJob;
-import com.azure.communication.jobrouter.models.WorkerSelector;
 import com.azure.communication.jobrouter.models.options.CreateDistributionPolicyOptions;
-import com.azure.communication.jobrouter.models.options.CreateJobOptions;
 import com.azure.communication.jobrouter.models.options.CreateQueueOptions;
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.core.http.HttpClient;
@@ -27,17 +23,19 @@
 import com.azure.core.http.policy.HttpPolicyProviders;
 import com.azure.core.http.policy.RequestIdPolicy;
 import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.test.TestBase;
+import com.azure.core.test.TestProxyTestBase;
+import com.azure.core.test.models.CustomMatcher;
 import com.azure.core.util.Configuration;
 
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-class JobRouterTestBase extends TestBase {
+class JobRouterTestBase extends TestProxyTestBase {
     protected static final String JAVA_LIVE_TESTS = "JAVA_LIVE_TESTS";
 
     protected String getConnectionString() {
@@ -86,17 +84,25 @@ private HttpPipeline buildHttpPipeline(HttpClient httpClient) {
 
         if (interceptorManager.isPlaybackMode()) {
             httpClient = interceptorManager.getPlaybackClient();
+            addMatchers();
+        }
+        if (interceptorManager.isRecordMode()) {
+            policies.add(interceptorManager.getRecordPolicy());
         }
-        policies.add(interceptorManager.getRecordPolicy());
 
         HttpPipeline pipeline = new HttpPipelineBuilder()
             .policies(policies.toArray(new HttpPipelinePolicy[0]))
-            .httpClient(httpClient)
+            .httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
             .build();
 
         return pipeline;
     }
 
+    private void addMatchers() {
+        interceptorManager.addMatchers(Arrays.asList(new CustomMatcher().setHeadersKeyOnlyMatch(
+            Arrays.asList("x-ms-hmac-string-to-sign-base64"))));
+    }
+
     protected JobQueue createQueue(RouterAdministrationClient routerAdminClient, String queueId, String distributionPolicyId) {
         String queueName = String.format("%s-Name", queueId);
         Map<String, LabelValue> queueLabels = new HashMap<String, LabelValue>() {
@@ -126,21 +132,4 @@ protected DistributionPolicy createDistributionPolicy(RouterAdministrationClient
 
         return routerAdminClient.createDistributionPolicy(createDistributionPolicyOptions);
     }
-
-    protected RouterJob createJob(RouterClient routerClient, String queueId) {
-        CreateJobOptions createJobOptions = new CreateJobOptions("job-id", "chat-channel", queueId)
-            .setPriority(1)
-            .setChannelReference("12345")
-            .setRequestedWorkerSelectors(
-                new ArrayList<WorkerSelector>() {
-                    {
-                        new WorkerSelector()
-                            .setKey("Some-skill")
-                            .setLabelOperator(LabelOperator.GREATER_THAN)
-                            .setValue(10);
-                    }
-                }
-            );
-        return routerClient.createJob(createJobOptions);
-    }
 }

sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobLiveTests.java

@@ -17,6 +17,7 @@
 import com.azure.communication.jobrouter.models.options.CreateWorkerOptions;
 import com.azure.communication.jobrouter.models.options.UnassignJobOptions;
 import com.azure.core.http.HttpClient;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -35,6 +36,7 @@ public class RouterJobLiveTests extends JobRouterTestBase {
 
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    @Disabled("https://github.com/Azure/azure-sdk-for-java/issues/35706")
     public void unassignJob(HttpClient httpClient) {
         // Setup
         routerClient = getRouterClient(httpClient);