Bump xUnit (#646)

DevExpress · Oct 28, 2024 · 8283de6 · 8283de6
1 parent f13efa6
commit 8283de6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs
@@ -270,7 +270,7 @@ public void Load_Select(bool remoteSelect) {
 
             var item = DataSourceLoader.Load(data, loadOptions).data.Cast<IDictionary<string, object>>().First();
 
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.Equal(2, item["f2"]);
         }
 
@@ -357,8 +357,8 @@ public void Load_SelectNested(bool remoteSelect) {
 
             Assert.Equal(3, item.Keys.Count);
             Assert.Equal(2, address.Keys.Count);
-            Assert.Equal(1, addressStreet.Keys.Count);
-            Assert.Equal(1, contacts.Keys.Count);
+            Assert.Single(addressStreet.Keys);
+            Assert.Single(contacts.Keys);
 
             Assert.Equal(data[0].Name, item["Name"]);
             Assert.Equal(data[0].Address.City, address["City"]);
@@ -381,7 +381,7 @@ public void Load_SelectWithConflict(bool remoteSelect) {
             );
 
             var item = result.data.Cast<IDictionary<string, object>>().First();
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.True(item.ContainsKey("Item1"));
         }
 
@@ -441,7 +441,7 @@ IDictionary<string, object> Load(string[] preSelect, string[] select) {
                 select: new[] { "b", "c" }
             );
 
-            Assert.Equal(1, item.Keys.Count);
+            Assert.Single(item.Keys);
             Assert.True(item.ContainsKey("b"));
         }
 

diff --git a/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs b/net/DevExtreme.AspNet.Data.Tests/IsSummaryQueryTests.cs
@@ -8,7 +8,9 @@ namespace DevExtreme.AspNet.Data.Tests {
     public class IsSummaryQueryTests {
 
         [Theory]
+#pragma warning disable xUnit1042 // skip until rewrite CombinatorialBool to TheoryData / use any ready dep
         [MemberData(nameof(CombinatorialBool), 4)]
+#pragma warning restore xUnit1042
         public void Case(bool remoteGrouping, bool requireTotalCount, bool hasGroups, bool hasSummary) {
             var loadOptions = new SampleLoadOptions {
                 IsSummaryQuery = true,

diff --git a/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs b/net/DevExtreme.AspNet.Data.Tests/RemoteGroupingTests.cs
@@ -616,7 +616,7 @@ public void T844633_TotalsWoPaging() {
 
             DataSourceLoader.Load(source, loadOptions);
 
-            Assert.Single(loadOptions.ExpressionLog.Where(line => line.Contains("GroupBy")));
+            Assert.Single(loadOptions.ExpressionLog, line => line.Contains("GroupBy"));
         }
     }
 

diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props
@@ -17,9 +17,9 @@
     <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.3" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.assert" Version="2.4.2" />
-    <PackageVersion Include="xunit.core" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.assert" Version="2.9.2" />
+    <PackageVersion Include="xunit.core" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>