Remove deprecated code (#449)

Co-authored-by: Michał Niegrzybowski <mniegrzybowski@datto.com>

Author: ratsclub

Expecto.Tests.CSharp/Tests.cs

@@ -4,6 +4,7 @@
 using Expecto.CSharp;
 using Expecto;
 using static Expecto.Impl;
+using static Expecto.Tests.CLIArguments;
 
 namespace Test.CSharp
 {
@@ -86,12 +87,12 @@ public class Samples
 
         public static int Main(string[] args)
         {
-            var config =
-                Runner.DefaultConfig
-                    .AddPrinter(new CSharpPrinter())
-                    .AddNUnitSummary("bin/Expecto.Tests.CSharp.TestResults.xml")
-                    .AddJUnitSummary("bin/Expecto.Tests.CSharp.TestResults.junit.xml");
-            return Runner.RunTestsInAssembly(config, args);
+            Tests.CLIArguments[] config = new[]
+            {
+                NewNUnit_Summary("bin/Expecto.Tests.CSharp.TestResults.xml"),
+                NewJUnit_Summary("bin/Expecto.Tests.CSharp.TestResults.junit.xml"),
+            };
+            return Runner.RunTestsInAssemblyWithCLIArgs(config, args);
         }
     }
 }

Expecto.Tests/Tests.fs

@@ -510,7 +510,6 @@ let expecto =
             "--fscheck-max-tests"; "5"
             "--fscheck-start-size"; "10"
             "--fscheck-end-size"; "20"
-            "--my-spirit-is-weak"
             "--allow-duplicate-names"
             "--no-spinner"
             "--colours"; "256"
@@ -538,7 +537,6 @@ let expecto =
           FsCheck_Max_Tests 5
           FsCheck_Start_Size 10
           FsCheck_End_Size 20
-          My_Spirit_Is_Weak
           Allow_Duplicate_Names
           No_Spinner
           Colours 256

Expecto/CSharp.fs

@@ -3,6 +3,7 @@ namespace Expecto.CSharp
 #nowarn "46"
 
 open System
+open System.Threading
 open System.Threading.Tasks
 open System.Runtime.CompilerServices
 open System.Runtime.InteropServices
@@ -47,10 +48,10 @@ module Runner =
       Async.AwaitTask tcs.Task
 
   let RunTests(config, tests) = runEval config tests
-  let RunTestsWithArgs(config, args, tests) = runTestsWithArgs config args tests
   let RunTestsWithCLIArgs(cliArgs, args, tests) = runTestsWithCLIArgs cliArgs args tests
-  let RunTestsInAssembly(config, args) = runTestsInAssembly config args
+  let RunTestsWithCLIArgsAndCancel(ct, cliArgs, args, tests) = runTestsWithCLIArgsAndCancel ct cliArgs args tests
   let RunTestsInAssemblyWithCLIArgs(cliArgs, args) = runTestsInAssemblyWithCLIArgs cliArgs args
+  let RunTestsInAssemblyWithCLIArgsAndCancel(ct, cliArgs, args) = runTestsInAssemblyWithCLIArgsAndCancel ct cliArgs args
   let ListTests(config, tests) = listTests config tests
   let TestList(name, tests: IEnumerable<Test>) = testList name (List.ofSeq tests)
   [<CompiledName("TestCase")>]
@@ -131,9 +132,6 @@ module Runner =
       [<Extension; CompiledName("WithFsCheckEndSize")>]
       member x.WithFsCheckEndSize(fsCheckEndSize) = { x with fsCheckEndSize = fsCheckEndSize }
 
-      [<Extension; CompiledName("WithMySpiritIsWeak")>]
-      member x.WithMySpiritIsWeak(mySpiritIsWeak) = { x with mySpiritIsWeak = mySpiritIsWeak }
-
       [<Extension; CompiledName("WithAllowDuplicateNames")>]
       member x.WithAllowDuplicateNames(allowDuplicateNames) = { x with allowDuplicateNames = allowDuplicateNames }
 

Expecto/Expecto.Impl.fs

@@ -512,8 +512,6 @@ module Impl =
       /// FsCheck end size (default: 100 for testing and 10,000 for
       /// stress testing).
       fsCheckEndSize: int option
-      /// Deprecated. Will be removed on next major release.
-      mySpiritIsWeak: bool
       /// Allows duplicate test names.
       allowDuplicateNames: bool
       /// Disable spinner progress update.
@@ -544,7 +542,6 @@ module Impl =
         fsCheckMaxTests = 100
         fsCheckStartSize = 1
         fsCheckEndSize = None
-        mySpiritIsWeak = false
         allowDuplicateNames = false
         noSpinner = false
         colour = Colour8

Expecto/Expecto.fs

@@ -360,8 +360,6 @@ module Tests =
     | Summary_Location
     /// Print out version information.
     | Version
-    /// Deprecated
-    | My_Spirit_Is_Weak
     /// Allow duplicate test names.
     | Allow_Duplicate_Names
     /// Disable the spinner progress update.
@@ -400,7 +398,6 @@ module Tests =
       "--fscheck-max-tests", "Set FsCheck maximum number of tests (default: 100).", Args.number FsCheck_Max_Tests
       "--fscheck-start-size", "Set FsCheck start size (default: 1).", Args.number FsCheck_Start_Size
       "--fscheck-end-size", "Set FsCheck end size (default: 100 for testing and 10,000 for stress testing).", Args.number FsCheck_End_Size
-      "--my-spirit-is-weak", Args.deprecated, Args.none My_Spirit_Is_Weak
       "--allow-duplicate-names", "Allow duplicate test names.", Args.none Allow_Duplicate_Names
       "--colours", "Set the level of colours to use. Can be 0, 8 (default) or 256.", Args.number Colours
       "--no-spinner", "Disable the spinner progress update.", Args.none No_Spinner
@@ -448,7 +445,6 @@ module Tests =
     | FsCheck_Max_Tests n -> fun o -> {o with fsCheckMaxTests = n }
     | FsCheck_Start_Size n -> fun o -> {o with fsCheckStartSize = n }
     | FsCheck_End_Size n -> fun o -> {o with fsCheckEndSize = Some n }
-    | My_Spirit_Is_Weak -> id
     | Allow_Duplicate_Names -> fun o -> { o with allowDuplicateNames = true }
     | No_Spinner -> fun o -> { o with noSpinner = true }
     | Colours i -> fun o -> { o with colour =
@@ -533,51 +529,43 @@ module Tests =
         | _, x :: _ :: _ -> Some x.name
         | _ -> None
     )
-  /// Runs tests with the supplied config.
+
+  /// Runs all given tests with the supplied typed command-line options.
   /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsWithCLIArgsAndCancel.
-  [<Obsolete("Deprecated: please use runTestsWithCLIArgsAndCancel")>]
-  let runTestsWithCancel (ct:CancellationToken) config (tests:Test) =
-    ANSIOutputWriter.setColourLevel config.colour
-    Global.initialiseIfDefault
-      { Global.defaultConfig with
-          getLogger = fun name ->
-            LiterateConsoleTarget(
-              name, config.verbosity,
-              consoleSemaphore = Global.semaphore()) :> Logger
-      }
-    config.logName |> Option.iter setLogName
-    if config.failOnFocusedTests && passesFocusTestCheck config tests |> not then
-      1
-    else
-      let fTests = config.filter tests
-      let duplicates = lazy duplicatedNames config.joinWith fTests
-      if config.allowDuplicateNames || List.isEmpty duplicates.Value then
-        let retCode =
-          match config.stress with
-          | None -> runEvalWithCancel ct config fTests |> Async.RunSynchronously
-          | Some _ -> runStressWithCancel ct config fTests |> Async.RunSynchronously
-        afterRunTestsInvoke()
-        retCode
-      else
-        sprintf "Found duplicated test names, these names are: %A" duplicates.Value
-        |> config.printer.info
-        |> Async.RunSynchronously
-        ANSIOutputWriter.close()
+  let runTestsWithCLIArgsAndCancel (ct:CancellationToken) cliArgs args tests =
+    let runTestsWithCancel (ct:CancellationToken) config (tests:Test) =
+      ANSIOutputWriter.setColourLevel config.colour
+      Global.initialiseIfDefault
+        { Global.defaultConfig with
+            getLogger = fun name ->
+              LiterateConsoleTarget(
+                name, config.verbosity,
+                consoleSemaphore = Global.semaphore()) :> Logger
+        }
+      config.logName |> Option.iter setLogName
+      if config.failOnFocusedTests && passesFocusTestCheck config tests |> not then
         1
+      else
+        let fTests = config.filter tests
+        let duplicates = lazy duplicatedNames config.joinWith fTests
+        if config.allowDuplicateNames || List.isEmpty duplicates.Value then
+          let retCode =
+            match config.stress with
+            | None -> runEvalWithCancel ct config fTests |> Async.RunSynchronously
+            | Some _ -> runStressWithCancel ct config fTests |> Async.RunSynchronously
+          afterRunTestsInvoke()
+          retCode
+        else
+          sprintf "Found duplicated test names, these names are: %A" duplicates.Value
+          |> config.printer.info
+          |> Async.RunSynchronously
+          ANSIOutputWriter.close()
+          1
 
-  /// Runs tests with the supplied config.
-  /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsWithCLIArgs.
-  [<Obsolete("Deprecated: please use runTestsWithCLIArgs")>]
-  let runTests config tests =
-    runTestsWithCancel CancellationToken.None config tests
+    let config =
+      Seq.fold (fun s a -> foldCLIArgumentToConfig a s)
+        ExpectoConfig.defaultConfig cliArgs
 
-  /// Runs all given tests with the supplied command-line options.
-  /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsWithCLIArgsAndCancel
-  [<Obsolete("Deprecated: please use runTestsWithCLIArgsAndCancel")>]
-  let runTestsWithArgsAndCancel (ct:CancellationToken) config args tests =
     match ExpectoConfig.fillFromArgs config args with
     | ArgsUsage (usage, errors) ->
       if not (List.isEmpty errors) then
@@ -593,51 +581,16 @@ module Tests =
       printfn "EXPECTO! v%s\n" expectoVersion
       runTestsWithCancel ct config tests
 
-  /// Runs all given tests with the supplied typed command-line options.
-  /// Returns 0 if all tests passed, otherwise 1
-  let runTestsWithCLIArgsAndCancel (ct:CancellationToken) cliArgs args tests =
-    let config =
-      Seq.fold (fun s a -> foldCLIArgumentToConfig a s)
-        ExpectoConfig.defaultConfig cliArgs
-    runTestsWithArgsAndCancel ct config args tests
-
-  /// Runs all given tests with the supplied command-line options.
-  /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsWithCLIArgs
-  [<Obsolete("Deprecated: please use runTestsWithCLIArgs")>]
-  let runTestsWithArgs config args tests =
-    runTestsWithArgsAndCancel CancellationToken.None config args tests
-
   /// Runs all given tests with the supplied typed command-line options.
   /// Returns 0 if all tests passed, otherwise 1
   let runTestsWithCLIArgs cliArgs args tests =
     runTestsWithCLIArgsAndCancel CancellationToken.None cliArgs args tests
 
-  /// Runs tests in this assembly with the supplied command-line options.
-  /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsInAssemblyWithCLIArgsAndCancel
-  [<Obsolete("Deprecated: please use runTestsInAssemblyWithCLIArgsAndCancel")>]
-  let runTestsInAssemblyWithCancel (ct:CancellationToken) config args =
-    let config = { config with locate = getLocation (Assembly.GetEntryAssembly()) }
-    testFromThisAssembly ()
-    |> Option.orDefault (TestList ([], Normal))
-    |> runTestsWithArgsAndCancel ct config args
-
   /// Runs tests in this assembly with the supplied command-line options.
   /// Returns 0 if all tests passed, otherwise 1
   let runTestsInAssemblyWithCLIArgsAndCancel (ct:CancellationToken) cliArgs args =
-    let config = { ExpectoConfig.defaultConfig
-                    with locate = getLocation (Assembly.GetEntryAssembly()) }
-    let config = Seq.fold (fun s a -> foldCLIArgumentToConfig a s) config cliArgs
     let tests = testFromThisAssembly() |> Option.orDefault (TestList ([], Normal))
-    runTestsWithArgsAndCancel ct config args tests
-
-  /// Runs tests in this assembly with the supplied command-line options.
-  /// Returns 0 if all tests passed, otherwise 1
-  /// Deprecated: please use runTestsInAssemblyWithCLIArgs
-  [<Obsolete("Deprecated: please use runTestsInAssemblyWithCLIArgs")>]
-  let runTestsInAssembly config args =
-    runTestsInAssemblyWithCancel CancellationToken.None config args
+    runTestsWithCLIArgsAndCancel ct cliArgs args tests
 
   /// Runs tests in this assembly with the supplied command-line options.
   /// Returns 0 if all tests passed, otherwise 1