From f773f9b8a1f9055a431cd11fdde60e3698e04bc8 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 9 Sep 2020 15:18:10 +0800 Subject: [PATCH 1/2] enable test --- .../implementation/TypeSerializationTests.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java index c5376985889d..e462e4cd7196 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/implementation/TypeSerializationTests.java @@ -9,13 +9,13 @@ import com.azure.resourcemanager.resources.fluent.inner.DeploymentExtendedInner; import com.azure.resourcemanager.resources.fluent.inner.DeploymentInner; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.lang.reflect.Field; + public class TypeSerializationTests { @Test - @Disabled("To fix later as swagger changes on DeploymentExtendedInner") public void testDeploymentSerialization() throws Exception { final String templateJson = "{ \"/subscriptions//resourceGroups//providers/Microsoft.ManagedIdentity/userAssignedIdentities/\": {} }"; @@ -27,11 +27,15 @@ public void testDeploymentSerialization() throws Exception { Assertions.assertTrue(deploymentJson.contains("Microsoft.ManagedIdentity")); } - private static DeploymentInner createRequestFromInner(DeploymentImpl deployment) { + private static DeploymentInner createRequestFromInner(DeploymentImpl deployment) throws NoSuchFieldException, IllegalAccessException { + Field field = DeploymentImpl.class.getDeclaredField("deploymentCreateUpdateParameters"); + field.setAccessible(true); + DeploymentInner implInner = (DeploymentInner) field.get(deployment); + DeploymentInner inner = new DeploymentInner() .withProperties(new DeploymentProperties()); inner.properties().withMode(deployment.mode()); - //inner.properties().withTemplate(deployment.template()); + inner.properties().withTemplate(implInner.properties().template()); inner.properties().withTemplateLink(deployment.templateLink()); inner.properties().withParameters(deployment.parameters()); inner.properties().withParametersLink(deployment.parametersLink()); From 17c92167e42f8ea292a353cbabe3ece9ef81df14 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 9 Sep 2020 15:25:15 +0800 Subject: [PATCH 2/2] fix delay in playback --- .../resources/fluentcore/model/implementation/AcceptedImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java index c2734b3078ed..8ac24d4adb12 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/model/implementation/AcceptedImpl.java @@ -329,7 +329,7 @@ public static Accepted newAccepted( activationResponse, client.getSerializerAdapter(), client.getHttpPipeline(), - client.getDefaultPollInterval(), + SdkContext.getDelayDuration(client.getDefaultPollInterval()), innerType, innerType, convertOperation);