test: add more richer command support for the test program

Author: gretmn102

.vscode/tasks.json

@@ -33,6 +33,51 @@
             },
             "problemMatcher": []
         },
+        {
+            "label": "TestsRunMock",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "fake",
+                "build",
+                "-t",
+                "TestsRunMock"
+            ],
+            "group": {
+                "kind": "test",
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "TestsRunFull",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "fake",
+                "build",
+                "-t",
+                "TestsRunFull"
+            ],
+            "group": {
+                "kind": "test",
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "TestsRunInteractiveFull",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "fake",
+                "build",
+                "-t",
+                "TestsRunInteractiveFull"
+            ],
+            "group": {
+                "kind": "test",
+            },
+            "problemMatcher": []
+        },
         {
             "label": "CliBuild",
             "type": "shell",

build.fsx

@@ -61,8 +61,8 @@ let dotnetBuild =
         |> String.concat " "
     dotnet (sprintf "build %s" commonBuildArgs)
 
-let dotnetRun framework =
-    dotnet (sprintf "run --framework %s" framework)
+let dotnetRun framework args =
+    dotnet (sprintf "run --framework %s -- %s" framework args)
 
 Target.create "CoreMeta" (fun _ ->
     let release = ReleaseNotes.load (parserProjDir </> "RELEASE_NOTES.md")
@@ -173,8 +173,49 @@ Target.create "CliBuild" (fun _ ->
     |> dotnetBuild
 )
 
+[<RequireQualifiedAccess>]
+type TestOnMocksType =
+    | True
+    | Interactive
+
+module TestOnMocksType =
+    let toString typ =
+        match typ with
+        | TestOnMocksType.True -> "true"
+        | TestOnMocksType.Interactive -> "interactive"
+
+let testsRun isTestMain (isTestMocks: TestOnMocksType option) =
+    let args =
+        [
+            if isTestMain then
+                "--test-main"
+            match isTestMocks with
+            | None -> ""
+            | Some typ ->
+                let typ = TestOnMocksType.toString typ
+                sprintf "--test-mocks %s" typ
+        ]
+        |> String.concat " "
+
+    Path.getDirectory testProjPath
+    |> dotnetRun
+        "netcoreapp3.1"
+        args
+
 Target.create "TestsRun" (fun _ ->
-    dotnetRun "netcoreapp3.1" (Path.getDirectory testProjPath)
+    testsRun true None
+)
+
+Target.create "TestsRunMock" (fun _ ->
+    testsRun false (Some TestOnMocksType.True)
+)
+
+Target.create "TestsRunFull" (fun _ ->
+    testsRun true (Some TestOnMocksType.True)
+)
+
+Target.create "TestsRunInteractiveFull" (fun _ ->
+    testsRun true (Some TestOnMocksType.Interactive)
 )
 
 Target.create "TrimTrailingWhitespace" (fun _ ->

paket.dependencies

@@ -44,6 +44,7 @@ group Tests
 
     nuget FSharp.Core >= 4.7.2 lowest_matching: true
     nuget Fuchu >= 1.1 lowest_matching: true
+    nuget Argu >= 6.1.1 lowest_matching: true
 
     source https://gitlab.com/api/v4/projects/28574921/packages/nuget/index.json
     nuget FSharpMyExt >= 2.0.0-prerelease.8 lowest_matching: true

paket.lock

@@ -700,6 +700,9 @@ STRATEGY: MIN
 RESTRICTION: || (== net461) (== netcoreapp3.1)
 NUGET
   remote: https://api.nuget.org/v3/index.json
+    Argu (6.1.1)
+      FSharp.Core (>= 4.3.2) - restriction: || (&& (== net461) (>= netstandard2.0)) (== netcoreapp3.1)
+      System.Configuration.ConfigurationManager (>= 4.4) - restriction: || (&& (== net461) (>= netstandard2.0)) (== netcoreapp3.1)
     dotenv.net (3.1.2)
     FParsec (1.1.1)
       FSharp.Core (>= 4.3.4)
@@ -715,10 +718,13 @@ NUGET
     Newtonsoft.Json (12.0.3)
     Newtonsoft.Json.Bson (1.0.2)
       Newtonsoft.Json (>= 12.0.1)
+    System.Configuration.ConfigurationManager (4.4) - restriction: || (&& (== net461) (>= netstandard2.0)) (== netcoreapp3.1)
+      System.Security.Cryptography.ProtectedData (>= 4.4) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp3.1)
     System.Drawing.Common (4.7)
       Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp3.1)
       Microsoft.Win32.SystemEvents (>= 4.7) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp3.1)
     System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (== net461) (&& (== netcoreapp3.1) (>= net461))
+    System.Security.Cryptography.ProtectedData (4.4) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp3.1)
     System.ValueTuple (4.4) - restriction: || (== net461) (&& (== netcoreapp3.1) (>= net45))
     TextCopy (4.2)
       Microsoft.Extensions.DependencyInjection.Abstractions (>= 3.1.4)

tests/Qsp.FSharp.Core.Tests/Test.fs

@@ -1,37 +1,92 @@
 module Qsp.Tests.Test
 open Fuchu
+open Argu
 
 open Qsp
 open Tests
 
+[<Struct;RequireQualifiedAccess>]
+type TestType =
+    | MockTest
+    | MainTest
+module TestType =
+    let ofTestName (name: string) =
+        match name.StartsWith TestOnMocks.mockTestList with
+        | true -> TestType.MockTest
+        | false -> TestType.MainTest
+
+[<RequireQualifiedAccess>]
+type TestOnMocksType =
+    | True
+    | Interactive
+
+[<RequireQualifiedAccess>]
+type CliArguments =
+    | Test_Main
+    | Test_Mocks of TestOnMocksType
+
+    interface IArgParserTemplate with
+        member s.Usage =
+            match s with
+            | Test_Main -> "run main tests"
+            | Test_Mocks _ -> "run tests on the sources, which are placed in the \"mocks\" folder"
+
 [<EntryPoint;System.STAThread>]
 let main args =
-    let isFullTest () =
-        let rec whileYOrN () =
-            match System.Console.ReadKey().Key with
-            | System.ConsoleKey.Y -> true
-            | System.ConsoleKey.N -> false
-            | x ->
-                printfn "`y` or `n` but %A" x
-                whileYOrN ()
-        printfn "Full test? (`y` or `n`)"
-        whileYOrN ()
-
-    let f isFullTest =
-        if isFullTest then
-            defaultMainThisAssembly args
-        else
-            defaultMainThisAssemblyFilter
-                args
-                (fun x ->
-                    x.Where(fun x -> not <| x.StartsWith TestOnMocks.mockTestList)
-                )
-
+    let argParser = ArgumentParser.Create<CliArguments>(programName = "qsp-toolbox")
     match args with
-    | [|"--full"|] ->
-        f true
     | [||] ->
-        f (isFullTest ())
+        argParser.PrintUsage() |> printfn "%s"
+        0
     | _ ->
-        printfn "`--full` or pass args but: %A" args
-        1
+        let results =
+            try
+                Ok (argParser.ParseCommandLine(args))
+            with e ->
+                Error e.Message
+        match results with
+        | Error errMsg ->
+            printfn "%s" errMsg
+            1
+
+        | Ok results ->
+            let isFullTest () =
+                let rec whileYOrN () =
+                    match System.Console.ReadKey().Key with
+                    | System.ConsoleKey.Y -> true
+                    | System.ConsoleKey.N -> false
+                    | x ->
+                        printfn "`y` or `n` but %A" x
+                        whileYOrN ()
+                printfn "Full test? (`y` or `n`)"
+                whileYOrN ()
+
+            let isTestMocks =
+                match results.TryGetResult CliArguments.Test_Mocks with
+                | None ->
+                    false
+                | Some typ ->
+                    match typ with
+                    | TestOnMocksType.Interactive ->
+                        isFullTest ()
+                    | TestOnMocksType.True ->
+                        true
+
+            let isTestMain =
+                match results.TryGetResult CliArguments.Test_Main with
+                | None -> false
+                | Some _ -> true
+
+            if isTestMain && isTestMocks then
+                defaultMainThisAssembly args
+            else
+                defaultMainThisAssemblyFilter
+                    args
+                    (fun x ->
+                        x.Where(fun testName ->
+                            let testType = TestType.ofTestName testName
+                            match testType with
+                            | TestType.MainTest -> isTestMain
+                            | TestType.MockTest -> isTestMocks
+                        )
+                    )

tests/Qsp.FSharp.Core.Tests/paket.references

@@ -2,3 +2,4 @@ group Tests
     FSharp.Core
     FuChu
     FSharpMyExt
+    Argu