chore: Update to xUnit 2.5.0

smartjoker0117 · Aug 3, 2023 · e74feaf · e74feaf
1 parent df1f887
commit e74feaf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CommonProperties.Test.xml b/CommonProperties.Test.xml
@@ -16,10 +16,10 @@
 
   <!-- Common dependencies. Not *all* projects need all of these, but enough to make it worth doing. -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="Xunit.Combinatorial" Version="1.5.25" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
   </ItemGroup>
 

diff --git a/Google.Api.Gax.Grpc.Tests/BufferedClientStreamWriterTest.cs b/Google.Api.Gax.Grpc.Tests/BufferedClientStreamWriterTest.cs
@@ -14,6 +14,11 @@
 using System.Threading.Tasks;
 using Xunit;
 
+// xUnit2014: "Do not use throws check to check for asynchronously thrown exception"
+// This is suppressed in the tests below as we're often testing that the exception
+// is thrown immediately, synchronously.
+#pragma warning disable xUnit2014
+
 namespace Google.Api.Gax.Grpc.Tests
 {
     public class BufferedClientStreamWriterTest

diff --git a/Google.Api.Gax.Tests/Json/JsonTokenizerTest.cs b/Google.Api.Gax.Tests/Json/JsonTokenizerTest.cs
@@ -340,14 +340,14 @@ private static void AssertTokensNoReplacement(string json, params JsonToken[] ex
                 var actualToken = tokenizer.Next();
                 if (actualToken == JsonToken.EndDocument)
                 {
-                    Assert.False(true, $"Expected {expectedTokens[i]} but reached end of token stream");
+                    Assert.Fail($"Expected {expectedTokens[i]} but reached end of token stream");
                 }
                 Assert.Equal(expectedTokens[i], actualToken);
             }
             var finalToken = tokenizer.Next();
             if (finalToken != JsonToken.EndDocument)
             {
-                Assert.False(true, "Expected token stream to be exhausted; received ${finalToken}");
+                Assert.Fail("Expected token stream to be exhausted; received ${finalToken}");
             }
         }
 
@@ -360,7 +360,7 @@ private static void AssertThrowsAfter(string json, params JsonToken[] expectedTo
                 var actualToken = tokenizer.Next();
                 if (actualToken == JsonToken.EndDocument)
                 {
-                    Assert.False(true, $"Expected {expectedTokens[i]} but reached end of document");
+                    Assert.Fail($"Expected {expectedTokens[i]} but reached end of document");
                 }
                 Assert.Equal(expectedTokens[i], actualToken);
             }