fixed some f# tests

TUnit.TestProject.FSharp/AfterTestAttributeTests.fs

@@ -1,28 +1,31 @@
 namespace TUnit.TestProject.FSharp
 
 open System
+open System.IO
 open System.Threading.Tasks
 open TUnit.Assertions
 open TUnit.Assertions.Extensions
 open TUnit.Core.Interfaces
-open Polyfills
+open TUnit.Core
+open TUnit.Assertions.FSharp.Operations
 
-// Equivalent of AfterTestAttributeTests.cs
+
+type WriteFileAfterTestAttribute() =
+        inherit System.Attribute()
+        interface ITestEndEventReceiver with
+            member _.OnTestEnd(testContext: AfterTestContext) =
+                task {
+                    Console.WriteLine("Writing file inside WriteFileAfterTestAttribute!")
+                    do! FilePolyfill.WriteAllTextAsync(filename, "Foo!")
+                } :> Task
+            member _.Order = 0
 
 type AfterTestAttributeTests() =
     static let filename = sprintf "%s-AfterTestAttributeTests.txt" (Guid.NewGuid().ToString("N"))
 
     [<Test>]
     [<WriteFileAfterTest>]
-    member _.Test() : Task =
-        Assert.That(File.Exists(filename)).IsFalse()
-
-and WriteFileAfterTestAttribute() =
-    inherit System.Attribute()
-    interface ITestEndEventReceiver with
-        member _.OnTestEnd(testContext: AfterTestContext) =
-            task {
-                Console.WriteLine("Writing file inside WriteFileAfterTestAttribute!")
-                do! FilePolyfill.WriteAllTextAsync(filename, "Foo!")
-            } :> Task
-        member _.Order = 0
+    member _.Test() =
+        async{
+             do! check(Assert.That<bool>(File.Exists(filename)).IsFalse())
+        }

TUnit.TestProject.FSharp/ConflictingDependsOnTests.fs

@@ -2,9 +2,10 @@ namespace TUnit.TestProject.FSharp
 
 open System
 open System.Threading.Tasks
+open System.Diagnostics.CodeAnalysis
 open TUnit.Core
 
-[<UnconditionalSuppressMessage("Usage", "TUnit0033:Conflicting DependsOn attributes")>]
+[<SuppressMessage("Usage", "TUnit0033:Conflicting DependsOn attributes")>]
 type ConflictingDependsOnTests() =
     [<Test>]
     [<DependsOn("Test2")>]

TUnit.TestProject.FSharp/DataDrivenTests.fs

@@ -59,11 +59,6 @@ type DataDrivenTests() =
         ()
 
     [<Test>]
-    [<Arguments([| 1; 2; 3 |])>]
-    member _.IntegerArray(values: int array) =
-        ()
-
-    [<Test>]
-    [<Arguments(System.Int32.MaxValue)>]
+    [<Arguments(Int32.MaxValue)>]
     member _.IntMaxValue(value: int) =
         ()

TUnit.TestProject.FSharp/DeepNestedDependencyConflict.fs

@@ -1,10 +1,11 @@
 namespace TUnit.TestProject.FSharp
 
 open TUnit.Core
+open System.Diagnostics.CodeAnalysis
 
 // Equivalent of DeepNestedDependencyConflict.cs
 
-[<UnconditionalSuppressMessage("Usage", "TUnit0033:Conflicting DependsOn attributes")>]
+[<SuppressMessage("Usage", "TUnit0033:Conflicting DependsOn attributes")>]
 type DeepNestedDependencyConflict() =
     [<Test>]
     [<DependsOn("Test2")>]

TUnit.TestProject.FSharp/DynamicallyRegisteredTests.fs

@@ -7,6 +7,7 @@ open System.Threading.Tasks
 open TUnit.Core
 open TUnit.Core.Enums
 open TUnit.Core.Interfaces
+open TUnit.Engine.Extensions
 
 type DynamicDataGenerator() =
     inherit DataSourceGeneratorAttribute<int>()
@@ -33,10 +34,10 @@ type DynamicDataGenerator() =
                         raise (Exception())
                     if DynamicDataGenerator.IsReregisteredTest(testContext) then
                         () // Optionally suppress reporting
-                    do! testContext.ReregisterTestWithArguments([|(Random()).Next()|],
-                        dict [ "DynamicDataGeneratorRetry", box true ])
+                    let retryDict = Dictionary<string, obj>()
+                    retryDict.Add("DynamicDataGeneratorRetry", box true)
+                    do! testContext.ReregisterTestWithArguments([|(Random()).Next()|], retryDict)
             } |> ValueTask
-        member _.Order = 0
 
     interface IEventReceiver with
         member _.Order = 0
@@ -52,3 +53,5 @@ type DynamicallyRegisteredTests() =
         raise (Exception($"Value {value} !"))
 
 
+
+

TUnit.TestProject.FSharp/EnumerableDataSourceDrivenTests.fs

@@ -5,6 +5,7 @@ open System.Threading.Tasks
 open TUnit.Assertions
 open TUnit.Assertions.Extensions
 open TUnit.Core
+open TUnit.Assertions.FSharp.Operations
 
 // F# equivalent of EnumerableDataSourceDrivenTests.cs
 
@@ -19,13 +20,17 @@ type ConcreteValue2() =
 type EnumerableDataSourceDrivenTests() =
     [<Test>]
     [<MethodDataSource("SomeMethod")>]
-    member _.DataSource_Method(value: int) : Task =
-        Assert.That(value).IsEqualTo(1)
+    member _.DataSource_Method(value: int) =
+        async{
+            do! check(Assert.That(value).IsEqualTo(1))
+        }
 
     [<Test>]
     [<MethodDataSource("SomeMethod")>]
-    member _.DataSource_Method2(value: int) : Task =
-        Assert.That(value).IsEqualTo(1)
+    member _.DataSource_Method2(value: int) =
+        async{
+            do! check(Assert.That(value).IsEqualTo(1))
+        }
 
     [<Test>]
     [<MethodDataSource("MethodWithBaseReturn")>]

TUnit.TestProject.FSharp/Inject_SharedInstancePerKey.fs

@@ -10,8 +10,6 @@ open TUnit.Core
 module SharedInjectedKeyedContainer =
     let instancesPerKey = ConcurrentDictionary<string, ResizeArray<DummyReferenceTypeClass>>()
 
-type DummyReferenceTypeClass() = class end
-
 [<ClassDataSource(typeof<DummyReferenceTypeClass>, Shared=SharedType.PerClass)>]
 [<NotInParallel>]
 type InjectSharedPerKey1(dummyReferenceTypeClass: DummyReferenceTypeClass) =

TUnit.TestProject.FSharp/InjectedClassDataSourceWithAsyncInitializerTests.fs

@@ -5,8 +5,15 @@ open System.Threading.Tasks
 open TUnit.Core
 open TUnit.Core.Interfaces
 
-[<ClassDataSource(typeof<InjectedClassDataSourceWithAsyncInitializerTests.MyClass>, Shared=SharedType.Keyed, Key="MyKey")>]
-type InjectedClassDataSourceWithAsyncInitializerTests(myClass: InjectedClassDataSourceWithAsyncInitializerTests.MyClass) =
+
+type MyClass() =
+        interface IAsyncInitializer with
+            member _.InitializeAsync() =
+                Console.WriteLine("IAsyncInitializer.InitializeAsync")
+                Task.CompletedTask
+
+[<ClassDataSource(typeof<MyClass>, Shared=SharedType.Keyed, Key="MyKey")>]
+type InjectedClassDataSourceWithAsyncInitializerTests(myClass: MyClass) =
     [<Before(HookType.Test)>]
     member _.BeforeTest() : Task =
         Console.WriteLine("BeforeTest")
@@ -26,9 +33,3 @@ type InjectedClassDataSourceWithAsyncInitializerTests(myClass: InjectedClassData
     member _.Test3() : Task =
         Console.WriteLine("Test")
         Task.CompletedTask
-
-    type MyClass() =
-        interface IAsyncInitializer with
-            member _.InitializeAsync() =
-                Console.WriteLine("IAsyncInitializer.InitializeAsync")
-                Task.CompletedTask