Bump FsCheck.Xunit from 2.16.5 to 3.1.0 (#66)

dependabot[bot] · tknightnd · web-flow · commit 8932ab5efbfb · 2025-03-20T13:45:35.000Z
Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
Co-authored-by: Tony Knight &lt;tony.knight@newday.co.uk&gt;
diff --git a/test/BenchmarkDotNetAnalyser.Tests.Integration/BenchmarkDotNetAnalyser.Tests.Integration.csproj b/test/BenchmarkDotNetAnalyser.Tests.Integration/BenchmarkDotNetAnalyser.Tests.Integration.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="7.1.0" />
-    <PackageReference Include="FsCheck.Xunit" Version="2.16.5" />
+    <PackageReference Include="FsCheck.Xunit" Version="3.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
diff --git a/test/BenchmarkDotNetAnalyser.Tests.Unit/Arbitraries.cs b/test/BenchmarkDotNetAnalyser.Tests.Unit/Arbitraries.cs
@@ -3,30 +3,31 @@
 using System.IO;
 using System.Linq;
 using FsCheck;
+using FsCheck.Fluent;
 
 namespace BenchmarkDotNetAnalyser.Tests.Unit
 {
     public static class AlphanumericStringArbitrary
     {
-        public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator
-            .Where(s => s.Get.All(c => char.IsDigit(c) || char.IsLetter(c)))
-            .Select(s => s.Get)
+        public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator
+            .Where(s => !string.IsNullOrEmpty(s))
+            .Where(s => s.All(c => char.IsDigit(c) || char.IsLetter(c)))
             .ToArbitrary();
     }
 
     public static class NonIntegerStringArbitrary
     {
-        public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator
-            .Where(s => !int.TryParse(s.Get, out _))
-            .Select(s => s.Get)
+        public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator
+            .Where(s => !string.IsNullOrEmpty(s))
+            .Where(s => !int.TryParse(s, out _))
             .ToArbitrary();
     }
 
     public static class NonDecimalStringArbitrary
     {
-        public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator
-            .Where(s => !decimal.TryParse(s.Get, out _))
-            .Select(s => s.Get)
+        public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator
+            .Where(s => !string.IsNullOrEmpty(s))
+            .Where(s => !decimal.TryParse(s, out _))
             .ToArbitrary();
     }
 
@@ -62,10 +63,10 @@ public static class InvalidPathArbitrary
         public static Arbitrary<string> GetArbitrary()
         {
             var disallowed = new HashSet<string>() { ".", "/", @"\"};
-            return Arb.Default.NonEmptyString().Generator
-                .Where(s => !disallowed.Contains(s.Get) &&
-                            !s.Get.All(c => char.IsDigit(c) || char.IsLetter(c)))
-                .Select(s => s.Get)
+            return ArbMap.Default.ArbFor<string>().Generator
+                .Where(s => !string.IsNullOrEmpty(s))
+                .Where(s => !disallowed.Contains(s) &&
+                            !s.All(c => char.IsDigit(c) || char.IsLetter(c)))
                 .ToArbitrary();
         }
     }
diff --git a/test/BenchmarkDotNetAnalyser.Tests.Unit/BenchmarkDotNetAnalyser.Tests.Unit.csproj b/test/BenchmarkDotNetAnalyser.Tests.Unit/BenchmarkDotNetAnalyser.Tests.Unit.csproj
@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="7.1.0" />
-    <PackageReference Include="FsCheck.Xunit" Version="2.16.5" />
+    <PackageReference Include="FsCheck.Xunit" Version="3.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

Original file line number	Diff line number	Diff line change
`@@ -3,30 +3,31 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using FsCheck;`
	`6`	`+using FsCheck.Fluent;`
`6`	`7`
`7`	`8`	`namespace BenchmarkDotNetAnalyser.Tests.Unit`
`8`	`9`	`{`
`9`	`10`	`public static class AlphanumericStringArbitrary`
`10`	`11`	`{`
`11`		`- public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator`
`12`		`- .Where(s => s.Get.All(c => char.IsDigit(c) \|\| char.IsLetter(c)))`
`13`		`- .Select(s => s.Get)`
	`12`	`+ public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator`
	`13`	`+ .Where(s => !string.IsNullOrEmpty(s))`
	`14`	`+ .Where(s => s.All(c => char.IsDigit(c) \|\| char.IsLetter(c)))`
`14`	`15`	`.ToArbitrary();`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`public static class NonIntegerStringArbitrary`
`18`	`19`	`{`
`19`		`- public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator`
`20`		`- .Where(s => !int.TryParse(s.Get, out _))`
`21`		`- .Select(s => s.Get)`
	`20`	`+ public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator`
	`21`	`+ .Where(s => !string.IsNullOrEmpty(s))`
	`22`	`+ .Where(s => !int.TryParse(s, out _))`
`22`	`23`	`.ToArbitrary();`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public static class NonDecimalStringArbitrary`
`26`	`27`	`{`
`27`		`- public static Arbitrary<string> GetArbitrary() => Arb.Default.NonEmptyString().Generator`
`28`		`- .Where(s => !decimal.TryParse(s.Get, out _))`
`29`		`- .Select(s => s.Get)`
	`28`	`+ public static Arbitrary<string> GetArbitrary() => ArbMap.Default.ArbFor<string>().Generator`
	`29`	`+ .Where(s => !string.IsNullOrEmpty(s))`
	`30`	`+ .Where(s => !decimal.TryParse(s, out _))`
`30`	`31`	`.ToArbitrary();`
`31`	`32`	`}`
`32`	`33`
`@@ -62,10 +63,10 @@ public static class InvalidPathArbitrary`
`62`	`63`	`public static Arbitrary<string> GetArbitrary()`
`63`	`64`	`{`
`64`	`65`	`var disallowed = new HashSet<string>() { ".", "/", @"\"};`
`65`		`- return Arb.Default.NonEmptyString().Generator`
`66`		`- .Where(s => !disallowed.Contains(s.Get) &&`
`67`		`- !s.Get.All(c => char.IsDigit(c) \|\| char.IsLetter(c)))`
`68`		`- .Select(s => s.Get)`
	`66`	`+ return ArbMap.Default.ArbFor<string>().Generator`
	`67`	`+ .Where(s => !string.IsNullOrEmpty(s))`
	`68`	`+ .Where(s => !disallowed.Contains(s) &&`
	`69`	`+ !s.All(c => char.IsDigit(c) \|\| char.IsLetter(c)))`
`69`	`70`	`.ToArbitrary();`
`70`	`71`	`}`
`71`	`72`	`}`