Skip to content

Commit f78ba7e

Browse files
chore(deps): Bump xunit from 2.4.2 to 2.5.0 in /packages/@jsii/dotnet-runtime-test/test (#4172)
Bumps [xunit](https://github.com/xunit/xunit) from 2.4.2 to 2.5.0. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/xunit/xunit/commit/12ec6b87aea7ad0496aa053e11b84d4c928f90a8"><code>12ec6b8</code></a> Bump up to v2.5.1-pre</li> <li><a href="https://github.com/xunit/xunit/commit/92f31c4c3a4adf391a19e6c9b531f4195636f132"><code>92f31c4</code></a> v2.5.0</li> <li><a href="https://github.com/xunit/xunit/commit/188216b64a3bb9a141cb2851fce47264f29593bf"><code>188216b</code></a> Ensure both failed tests and error cause error return codes (and cancel for s...</li> <li><a href="https://github.com/xunit/xunit/commit/c97317920dcd10e88264adf6c81a303aca7bfc06"><code>c973179</code></a> Latest analyzers</li> <li><a href="https://github.com/xunit/xunit/commit/f93d52dbf743957131287690bef34a518c402eae"><code>f93d52d</code></a> Propagate StopOnFail from config file =&gt; execution options</li> <li><a href="https://github.com/xunit/xunit/commit/5e70f54cab281f0d19ababd6dea9832518137a4d"><code>5e70f54</code></a> <a href="https://redirect.github.com/xunit/xunit/issues/2737">#2737</a>: Restore XunitException constructor (breaking change) (v2)</li> <li><a href="https://github.com/xunit/xunit/commit/028866f82155319ffa583503245aa5ec438f7804"><code>028866f</code></a> Add PackageDownload for Microsoft.NETFramework.ReferenceAssemblies.net452 to ...</li> <li><a href="https://github.com/xunit/xunit/commit/aeba1bbfc354d24ce2ddb17e1d248bf5ddf7b4cc"><code>aeba1bb</code></a> Remove UAP/UWP support</li> <li><a href="https://github.com/xunit/xunit/commit/530802128e5acd624406f35869ab61d73d6c0514"><code>5308021</code></a> <a href="https://redirect.github.com/xunit/xunit/issues/1857">#1857</a>: Add overload to Assert.Contains for ConcurrentDictionary (v2)</li> <li><a href="https://github.com/xunit/xunit/commit/5fbaa0a34994a5293589c47935bfbfe49b29357c"><code>5fbaa0a</code></a> Incorrect type restriction on obsoleted Assert.ThrowsAny&lt;T&gt; for Func&lt;Task&gt; an...</li> <li>Additional commits viewable in <a href="https://github.com/xunit/xunit/compare/2.4.2...2.5.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit&package-manager=nuget&previous-version=2.4.2&new-version=2.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
1 parent f0a29b7 commit f78ba7e

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

packages/@jsii/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.6.3" />
1414
<PackageReference Update="NSubstitute" Version="5.0.0" />
15-
<PackageReference Update="xunit" Version="2.4.2" />
15+
<PackageReference Update="xunit" Version="2.5.0" />
1616
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0" />
1717
<PackageReference Update="XunitXml.TestLogger" Version="3.1.11" />
1818

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ private static void VerifyDiagnosticResults(Diagnostic[] actualResults, Diagnost
6969
{
7070
string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : " NONE.";
7171

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

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

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

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

106103
if (actual.Id != expected.Id)
107104
{
108-
Assert.True(false,
109-
$"Expected diagnostic id to be \"{expected.Id}\" was \"{actual.Id}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
105+
Assert.Fail($"Expected diagnostic id to be \"{expected.Id}\" was \"{actual.Id}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
110106
}
111107

112108
if (actual.Severity != expected.Severity)
113109
{
114-
Assert.True(false,
115-
$"Expected diagnostic severity to be \"{expected.Severity}\" was \"{actual.Severity}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
110+
Assert.Fail($"Expected diagnostic severity to be \"{expected.Severity}\" was \"{actual.Severity}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
116111
}
117112

118113
if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message)
119114
{
120-
Assert.True(false,
121-
$"Expected diagnostic message to be \"{expected.Message}\" was \"{actual.GetMessage(CultureInfo.InvariantCulture)}\"\r\n\r\nDiagnostic:\r\n {FormatDiagnostics(analyzer, actual)}\r\n");
115+
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");
122116
}
123117
}
124118
}
@@ -144,8 +138,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer? analyzer, Diagn
144138
{
145139
if (actualLinePosition.Line + 1 != expected.Line)
146140
{
147-
Assert.True(false,
148-
$"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");
141+
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");
149142
}
150143
}
151144

@@ -154,8 +147,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer? analyzer, Diagn
154147
{
155148
if (actualLinePosition.Character + 1 != expected.Column)
156149
{
157-
Assert.True(false,
158-
$"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");
150+
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");
159151
}
160152
}
161153
}

0 commit comments

Comments
 (0)