Skip to content

Migrate to awesome assertions #15056

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

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Migrate to awesome assertions #15056

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</PropertyGroup>
<PropertyGroup Label="VSTest test settings">
<!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
<FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
<AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
<MoqVersion>4.16.1</MoqVersion>
<!-- For coverage use our own package on latest stable -->
<MicrosoftCodeCoverageVersion>17.9.0</MicrosoftCodeCoverageVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...orm.Acceptance.IntegrationTests/Microsoft.TestPlatform.Acceptance.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ProjectReference Include="$(RepoRoot)src\vstest.console\vstest.console.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
<PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP" Version="2.0.0" />
<PackageReference Include="Microsoft.TestPlatform.QTools.Assets" Version="2.0.0" />
<PackageReference Include="Procdump" Version="0.0.1" />
Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/PerformanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void ExecutionPerformanceTest(string projectName, int expectedTestCount,

var actualExecutionTime = GetExecutionTime();

actualExecutionTime.Should().BeLessOrEqualTo(thresholdInMs.Milliseconds());
actualExecutionTime.Should().BeLessThanOrEqualTo(thresholdInMs.Milliseconds());
}

[TestMethod]
Expand All @@ -45,7 +45,7 @@ public void DiscoveryPerformanceTest()

var actualDiscoveryTime = GetDiscoveryTime();

actualDiscoveryTime.Should().BeLessOrEqualTo(500.Milliseconds());
actualDiscoveryTime.Should().BeLessThanOrEqualTo(500.Milliseconds());
}

[TestMethod]
Expand All @@ -60,7 +60,7 @@ public void VsTestConsolePerformanceTest()

var actualVsTestTime = GetVsTestTime();

actualVsTestTime.Should().BeLessOrEqualTo(2500.Milliseconds());
actualVsTestTime.Should().BeLessThanOrEqualTo(2500.Milliseconds());
}

[TestMethod]
Expand All @@ -75,7 +75,7 @@ public void TestHostPerformanceTest()

var actualTestHostTime = GetTestHostTime();

actualTestHostTime.Should().BeLessOrEqualTo(2000.Milliseconds());
actualTestHostTime.Should().BeLessThanOrEqualTo(2000.Milliseconds());
}

[TestMethod]
Expand All @@ -90,7 +90,7 @@ public void MsTestV2AdapterPerformanceTest()

var actualAdapterTimeTaken = GetAdapterExecutionTime("executor://mstestadapter/v2");

actualAdapterTimeTaken.Should().BeLessOrEqualTo(1500.Milliseconds());
actualAdapterTimeTaken.Should().BeLessThanOrEqualTo(1500.Milliseconds());
}
}
#endif
8 changes: 4 additions & 4 deletions test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV1Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void TestCaseSerialize()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
}

[TestMethod]
Expand All @@ -80,7 +80,7 @@ public void TestCaseDeserialize()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
}

[TestMethod]
Expand All @@ -96,7 +96,7 @@ public void TestResultSerialize()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test results");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
}

[TestMethod]
Expand All @@ -113,7 +113,7 @@ public void TestResultDeserialize()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(3.5.Seconds(), $"when de-serializing 10k test results");
actualDuration.Should().BeLessThanOrEqualTo(3.5.Seconds(), $"when de-serializing 10k test results");
}

private static string SerializeV1<T>(T data)
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/ProtocolV2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void TestCaseSerialize2()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test cases");
}

[TestMethod]
Expand All @@ -78,7 +78,7 @@ public void TestCaseDeserialize2()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test cases");
}

[TestMethod]
Expand All @@ -93,7 +93,7 @@ public void TestResultSerialize2()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when serializing 10k test results");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when serializing 10k test results");
}

[TestMethod]
Expand All @@ -110,7 +110,7 @@ public void TestResultDeserialize2()
sw.Stop();

var actualDuration = sw.Elapsed;
actualDuration.Should().BeLessOrEqualTo(2.Seconds(), $"when de-serializing 10k test results");
actualDuration.Should().BeLessThanOrEqualTo(2.Seconds(), $"when de-serializing 10k test results");
}

private static string SerializeV2<T>(T data)
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void SocketThroughput2()
thread.Join();
dataTransferred.Wait();

watch.Elapsed.Should().BeLessOrEqualTo(15.Seconds());
watch.Elapsed.Should().BeLessThanOrEqualTo(15.Seconds());
}

[TestMethod]
Expand Down Expand Up @@ -104,7 +104,7 @@ public void SocketThroughput1()
watch.Stop();
clientThread.Join();

watch.Elapsed.Should().BeLessOrEqualTo(20.Seconds());
watch.Elapsed.Should().BeLessThanOrEqualTo(20.Seconds());
}

private static void SendData(ICommunicationChannel? channel, Stopwatch watch)
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/vstest.ProgrammerTests/vstest.ProgrammerTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion test/vstest.console.UnitTests/vstest.console.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
</ItemGroup>
</Project>