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

chore(deps): Bump xunit from 2.4.2 to 2.5.0 in /packages/@jsii/dotnet-runtime-test/test #4172

Merged
merged 2 commits into from
Jul 13, 2023
Merged

chore(deps): Bump xunit from 2.4.2 to 2.5.0 in /packages/@jsii/dotnet-runtime-test/test #4172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa727b
chore(deps): Bump xunit in /packages/@jsii/dotnet-runtime-test/test
dependabot[bot] Jul 11, 2023
c4aacb3
Update DiagnosticVerifier.cs
iliapolo Jul 13, 2023
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 packages/@jsii/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Update="NSubstitute" Version="5.0.0" />
<PackageReference Update="xunit" Version="2.4.2" />
<PackageReference Update="xunit" Version="2.5.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0" />
<PackageReference Update="XunitXml.TestLogger" Version="3.1.11" />

Expand Down
24 changes: 8 additions & 16 deletions .../@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ private static void VerifyDiagnosticResults(Diagnostic[] actualResults, Diagnost
{
string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : " NONE.";

Assert.True(false,
$"Mismatch between number of diagnostics returned, expected \"{expectedCount}\" actual \"{actualCount}\"\r\n\r\nDiagnostics:\r\n{diagnosticsOutput}\r\n");
Assert.Fail($"Mismatch between number of diagnostics returned, expected \"{expectedCount}\" actual \"{actualCount}\"\r\n\r\nDiagnostics:\r\n{diagnosticsOutput}\r\n");
}

for (var i = 0; i < expectedResults.Length; i++)
Expand All @@ -82,8 +81,7 @@ private static void VerifyDiagnosticResults(Diagnostic[] actualResults, Diagnost
{
if (actual.Location != Location.None)
{
Assert.True(false,
$"Expected:\nA project diagnostic with No location\nActual:\n{FormatDiagnostics(analyzer, actual)}");
Assert.Fail($"Expected:\nA project diagnostic with No location\nActual:\n{FormatDiagnostics(analyzer, actual)}");
}
}
else
Expand All @@ -93,8 +91,7 @@ private static void VerifyDiagnosticResults(Diagnostic[] actualResults, Diagnost

if (additionalLocations.Length != expected.Locations.Count - 1)
{
Assert.True(false,
$"Expected {expected.Locations.Count - 1} additional locations but got {additionalLocations.Length} for Diagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
Assert.Fail($"Expected {expected.Locations.Count - 1} additional locations but got {additionalLocations.Length} for Diagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
}

for (int j = 0; j < additionalLocations.Length; ++j)
Expand All @@ -105,20 +102,17 @@ private static void VerifyDiagnosticResults(Diagnostic[] actualResults, Diagnost

if (actual.Id != expected.Id)
{
Assert.True(false,
$"Expected diagnostic id to be \"{expected.Id}\" was \"{actual.Id}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
Assert.Fail($"Expected diagnostic id to be \"{expected.Id}\" was \"{actual.Id}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
}

if (actual.Severity != expected.Severity)
{
Assert.True(false,
$"Expected diagnostic severity to be \"{expected.Severity}\" was \"{actual.Severity}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
Assert.Fail($"Expected diagnostic severity to be \"{expected.Severity}\" was \"{actual.Severity}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
}

if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message)
{
Assert.True(false,
$"Expected diagnostic message to be \"{expected.Message}\" was \"{actual.GetMessage(CultureInfo.InvariantCulture)}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
Assert.Fail($"Expected diagnostic message to be \"{expected.Message}\" was \"{actual.GetMessage(CultureInfo.InvariantCulture)}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
}
}
}
Expand All @@ -144,8 +138,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer? analyzer, Diagn
{
if (actualLinePosition.Line + 1 != expected.Line)
{
Assert.True(false,
$"Expected diagnostic to be on line \"{expected.Line}\" was actually on line \"{actualLinePosition.Line + 1}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, diagnostic)}\r\n");
Assert.Fail($"Expected diagnostic to be on line \"{expected.Line}\" was actually on line \"{actualLinePosition.Line + 1}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, diagnostic)}\r\n");
}
}

Expand All @@ -154,8 +147,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer? analyzer, Diagn
{
if (actualLinePosition.Character + 1 != expected.Column)
{
Assert.True(false,
$"Expected diagnostic to start at column \"{expected.Column}\" was actually at column \"{actualLinePosition.Character + 1}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, diagnostic)}\r\n");
Assert.Fail($"Expected diagnostic to start at column \"{expected.Column}\" was actually at column \"{actualLinePosition.Character + 1}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, diagnostic)}\r\n");
}
}
}
Expand Down
Loading