Fix tests

Azure · Dec 7, 2022 · 46935aa · 46935aa
1 parent 6265432
commit 46935aa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/e2e/test/iothub/device/CombinedClientOperationsPoolAmqpTests.cs b/e2e/test/iothub/device/CombinedClientOperationsPoolAmqpTests.cs
@@ -94,7 +94,7 @@ async Task TestOperationAsync(IotHubDeviceClient deviceClient, TestDevice testDe
 
                 // D2C Operation
                 VerboseTestLogger.WriteLine($"{nameof(CombinedClientOperationsPoolAmqpTests)}: Operation 1: Send D2C for device={testDevice.Id}");
-                var message = TelemetryE2ETests.ComposeD2cTestMessage(out string _, out string _);
+                TelemetryMessage message = TelemetryE2ETests.ComposeD2cTestMessage(out string _, out string _);
                 Task sendD2cMessage = deviceClient.SendTelemetryAsync(message);
                 clientOperations.Add(sendD2cMessage);
 

diff --git a/e2e/test/iothub/device/MethodE2ECustomPayloadTests.cs b/e2e/test/iothub/device/MethodE2ECustomPayloadTests.cs
@@ -128,11 +128,11 @@ private async Task SendMethodAndRespondAsync(
             await Task.WhenAll(serviceSendTask, methodReceivedTask).ConfigureAwait(false);
         }
 
-        public static async Task ServiceSendMethodAndVerifyResponseAsync(
+        public static async Task ServiceSendMethodAndVerifyResponseAsync<T>(
             string deviceId,
             string methodName,
             object response,
-            object request,
+            T request,
             TimeSpan responseTimeout = default,
             IotHubServiceClientOptions serviceClientTransportSettings = default)
         {
@@ -152,7 +152,8 @@ public static async Task ServiceSendMethodAndVerifyResponseAsync(
 
             VerboseTestLogger.WriteLine($"{nameof(ServiceSendMethodAndVerifyResponseAsync)}: Method status: {methodResponse.Status}.");
             methodResponse.Status.Should().Be(200);
-            methodResponse.PayloadAsString.Should().BeEquivalentTo(JsonConvert.SerializeObject(response));
+            methodResponse.TryGetPayload(out T actual).Should().BeTrue();
+            JsonConvert.SerializeObject(actual).Should().BeEquivalentTo(JsonConvert.SerializeObject(response));
         }
 
         public static async Task<Task> SetDeviceReceiveMethod_booleanPayloadAsync(IotHubDeviceClient deviceClient, string methodName)

diff --git a/e2e/test/iothub/device/MethodE2ETests.cs b/e2e/test/iothub/device/MethodE2ETests.cs
@@ -285,10 +285,10 @@ public static async Task ServiceSendMethodAndVerifyNotReceivedAsync(
             error.And.IsTransient.Should().BeTrue();
         }
 
-        public static async Task ServiceSendMethodAndVerifyResponseAsync(
+        public static async Task ServiceSendMethodAndVerifyResponseAsync<T>(
             string deviceId,
             string methodName,
-            object respJson,
+            T respJson,
             object reqJson,
             TimeSpan responseTimeout = default,
             IotHubServiceClientOptions serviceClientTransportSettings = default)
@@ -309,14 +309,15 @@ public static async Task ServiceSendMethodAndVerifyResponseAsync(
 
             VerboseTestLogger.WriteLine($"{nameof(ServiceSendMethodAndVerifyResponseAsync)}: Method status: {response.Status}.");
             response.Status.Should().Be(200);
-            JsonConvert.SerializeObject(response.PayloadAsString).Should().Be(JsonConvert.SerializeObject(respJson));
+            response.TryGetPayload(out T actual).Should().BeTrue();
+            JsonConvert.SerializeObject(actual).Should().Be(JsonConvert.SerializeObject(respJson));
         }
 
-        public static async Task ServiceSendMethodAndVerifyResponseAsync(
+        public static async Task ServiceSendMethodAndVerifyResponseAsync<T>(
             string deviceId,
             string moduleId,
             string methodName,
-            object respJson,
+            T respJson,
             object reqJson,
             TimeSpan responseTimeout = default,
             IotHubServiceClientOptions serviceClientTransportSettings = default)
@@ -338,7 +339,8 @@ public static async Task ServiceSendMethodAndVerifyResponseAsync(
 
             VerboseTestLogger.WriteLine($"{nameof(ServiceSendMethodAndVerifyResponseAsync)}: Method status: {response.Status}.");
             response.Status.Should().Be(200);
-            JsonConvert.SerializeObject(response.PayloadAsString).Should().Be(JsonConvert.SerializeObject(respJson));
+            response.TryGetPayload(out T actual).Should().BeTrue();
+            JsonConvert.SerializeObject(actual).Should().Be(JsonConvert.SerializeObject(respJson));
         }
 
         public static async Task<Task> SubscribeAndUnsubscribeMethodAsync(IotHubDeviceClient deviceClient, string methodName)

diff --git a/e2e/test/iothub/device/MethodFaultInjectionTests.cs b/e2e/test/iothub/device/MethodFaultInjectionTests.cs
@@ -210,7 +210,7 @@ await SendMethodAndRespondRecoveryAsync(
                 .ConfigureAwait(false);
         }
 
-        private async Task ServiceSendMethodAndVerifyResponseAsync(string deviceName, string methodName, object deviceResponsePayload, object serviceRequestPayload)
+        private async Task ServiceSendMethodAndVerifyResponseAsync<T>(string deviceName, string methodName, T deviceResponsePayload, object serviceRequestPayload)
         {
             var sw = Stopwatch.StartNew();
             bool done = false;
@@ -238,7 +238,8 @@ private async Task ServiceSendMethodAndVerifyResponseAsync(string deviceName, st
                     VerboseTestLogger.WriteLine($"{nameof(ServiceSendMethodAndVerifyResponseAsync)}: Method status: {response.Status}.");
 
                     response.Status.Should().Be(200);
-                    JsonConvert.SerializeObject(response.PayloadAsString).Should().Be(JsonConvert.SerializeObject(deviceResponsePayload));
+                    response.TryGetPayload<T>(out T actual).Should().BeTrue();
+                    JsonConvert.SerializeObject(actual).Should().Be(JsonConvert.SerializeObject(deviceResponsePayload));
 
                     done = true;
                 }