Merge pull request #453 from hedgehogqa/cleanup-round-1

Cleanup round 1

Author: AlexeyRaga

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "feature",
-    "version": "6.0.411"
+    "version": "8.0.100"
   }
-}
+}

src/Hedgehog/Gen.fs

@@ -7,6 +7,7 @@ open System
 type Gen<'a> =
     | Gen of Random<Tree<'a>>
 
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Gen =
 
     let ofRandom (r : Random<Tree<'a>>) : Gen<'a> =
@@ -608,7 +609,7 @@ module Gen =
             let! offsetMinutes = int32 (Range.linearFrom 0 (Operators.int minOffsetMinutes) (Operators.int maxOffsetMinutes))
             return DateTimeOffset(ticks, TimeSpan.FromMinutes (Operators.float offsetMinutes))
         }
-        
+
 #if !FABLE_COMPILER
     /// Generates a random TimeSpan using the specified range.
     let timeSpan (range : Range<TimeSpan>) : Gen<TimeSpan> =

src/Hedgehog/Linq/Gen.fs

@@ -12,9 +12,17 @@ type Gen private () =
     /// Create a generator that always yields a constant value.
     /// </summary>
     /// <param name="value">The constant value the generator always returns.</param>
+    [<Obsolete("Use Gen.Constant instead.")>]
     static member FromValue (value : 'T) : Gen<'T> =
         Gen.constant value
 
+    /// <summary>
+    /// Create a generator that always yields a constant value.
+    /// </summary>
+    /// <param name="value">The constant value the generator always returns.</param>
+    static member Constant (value : 'T) : Gen<'T> =
+
+        Gen.constant value
     static member FromRandom (random : Random<Tree<'T>>) : Gen<'T> =
         Gen.ofRandom random
 
@@ -73,18 +81,27 @@ type Gen private () =
     /// <i>The input list must be non-empty.</i>
     /// </summary>
     /// <param name="items">A non-empty IEnumerable of the Gen's possible values</param>
-    static member Item (items : seq<'T>) : Gen<'T> =
+    static member Item ([<ParamArray>] items : array<'T>) : Gen<'T> =
         Gen.item items
 
     /// Uses a weighted distribution to randomly select one of the gens in the list.
     /// This generator shrinks towards the first generator in the list.
     /// <i>The input list must be non-empty.</i>
-    static member Frequency (gens : seq<int * Gen<'T>>) : Gen<'T> =
+    static member Frequency ([<ParamArray>] gens : array<int * Gen<'T>>) : Gen<'T> =
         Gen.frequency gens
 
+    /// Uses a weighted distribution to randomly select one of the gens in the list.
+    /// This generator shrinks towards the first generator in the list.
+    /// <i>The input list must be non-empty.</i>
+    static member Frequency ([<ParamArray>] values : array<struct (int * 'T)>) : Gen<'T> =
+        values
+        |> Seq.map (fun struct (weight, value) -> (weight, Gen.constant value))
+        |> Gen.frequency
+
+
     /// Randomly selects one of the gens in the list.
     /// <i>The input list must be non-empty.</i>
-    static member Choice (gens : seq<Gen<'T>>) : Gen<'T> =
+    static member Choice ([<ParamArray>] gens : array<Gen<'T>>) : Gen<'T> =
         Gen.choice gens
 
     /// Randomly selects from one of the gens in either the non-recursive or the
@@ -157,6 +174,7 @@ type Gen private () =
 
     /// <summary>
     /// Generates a random Latin-1 character, i.e. from '\000' to '\255', i.e. any 8 bit character.
+    /// </summary>
     /// <remarks>
     /// Non-printable and control characters can be generated, e.g. NULL and BEL.
     /// </remarks>
@@ -278,7 +296,6 @@ type Gen private () =
     static member DateTimeOffset (range : Range<DateTimeOffset>) : Gen<DateTimeOffset> =
         Gen.dateTimeOffset range
 
-[<Extension>]
 [<AbstractClass; Sealed>]
 type GenExtensions private () =
 
@@ -289,6 +306,7 @@ type GenExtensions private () =
     /// <summary>
     /// Generates an array using a 'Range' to determine the length.
     /// </summary>
+    /// <param name="gen">Item generator.</param>
     /// <param name="range">Range determining the length of the array.</param>
     [<Extension>]
     static member Array (gen : Gen<'T>, range : Range<int>) : Gen<'T []> =
@@ -297,6 +315,7 @@ type GenExtensions private () =
     /// <summary>
     /// Generates an enumerable using a 'Range' to determine the length.
     /// </summary>
+    /// <param name="gen">Item generator.</param>
     /// <param name="range">Range determining the length of the enumerable.</param>
     [<Extension>]
     static member Enumerable (gen : Gen<'T>, range : Range<int>) : Gen<seq<'T>> =
@@ -347,6 +366,7 @@ type GenExtensions private () =
         Gen.resize size gen
 
     /// <summary>Returns a List of values produced by the generator.</summary>
+    /// <param name="gen">Value generator.</param>
     /// <param name="size">The size parameter for the generator.</param>
     /// <param name="count">The number of samples to produce, i.e. the length of the List.</param>
     [<Extension>]
@@ -386,11 +406,11 @@ type GenExtensions private () =
         Gen.mapTree binder.Invoke gen
 
     /// <summary>
-    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select<c>.
+    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select</c>.
     /// </summary>
     /// <example>
     /// <code>
-    /// Gen<Point> pointGen = Gen.Int32(Range.Constant(0,200))
+    /// Gen&lt;Point&gt; pointGen = Gen.Int32(Range.Constant(0,200))
     ///     .Tuple2()
     ///     .Select(tuple => new Point(tuple.Item1, tuple.Item2));
     /// </code>
@@ -400,11 +420,11 @@ type GenExtensions private () =
         Gen.map mapper.Invoke gen
 
     /// <summary>
-    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select<c>.
+    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select</c>.
     /// </summary>
     /// <example>
     /// <code>
-    /// Gen<Point> pointGen = Gen.Int32(Range.Constant(0,200))
+    /// Gen&lt;Point&gt; pointGen = Gen.Int32(Range.Constant(0,200))
     ///     .Tuple2()
     ///     .Select(tuple => new Point(tuple.Item1, tuple.Item2));
     /// </code>
@@ -416,11 +436,11 @@ type GenExtensions private () =
             genB
 
     /// <summary>
-    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select<c>.
+    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select</c>.
     /// </summary>
     /// <example>
     /// <code>
-    /// Gen<Point> pointGen = Gen.Int32(Range.Constant(0,200))
+    /// Gen&lt;Point&gt; pointGen = Gen.Int32(Range.Constant(0,200))
     ///     .Tuple2()
     ///     .Select(tuple => new Point(tuple.Item1, tuple.Item2));
     /// </code>
@@ -433,11 +453,11 @@ type GenExtensions private () =
             genC
 
     /// <summary>
-    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select<c>.
+    /// Projects each value of a generator into a new form. Similar to <c>Enumerable.Select</c>.
     /// </summary>
     /// <example>
     /// <code>
-    /// Gen<Point> pointGen = Gen.Int32(Range.Constant(0,200))
+    /// Gen&lt;Point&gt; pointGen = Gen.Int32(Range.Constant(0,200))
     ///     .Tuple2()
     ///     .Select(tuple => new Point(tuple.Item1, tuple.Item2));
     /// </code>

src/Hedgehog/Linq/Range.fs

@@ -13,9 +13,14 @@ type Range private () =
     //
 
     /// Construct a range which represents a constant single value.
+    [<Obsolete("Use Range.Singleton instead.", true)>]
     static member FromValue (value : 'T) : Range<'T> =
         Range.singleton value
 
+    /// Construct a range which represents a constant single value.
+    static member Singleton (value : 'T) : Range<'T> =
+        Range.singleton value
+
     /// Construct a range which is unaffected by the size parameter with a
     /// origin point which may differ from the bounds.
     static member Constant (z : 'T, x : 'T, y : 'T) : Range<'T> =

src/Hedgehog/Range.fs

@@ -16,6 +16,7 @@ type Size = int
 type Range<'a> =
     | Range of origin : 'a * (Size -> 'a * 'a)
 
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Range =
     let private bimap (f : 'a -> 'b) (g : 'c -> 'd) (a : 'a, b : 'c) : 'b * 'd =
         f a, g b

tests/Hedgehog.Benchmarks/GenBenchmarks.fs

@@ -2,11 +2,10 @@ namespace Hedgehog.Benchmarks
 
 open BenchmarkDotNet.Attributes
 open BenchmarkDotNet.Jobs
+open FsCheck.Fluent
 
 module HRange = Hedgehog.Range
 module HGen = Hedgehog.Gen
-module FArb = FsCheck.Arb
-module FGen = FsCheck.Gen
 
 [<SimpleJob(RuntimeMoniker.NetCoreApp31)>]
 type GenBenchmarks () =
@@ -23,6 +22,5 @@ type GenBenchmarks () =
 
     [<Benchmark>]
     member this.FsCheckGenSampleInt32 () =
-        FArb.generate<int>
-        |> FGen.sample 100 this.N
+        ArbMap.Default.ArbFor<int>().Generator.Sample(this.N)
         |> Seq.iter ignore

tests/Hedgehog.Benchmarks/Hedgehog.Benchmarks.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
-    <PackageReference Include="FsCheck" Version="2.16.6" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
+    <PackageReference Include="FsCheck" Version="3.3.2" />
   </ItemGroup>
 
   <ItemGroup>

tests/Hedgehog.DieHarder/Hedgehog.DieHarder.fsproj

@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Hedgehog\Hedgehog.fsproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Hedgehog\Hedgehog.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

tests/Hedgehog.Linq.Tests/Hedgehog.Linq.Tests.csproj

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>12</LangVersion>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

tests/Hedgehog.Linq.Tests/LinqTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -75,8 +74,8 @@ public void RecheckIsFasterThanCheck()
             var mid = Gen.Int32(Range.Constant(10, 50));
             var big = Gen.Int32(Range.Constant(100, 200));
             var large = Gen.Int32(Range.Constant(500, 1000));
-            var choice = Gen.Choice(new List<Gen<int>> { low, mid, big, large }).List(Range.Constant(100, 200));
-            var prop = ForAll(choice).Select(x => x.Any((x) => x == 990));
+            var choice = Gen.Choice(low, mid, big, large).List(Range.Constant(100, 200));
+            var prop = ForAll(choice).Select(x => x.Any(y => y == 990));
             var watch = new System.Diagnostics.Stopwatch();
 
             watch.Start();
@@ -174,9 +173,9 @@ from z in ForAll(Gen.Bool)
         public void CanUseWhereWithAssertion()
         {
             var property =
-                from x in ForAll(Gen.FromValue(true))
+                from x in ForAll(Gen.Constant(true))
                 where x == true
-                from y in ForAll(Gen.FromValue(false))
+                from y in ForAll(Gen.Constant(false))
                 where y == false
                 select Assert.True(x && !y);
 
@@ -187,9 +186,9 @@ from y in ForAll(Gen.FromValue(false))
         public void CanUseWhereWithBool()
         {
             var property =
-                from x in ForAll(Gen.FromValue(true))
+                from x in ForAll(Gen.Constant(true))
                 where x == true
-                from y in ForAll(Gen.FromValue(false))
+                from y in ForAll(Gen.Constant(false))
                 where y == false
                 select x && !y;
 
@@ -238,6 +237,10 @@ where i
         [Fact]
         public void CanUseSelectManyWithGen()
         {
+            Gen.Frequency(
+                (1, Gen.Int32(Range.Constant(0, 100))),
+                (1, Gen.Int32(Range.Constant(0, 100)))
+                );
             Gen<bool> a =
                 from i in Gen.Bool
                 from j in Gen.Bool