Fix stdout brittle tests

Author: thinkbeforecoding

src/Fargo/Token.fs

@@ -85,10 +85,9 @@ module Token =
                 result.Close()
             | n -> 
                 let txt = input.Substring(pos+1, n-pos-1)
-                if txt <> "" then
-                    result.Add { Text = txt
-                                 Extent = extent (pos+1) n
-                                 Quotes = Quotes quote }
+                result.Add { Text = txt
+                             Extent = extent (pos+1) n
+                             Quotes = Quotes quote }
                 loop input (n+1) &result
 
     let ofString (input: string) =

tests/Fargo.Test/AllAtOnce.fs

@@ -72,14 +72,10 @@ let complete pos input =
     Fargo.Run.complete p pos (Token.ofString input)
 
 let complete2 pos input =
-    let w = new IO.StringWriter()
-    Console.SetOut(w)
-
-    Run.run "test" p [|"complete"; "--position"; string pos;  input |] (fun _ x -> printfn "%A" x; Task.FromResult 0) |> ignore
-    Regex.Replace(w.ToString(),$"{'\x1b'}\[\d+m","").Split('\n')
-    |> Array.map (fun l -> l.TrimEnd())
-    |> Array.filter (not << String.IsNullOrEmpty)
-    |> String.concat Environment.NewLine
+    Testing.withStdout (fun _ ->
+
+        Run.run "test" p [|"complete"; "--position"; string pos;  input |] (fun _ x -> task { printfn "%A" x; return 0 }) |> ignore
+    )
 
 
 [<Fact>]

tests/Fargo.Test/Fargo.Test.fsproj

@@ -4,8 +4,13 @@
     <TargetFramework>net7.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-  <ItemGroup >
-    <Compile Include="*.fs"/>
+  <ItemGroup>
+    <Compile Include="Testing.fs" />
+    <Compile Include="Token.fs" />
+    <Compile Include="Parsing.fs" />
+    <Compile Include="Usage.fs" />
+    <Compile Include="Completion.fs" />
+    <Compile Include="AllAtOnce.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Fargo\Fargo.fsproj" />

tests/Fargo.Test/Testing.fs

@@ -0,0 +1,25 @@
+module Testing
+
+open System
+open System.Text.RegularExpressions
+
+let testLock = obj()
+
+let withStdout f =
+    lock testLock (fun _ -> 
+
+        let w = new IO.StringWriter()
+        Console.SetOut(w)
+
+        f()
+
+        Regex.Replace(w.ToString(),$"{'\x1b'}\[\d+m","").Split('\n')
+        |> Array.map (fun l -> l.TrimEnd())
+        |> Array.filter (not << String.IsNullOrEmpty)
+        |> String.concat Environment.NewLine
+    )
+
+
+
+
+

tests/Fargo.Test/Token.fs

@@ -104,3 +104,11 @@ let ``Token.ofString then Token.toString should give same result`` (NonNull (arg
     let trimmed = args.TrimEnd()
     let result = trimmed |> Token.ofString |> Token.toString
     result =! trimmed
+
+
+[<Fact>]
+let ``Token.ofString then Token.toString should give same result with empty quotes `` () =
+    let trimmed = "\"\""
+    let result = trimmed |> Token.ofString |> Token.toString
+    result =! trimmed
+

tests/Fargo.Test/Usage.fs

@@ -12,22 +12,11 @@ let (=!) (actual:'a) (expected: 'a) = Differ.Assert(expected, actual )
 
 let outUsage (p,c) input =
     let _,_,usages = p (Token.ofString input)
-    let w = new IO.StringWriter()
-    Console.SetOut(w)
-    printHelp usages
-    Regex.Replace(w.ToString(),$"{'\x1b'}\[\d+m","").Split('\n')
-    |> Array.map (fun l -> l.TrimEnd())
-    |> Array.filter (not << String.IsNullOrEmpty)
-    |> String.concat Environment.NewLine
+    Testing.withStdout(fun _ -> printHelp usages)
 
 let outRun p input =
-    let w = new IO.StringWriter()
-    Console.SetOut(w)
-    run "test" p [|input|] (fun _ v -> printfn "%A" v; Task.FromResult 0) |> ignore
-    Regex.Replace(w.ToString(),$"{'\x1b'}\[\d+m","").Split('\n')
-    |> Array.map (fun l -> l.TrimEnd())
-    |> Array.filter (not << String.IsNullOrEmpty)
-    |> String.concat Environment.NewLine
+    Testing.withStdout(fun _ -> 
+    run "test" p [|input|] (fun _ v -> task { printfn "%A" v; return 0}) |> ignore)
 
 [<Fact>]
 let ``arg usage``() =