refactor: Refactor tests

DragonFrai · Aug 28, 2024 · 5bcf313 · 5bcf313
1 parent 0a6d1ec
commit 5bcf313
Show file tree

Hide file tree

Showing 35 changed files with 267 additions and 141 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <BumpedVersion>0.5.0-alpha</BumpedVersion>
+        <BumpedVersion>0.6.0-alpha</BumpedVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/src/FSharp.Control.Futures/Extensions.fs b/src/FSharp.Control.Futures/Extensions.fs
@@ -5,7 +5,7 @@ open System
 open System.Threading
 
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 [<RequireQualifiedAccess>]

diff --git a/src/FSharp.Control.Futures/FSharp.Control.Futures.fsproj b/src/FSharp.Control.Futures/FSharp.Control.Futures.fsproj
@@ -21,16 +21,16 @@
 
     <ItemGroup>
         <Compile Include="Types.fs" />
-        <Compile Include="Internals\Utils.fs" />
-        <Compile Include="Internals\Future.fs" />
-        <Compile Include="Internals\IntrusiveList.fs" />
-        <Compile Include="Internals\Helpers.fs" />
-        <Compile Include="Internals\NaiveFuture.fs" />
-        <Compile Include="Internals\PrimaryMerge.fs" />
-        <Compile Include="Internals\PrimaryNotify.fs" />
-        <Compile Include="Internals\PrimaryOnceCell.fs" />
-        <Compile Include="Internals\Futures.fs" />
-        <Compile Include="Internals\FuseFuture.fs" />
+        <Compile Include="LowLevel\Utils.fs" />
+        <Compile Include="LowLevel\Future.fs" />
+        <Compile Include="LowLevel\IntrusiveList.fs" />
+        <Compile Include="LowLevel\Helpers.fs" />
+        <Compile Include="LowLevel\NaiveFuture.fs" />
+        <Compile Include="LowLevel\PrimaryMerge.fs" />
+        <Compile Include="LowLevel\PrimaryNotify.fs" />
+        <Compile Include="LowLevel\PrimaryOnceCell.fs" />
+        <Compile Include="LowLevel\Futures.fs" />
+        <Compile Include="LowLevel\FuseFuture.fs" />
         <Compile Include="Future.fs" />
         <Compile Include="Extensions.fs" />
         <Compile Include="Mailbox\Reply.fs" />

diff --git a/src/FSharp.Control.Futures/Future.fs b/src/FSharp.Control.Futures/Future.fs
@@ -1,15 +1,15 @@
 namespace FSharp.Control.Futures
 
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 /// <summary>
 ///
 /// </summary>
 /// <remarks>
 /// `poll` and `drop` are not userspace functions.
-/// Low-level functions must be defined in there namespace: <see cref="FSharp.Control.Futures.Internals"/>.
+/// Low-level functions must be defined in there namespace: <see cref="FSharp.Control.Futures.LowLevel"/>.
 /// </remarks>
 [<RequireQualifiedAccess>]
 module Future =

diff --git a/...p.Control.Futures/Internals/FuseFuture.fs → ...rp.Control.Futures/LowLevel/FuseFuture.fs b/...p.Control.Futures/Internals/FuseFuture.fs → ...rp.Control.Futures/LowLevel/FuseFuture.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open System
 open FSharp.Control.Futures

diff --git a/...Sharp.Control.Futures/Internals/Future.fs → ...FSharp.Control.Futures/LowLevel/Future.fs b/...Sharp.Control.Futures/Internals/Future.fs → ...FSharp.Control.Futures/LowLevel/Future.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...harp.Control.Futures/Internals/Futures.fs → ...Sharp.Control.Futures/LowLevel/Futures.fs b/...harp.Control.Futures/Internals/Futures.fs → ...Sharp.Control.Futures/LowLevel/Futures.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...harp.Control.Futures/Internals/Helpers.fs → ...Sharp.Control.Futures/LowLevel/Helpers.fs b/...harp.Control.Futures/Internals/Helpers.fs → ...Sharp.Control.Futures/LowLevel/Helpers.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...ontrol.Futures/Internals/IntrusiveList.fs → ...Control.Futures/LowLevel/IntrusiveList.fs b/...ontrol.Futures/Internals/IntrusiveList.fs → ...Control.Futures/LowLevel/IntrusiveList.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 
 [<AllowNullLiteral>]

diff --git a/....Control.Futures/Internals/NaiveFuture.fs → ...p.Control.Futures/LowLevel/NaiveFuture.fs b/....Control.Futures/Internals/NaiveFuture.fs → ...p.Control.Futures/LowLevel/NaiveFuture.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...Control.Futures/Internals/PrimaryMerge.fs → ....Control.Futures/LowLevel/PrimaryMerge.fs b/...Control.Futures/Internals/PrimaryMerge.fs → ....Control.Futures/LowLevel/PrimaryMerge.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...ontrol.Futures/Internals/PrimaryNotify.fs → ...Control.Futures/LowLevel/PrimaryNotify.fs b/...ontrol.Futures/Internals/PrimaryNotify.fs → ...Control.Futures/LowLevel/PrimaryNotify.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open System
 open System.Threading

diff --git a/...trol.Futures/Internals/PrimaryOnceCell.fs → ...ntrol.Futures/LowLevel/PrimaryOnceCell.fs b/...trol.Futures/Internals/PrimaryOnceCell.fs → ...ntrol.Futures/LowLevel/PrimaryOnceCell.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open FSharp.Control.Futures
 

diff --git a/...FSharp.Control.Futures/Internals/Utils.fs → src/FSharp.Control.Futures/LowLevel/Utils.fs b/...FSharp.Control.Futures/Internals/Utils.fs → src/FSharp.Control.Futures/LowLevel/Utils.fs
@@ -1,4 +1,4 @@
-namespace FSharp.Control.Futures.Internals
+namespace FSharp.Control.Futures.LowLevel
 
 open System.Diagnostics
 
@@ -17,6 +17,9 @@ module Utils =
     let inline unreachable () =
         raise (UnreachableException())
 
+    let inline unreachableS msg =
+        raise (UnreachableException(msg))
+
 
 type [<Struct>] ExnResult<'a> =
     val value: 'a

diff --git a/src/FSharp.Control.Futures/Mailbox/Mailbox.fs b/src/FSharp.Control.Futures/Mailbox/Mailbox.fs
@@ -2,7 +2,7 @@ namespace FSharp.Control.Futures.Mailbox
 
 open System.Threading
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 exception MailboxMultipleReceiveAtSameTimeException

diff --git a/src/FSharp.Control.Futures/Mailbox/Reply.fs b/src/FSharp.Control.Futures/Mailbox/Reply.fs
@@ -1,7 +1,7 @@
 namespace FSharp.Control.Futures.Mailbox
 
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 /// <summary>

diff --git a/src/FSharp.Control.Futures/Runtime/LowLevel/AbstractFutureTask.fs b/src/FSharp.Control.Futures/Runtime/LowLevel/AbstractFutureTask.fs
@@ -3,7 +3,7 @@ namespace FSharp.Control.Futures.Runtime.LowLevel
 open System
 open System.Diagnostics
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 open FSharp.Control.Futures.Runtime.LowLevel
 open FSharp.Control.Futures.Runtime
 open Microsoft.FSharp.Core

diff --git a/src/FSharp.Control.Futures/Runtime/Runtimes.fs b/src/FSharp.Control.Futures/Runtime/Runtimes.fs
@@ -2,7 +2,9 @@ namespace FSharp.Control.Futures.Runtime
 
 open FSharp.Control.Futures.Runtime.ThreadPoolRuntime
 
-[<RequireQualifiedAccess>]
-module ThreadPoolRuntime =
-    let instance = ThreadPoolRuntime.Instance
-    let inline spawn fut = Runtime.spawn ThreadPoolRuntime.Instance fut
+[<AutoOpen>]
+module ThreadPoolRuntimePrelude =
+    [<RequireQualifiedAccess>]
+    module ThreadPoolRuntime =
+        let instance = ThreadPoolRuntime.Instance
+        let inline spawn fut = Runtime.spawn ThreadPoolRuntime.Instance fut
diff --git a/src/FSharp.Control.Futures/Runtime/ThreadPoolRuntime/ThreadPoolRuntime.fs b/src/FSharp.Control.Futures/Runtime/ThreadPoolRuntime/ThreadPoolRuntime.fs
@@ -1,4 +1,4 @@
-namespace rec FSharp.Control.Futures.Runtime.ThreadPoolRuntime
+namespace FSharp.Control.Futures.Runtime.ThreadPoolRuntime
 
 open System
 open System.Diagnostics
@@ -9,6 +9,7 @@ open FSharp.Control.Futures.Runtime.LowLevel
 
 
 [<Class>]
+[<Sealed>]
 type ThreadPoolFutureTask<'a>(fut: Future<'a>) =
     inherit AbstractFutureTask<'a>(fut)
 
@@ -22,6 +23,7 @@ type ThreadPoolFutureTask<'a>(fut: Future<'a>) =
 
 
 [<Class>]
+[<Sealed>]
 type ThreadPoolRuntime private () =
 
     static member Instance: IRuntime = new ThreadPoolRuntime()

diff --git a/src/FSharp.Control.Futures/Sync/Monitor.fs b/src/FSharp.Control.Futures/Sync/Monitor.fs
@@ -2,7 +2,7 @@ namespace rec FSharp.Control.Futures.Sync
 
 open System.Threading
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 open FSharp.Control.Futures
 
 

diff --git a/src/FSharp.Control.Futures/Sync/Mutex.fs b/src/FSharp.Control.Futures/Sync/Mutex.fs
@@ -1,7 +1,7 @@
 namespace rec FSharp.Control.Futures.Sync
 
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 // =======

diff --git a/src/FSharp.Control.Futures/Sync/OnceVar.fs b/src/FSharp.Control.Futures/Sync/OnceVar.fs
@@ -2,7 +2,7 @@ namespace rec FSharp.Control.Futures.Sync
 
 open System.Threading
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 exception IVarDoublePutException

diff --git a/src/FSharp.Control.Futures/Sync/WaitHandle.fs b/src/FSharp.Control.Futures/Sync/WaitHandle.fs
@@ -2,7 +2,7 @@ namespace FSharp.Control.Futures.Sync
 
 open System.Threading
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 type WaitHandle() = class end
 

diff --git a/src/FSharp.Control.Futures/Transforms.fs b/src/FSharp.Control.Futures/Transforms.fs
@@ -4,7 +4,7 @@ module FSharp.Control.Futures.Transforms
 open System
 open System.Threading
 open FSharp.Control.Futures
-open FSharp.Control.Futures.Internals
+open FSharp.Control.Futures.LowLevel
 
 
 [<AutoOpen>]