Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SDK nugets and a Moq-ify a test #2924

Merged
merged 1 commit into from
Oct 27, 2022
Merged

Update SDK nugets and a Moq-ify a test #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions e2e/test/E2ETests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 14 additions & 11 deletions iothub/device/tests/Pipeline/RetryDelegatingHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

drwill-ms marked this conversation as resolved.
Show resolved Hide resolved
var 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);
}

Expand Down
6 changes: 3 additions & 3 deletions iothub/service/tests/Microsoft.Azure.Devices.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions provisioning/device/tests/Microsoft.Azure.Devices.Provisioning.Client.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions provisioning/service/tests/Microsoft.Azure.Devices.Provisioning.Service.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down