Update SDK nugets and a Moq-ify a test

Azure · Oct 27, 2022 · 7f43366 · 7f43366
1 parent a16b6ad
commit 7f43366
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 26 deletions.
diff --git a/e2e/test/E2ETests.csproj b/e2e/test/E2ETests.csproj
@@ -18,9 +18,9 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7" />
     <PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />

diff --git a/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj b/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj
@@ -27,9 +27,9 @@
   <!--Nuget package dependencies-->
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>

diff --git a/iothub/device/tests/Pipeline/RetryDelegatingHandlerTests.cs b/iothub/device/tests/Pipeline/RetryDelegatingHandlerTests.cs
@@ -89,30 +89,33 @@ public async Task RetryDelegatingHandler_DoesNotRetryOnNotSupportedException()
         {
             // arrange
             int callCounter = 0;
-
-            PipelineContext contextMock = Substitute.For<PipelineContext>();
-            contextMock.ConnectionStatusChangeHandler = (connectionStatusInfo) => { };
-            IDelegatingHandler nextHandlerMock = Substitute.For<IDelegatingHandler>();
             var message = new TelemetryMessage(new byte[] { 1, 2, 3 });
-            nextHandlerMock.OpenAsync(Arg.Any<CancellationToken>()).Returns(Task.CompletedTask);
+
+            PipelineContext contextMock = new PipelineContext();
+            contextMock.ConnectionStatusChangeHandler = (connectionStatusInfo) => { }; // avoid NRE
+
+            var nextHandlerMock = new Mock<IDelegatingHandler>();
+
             nextHandlerMock
-                .SendTelemetryAsync(Arg.Is(message), Arg.Any<CancellationToken>())
-                .Returns(t =>
+                .Setup(x => x.OpenAsync(It.IsAny<CancellationToken>()))
+                .Returns(Task.CompletedTask);
+
+            nextHandlerMock
+                .Setup(x => x.SendTelemetryAsync(message, It.IsAny<CancellationToken>()))
+                .Returns(() =>
                     {
                         ++callCounter;
                         throw new NotSupportedException(TestExceptionMessage);
                     });
 
-            var retryDelegatingHandler = new RetryDelegatingHandler(contextMock, nextHandlerMock);
+            var retryDelegatingHandler = new RetryDelegatingHandler(contextMock, nextHandlerMock.Object);
 
-            // act
+            // act and assert
             await retryDelegatingHandler.OpenAsync(CancellationToken.None).ConfigureAwait(false);
             var exception = await retryDelegatingHandler
                 .SendTelemetryAsync(message, CancellationToken.None)
                 .ExpectedAsync<NotSupportedException>()
                 .ConfigureAwait(false);
-
-            // assert
             callCounter.Should().Be(1);
         }
 

diff --git a/iothub/service/tests/Microsoft.Azure.Devices.Tests.csproj b/iothub/service/tests/Microsoft.Azure.Devices.Tests.csproj
@@ -20,9 +20,9 @@
 
   <!--Nuget package dependencies-->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
   </ItemGroup>

diff --git a/provisioning/device/tests/Microsoft.Azure.Devices.Provisioning.Client.UnitTests.csproj b/provisioning/device/tests/Microsoft.Azure.Devices.Provisioning.Client.UnitTests.csproj
@@ -19,8 +19,8 @@
   <!--Nuget package dependencies-->
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
 </Project>
diff --git a/provisioning/service/tests/Microsoft.Azure.Devices.Provisioning.Service.Tests.csproj b/provisioning/service/tests/Microsoft.Azure.Devices.Provisioning.Service.Tests.csproj
@@ -19,9 +19,9 @@
 
   <!--Nuget package dependencies-->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
   </ItemGroup>