Defer as default - bulk change, still test failures

AltCover.Cake/Options.cs

@@ -222,7 +222,7 @@ public class PrepareOptions : Abstract.IPrepareOptions
     [SuppressMessage("Microsoft.Design",
                      "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
                      Justification = "Means 'do not use'")]
-    public bool Defer => throw new NotImplementedException("Defer not used");
+    public bool Eager => throw new NotImplementedException("Eager not used");
 
     ///<summary>
     /// Corresponds to command line option `-l, --localSource`

AltCover.DotNet/Options.fs

@@ -117,7 +117,7 @@ module Options =
     member val CommandLine = Seq.empty<String> with get, set
     member val ExposeReturnCode = true with get, set
     member val SourceLink = false with get, set
-    member val Defer = false with get, set
+    member val Eager = false with get, set
     member val LocalSource = false with get, set
     member val VisibleBranches = false with get, set
     member val ShowStatic = "-" with get, set
@@ -180,7 +180,7 @@ module Options =
         self.ExposeReturnCode
 
       member self.SourceLink = self.SourceLink
-      member self.Defer = self.Defer
+      member self.Eager = self.Eager
       member self.LocalSource = self.LocalSource
 
       member self.VisibleBranches =

AltCover.Engine/Abstract.fs

@@ -238,9 +238,9 @@ module Abstract =
     ///</summary>
     abstract member SourceLink : bool with get
     ///<summary>
-    /// Corresponds to command line option `--defer`
+    /// Corresponds to command line option `--eager`
     ///</summary>
-    abstract member Defer : bool with get
+    abstract member Eager : bool with get
     ///<summary>
     /// Corresponds to command line option `-l, --localSource`
     ///</summary>

AltCover.Engine/AltCover.fs

@@ -392,11 +392,11 @@ module AltCover =
       | Abstract a -> a.SourceLink
       | TypeSafe t -> t.SourceLink.AsBool()
 
-    member self.Defer =
+    member self.Eager =
       match self with
-      | Primitive p -> p.Defer
-      | Abstract a -> a.Defer
-      | TypeSafe t -> t.Defer.AsBool()
+      | Primitive p -> p.Eager
+      | Abstract a -> a.Eager
+      | TypeSafe t -> t.Eager.AsBool()
 
     member self.LocalSource =
       match self with
@@ -514,7 +514,7 @@ module AltCover =
         self.ExposeReturnCode
 
       member self.SourceLink = self.SourceLink
-      member self.Defer = self.Defer
+      member self.Eager = self.Eager
       member self.LocalSource = self.LocalSource
 
       member self.VisibleBranches =

AltCover.Engine/AltCover.fsi

@@ -285,9 +285,9 @@ namespace AltCoverFake.DotNet.Testing
         ///</summary>
         member SourceLink : bool
         ///<summary>
-        /// Corresponds to command line option `--defer`
+        /// Corresponds to command line option `--eager`
         ///</summary>
-        member Defer : bool
+        member Eager : bool
         ///<summary>
         /// Corresponds to command line option `-l, --localSource`
         ///</summary>

AltCover.Engine/Args.fs

@@ -87,7 +87,7 @@ module internal Args =
       ("--branchcover", args.BranchCover)
       ("--dropReturnCode", (args.ExposeReturnCode |> not))
       ("--sourcelink", args.SourceLink)
-      ("--defer", args.Defer)
+      ("--eager", args.Eager)
       ("--localSource", args.LocalSource)
       ("--visibleBranches", args.VisibleBranches)
       ("--showGenerated", args.ShowGenerated)

AltCover.Engine/Instrument.fs

@@ -395,8 +395,8 @@ module internal Instrument =
           ("get_Sample",
            (fun (w: ILProcessor) ->
              w.Create(OpCodes.Ldc_I4, CoverageParameters.sampling ())))
-          ("get_Defer",
-           (fun (w: ILProcessor) -> w.Create(CoverageParameters.deferOpCode ()))) ]
+          ("get_Eager",
+           (fun (w: ILProcessor) -> w.Create(CoverageParameters.eagerOpCode ()))) ]
         |> List.iter (fun (property, value) ->
           let pathGetterDef =
             definition.MainModule.GetTypes()

AltCover.Engine/Main.fs

@@ -34,7 +34,7 @@ module internal Main =
     CommandLine.verbosity <- 0
     CommandLine.error <- []
     CommandLine.dropReturnCode.Value <- false // ddFlag
-    CoverageParameters.defer.Value <- false // ddflag
+    CoverageParameters.eager.Value <- false // ddflag
     CoverageParameters.theInputDirectories.Clear()
     CoverageParameters.theOutputDirectories.Clear()
     CoverageParameters.configurationHash <- None
@@ -300,7 +300,7 @@ module internal Main =
            | _ -> CoverageParameters.coverstyle <- CoverStyle.BranchOnly))
         (CommandLine.ddFlag "dropReturnCode" CommandLine.dropReturnCode)
         (CommandLine.ddFlag "sourcelink" CoverageParameters.sourcelink)
-        (CommandLine.ddFlag "defer" CoverageParameters.defer)
+        (CommandLine.ddFlag "eager" CoverageParameters.eager)
         (CommandLine.ddFlag "v|visibleBranches" CoverageParameters.coalesceBranches)
         ("showstatic:",
          (fun x ->

AltCover.Engine/Primitive.fs

@@ -86,7 +86,7 @@ module Primitive =
       CommandLine: String seq
       ExposeReturnCode: bool
       SourceLink: bool
-      Defer: bool
+      Eager: bool
       LocalSource: bool
       VisibleBranches: bool
       ShowStatic: string
@@ -125,7 +125,7 @@ module Primitive =
         CommandLine = []
         ExposeReturnCode = true
         SourceLink = false
-        Defer = false
+        Eager = false
         LocalSource = false
         VisibleBranches = false
         ShowStatic = "-"

AltCover.Engine/Primitive.fsi

@@ -223,9 +223,9 @@ namespace AltCoverFake.DotNet.Testing
         ///</summary>
         SourceLink: bool
         ///<summary>
-        /// Corresponds to command line option `--defer`
+        /// Corresponds to command line option `--eager`
         ///</summary>
-        Defer: bool
+        Eager: bool
         ///<summary>
         /// Corresponds to command line option `-l, --localSource`
         ///</summary>

AltCover.Engine/Strings.eo.resx

@@ -155,7 +155,7 @@ Vidu ankaŭ '--inplace'</value>
     <value>Krei dosierujon {0}</value>
   </data>
   <data name="HelpText" xml:space="preserve">
-    <value>AltCover [/i[nputDirectory]=VALO] [/o[utputDirectory]=VALO] [/y|symbolDirectory=VALO] [/d[ependency]=VALO] [/k[ey]=VALO] [/sn|strongNameKey=VALO] [/r[eport]=VALO] [/f[ileFilter]=VALO] [/p[athFilter]=VALO] [/s|assemblyFilter=VALO] [/e|assemblyExcludeFilter=VALO] [/t[ypeFilter]=VALO] [/m[ethodFilter]=VALO] [/a[ttributeFilter]=VALO] [/attributetoplevel=VALO] [/typetoplevel=VALO] [/methodtoplevel=VALO] [--l[ocalSource]] [/c[allContext]=VALO] [/reportFormat=VALO] [--inplace] [--save] [--zipfile] [--methodpoint] [--single] [--linecover] [--branchcover] [--dropReturnCode] [--sourcelink] [--defer] [--v[isibleBranches]] [/showstatic[=VALO]] [--showGenerated] [--trivia] [--portable] [-q] [--verbose] [--?|help|h] [-- ] [...]
+    <value>AltCover [/i[nputDirectory]=VALO] [/o[utputDirectory]=VALO] [/y|symbolDirectory=VALO] [/d[ependency]=VALO] [/k[ey]=VALO] [/sn|strongNameKey=VALO] [/r[eport]=VALO] [/f[ileFilter]=VALO] [/p[athFilter]=VALO] [/s|assemblyFilter=VALO] [/e|assemblyExcludeFilter=VALO] [/t[ypeFilter]=VALO] [/m[ethodFilter]=VALO] [/a[ttributeFilter]=VALO] [/attributetoplevel=VALO] [/typetoplevel=VALO] [/methodtoplevel=VALO] [--l[ocalSource]] [/c[allContext]=VALO] [/reportFormat=VALO] [--inplace] [--save] [--zipfile] [--methodpoint] [--single] [--linecover] [--branchcover] [--dropReturnCode] [--sourcelink] [--eager] [--v[isibleBranches]] [/showstatic[=VALO]] [--showGenerated] [--trivia] [--portable] [-q] [--verbose] [--?|help|h] [-- ] [...]
 aŭ
 AltCover Runner [/r[ecorderDirectory]=VALO] [/w[orkingDirectory]=VALO] [/x|executable=VALO] [--collect] [/l[covReport]=VALO] [/t[hreshold]=VALO] [/c[obertura]=VALO] [/o[utputFile]=VALO] [--dropReturnCode] [/summary|teamcity[=VALO]] [-q] [--verbose] [--?|help|h] [-- ] [...]
 aŭ
@@ -387,8 +387,8 @@ Nuloj / forestantaj valoroj estas ignorataj. Se priraportada rezulto estas sub s
 Se la opcio ĉeestas, sed havas neniun valoron, tio estas la sama kiel 'B'
 Se la opcio ne ĉeestas, tiam la defaŭlta estas 'OC'.</value>
   </data>
-  <data name="defer" xml:space="preserve">
-    <value>Laŭvola, transdono de skriba kurant-reĝimaj priraportado ĝis elira procezo.</value>
+  <data name="eager" xml:space="preserve">
+    <value>Laŭvola, tuj skribas priraportajn datumojn pri kuristo.</value>
   </data>
   <data name="DuplicatesNotAllowed" xml:space="preserve">
     <value>{0} estis jam specifita por {1}</value>

AltCover.Engine/Strings.resx

@@ -155,7 +155,7 @@ See also '--inplace'</value>
     <value>Creating folder {0}</value>
   </data>
   <data name="HelpText" xml:space="preserve">
-    <value>AltCover [/i[nputDirectory]=VALUE] [/o[utputDirectory]=VALUE] [/y|symbolDirectory=VALUE] [/d[ependency]=VALUE] [/k[ey]=VALUE] [/sn|strongNameKey=VALUE] [/r[eport]=VALUE] [/f[ileFilter]=VALUE] [/p[athFilter]=VALUE] [/s|assemblyFilter=VALUE] [/e|assemblyExcludeFilter=VALUE] [/t[ypeFilter]=VALUE] [/m[ethodFilter]=VALUE] [/a[ttributeFilter]=VALUE] [/attributetoplevel=VALUE] [/typetoplevel=VALUE] [/methodtoplevel=VALUE] [--l[ocalSource]] [/c[allContext]=VALUE] [/reportFormat=VALUE] [--inplace] [--save] [--zipfile] [--methodpoint] [--single] [--linecover] [--branchcover] [--dropReturnCode] [--sourcelink] [--defer] [--v[isibleBranches]] [/showstatic[=VALUE]] [--showGenerated] [--trivia] [--portable] [-q] [--verbose] [--?|help|h] [-- ] [...]
+    <value>AltCover [/i[nputDirectory]=VALUE] [/o[utputDirectory]=VALUE] [/y|symbolDirectory=VALUE] [/d[ependency]=VALUE] [/k[ey]=VALUE] [/sn|strongNameKey=VALUE] [/r[eport]=VALUE] [/f[ileFilter]=VALUE] [/p[athFilter]=VALUE] [/s|assemblyFilter=VALUE] [/e|assemblyExcludeFilter=VALUE] [/t[ypeFilter]=VALUE] [/m[ethodFilter]=VALUE] [/a[ttributeFilter]=VALUE] [/attributetoplevel=VALUE] [/typetoplevel=VALUE] [/methodtoplevel=VALUE] [--l[ocalSource]] [/c[allContext]=VALUE] [/reportFormat=VALUE] [--inplace] [--save] [--zipfile] [--methodpoint] [--single] [--linecover] [--branchcover] [--dropReturnCode] [--sourcelink] [--eager] [--v[isibleBranches]] [/showstatic[=VALUE]] [--showGenerated] [--trivia] [--portable] [-q] [--verbose] [--?|help|h] [-- ] [...]
 or
 AltCover Runner [/r[ecorderDirectory]=VALUE] [/w[orkingDirectory]=VALUE] [/x|executable=VALUE] [--collect] [/l[covReport]=VALUE] [/t[hreshold]=VALUE] [/c[obertura]=VALUE] [/o[utputFile]=VALUE] [--dropReturnCode] [/summary|teamcity[=VALUE]] [-q] [--verbose] [--?|help|h] [-- ] [...]
 or
@@ -391,8 +391,8 @@ Zero/absent values are ignored. If a coverage result is below threshold, or the
 If the option is present, but has no value, this is the same as 'B'
 If the option is not present, then the default is 'OC'.</value>
   </data>
-  <data name="defer" xml:space="preserve">
-    <value>Optional, defers writing runner-mode coverage data until process exit.</value>
+  <data name="eager" xml:space="preserve">
+    <value>Optional, writes runner-mode coverage data immediately.</value>
   </data>
   <data name="DuplicatesNotAllowed" xml:space="preserve">
     <value>{0} was already specified for {1}</value>

AltCover.Engine/Tasks.fs

@@ -131,7 +131,7 @@ type Prepare() =
   member val CommandLine: string array = [||] with get, set
 
   member val SourceLink = false with get, set
-  member val Defer = true with get, set
+  member val Eager = true with get, set
   member val VisibleBranches = false with get, set
   member val ShowStatic = "-" with get, set
   member val ShowGenerated = false with get, set
@@ -186,7 +186,7 @@ type Prepare() =
           CommandLine = self.CommandLine
           ExposeReturnCode = self.ExposeReturnCode
           SourceLink = self.SourceLink
-          Defer = self.Defer
+          Eager = self.Eager
           LocalSource = self.LocalSource
           VisibleBranches = self.VisibleBranches
           ShowStatic = self.ShowStatic

AltCover.Engine/Tasks.fsi

@@ -12,7 +12,7 @@ open Microsoft.Build.Framework //// no doc
 open Microsoft.Build.Utilities //// no doc
 // ```
 // ## Task `AltCover.Prepare`
-// This is the instrumentation mode with `--save --inplace --defer` as default.  Associated parameters are
+// This is the instrumentation mode with `--save --inplace` as default.  Associated parameters are
 // ```
 ///<summary>
 /// <para>Description of the `AltCover` command</para>
@@ -146,9 +146,9 @@ type Prepare =
     ///</summary>
     member SourceLink : bool with get, set
     ///<summary>
-    /// Corresponds to command line option `--defer`
+    /// Corresponds to command line option `--eager`
     ///</summary>
-    member Defer : bool with get, set
+    member Eager : bool with get, set
     ///<summary>
     /// Corresponds to command line option `-l, --localSource`
     ///</summary>

AltCover.Engine/TypeSafe.fs

@@ -301,7 +301,7 @@ module TypeSafe =
       CommandLine: CommandLine
       ExposeReturnCode: Flag
       SourceLink: Flag
-      Defer: Flag
+      Eager: Flag
       LocalSource: Flag
       VisibleBranches: Flag
       ShowStatic: StaticFormat
@@ -340,7 +340,7 @@ module TypeSafe =
         CommandLine = NoCommand
         ExposeReturnCode = Set
         SourceLink = Clear
-        Defer = Clear
+        Eager = Clear
         LocalSource = Clear
         VisibleBranches = Clear
         ShowStatic = StaticFormat.Default

AltCover.Engine/TypeSafe.fsi

@@ -653,9 +653,9 @@ namespace AltCoverFake.DotNet.Testing
         ///</summary>
         SourceLink: Flag
         ///<summary>
-        /// Corresponds to command line option `--defer`
+        /// Corresponds to command line option `--eager`
         ///</summary>
-        Defer: Flag
+        Eager: Flag
         ///<summary>
         /// Corresponds to command line option `-l, --localSource`
         ///</summary>

AltCover.Engine/Visitor.fs

@@ -313,12 +313,12 @@ module internal CoverageParameters =
     |> int
 
   let internal sourcelink = ref false // ddFlag
-  let internal defer = ref false
+  let internal eager = ref false
   let internal trivia = ref false
   let internal portable = ref false
 
-  let internal deferOpCode () =
-    if defer.Value then
+  let internal eagerOpCode () =
+    if eager.Value then
       OpCodes.Ldc_I4_1
     else
       OpCodes.Ldc_I4_0

AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs

@@ -117,7 +117,7 @@ module AltCoverCommand =
           CommandLine = args |> toSeq
           ExposeReturnCode = a.ExposeReturnCode
           SourceLink = a.SourceLink
-          Defer = a.Defer
+          Eager = a.Eager
           LocalSource = a.LocalSource
           VisibleBranches = a.VisibleBranches
           ShowStatic = a.ShowStatic

AltCover.Monitor/Monitor.cs

@@ -214,7 +214,7 @@ internal static PointCount CountVisitPoints(XmlDocument doc)
     /// </summary>
     /// <param name="totals">The visited point counts if running under AltCover coverage</param>
     /// <returns>True if running under AltCover coverage</returns>
-    /// <remarks>Current implementation requires `dotnet test`, or other command-line testing with `--defer` set, in which the cumulative visit numbers are available, rather than everything having been dumped to file instead.</remarks>
+    /// <remarks>Current implementation requires `dotnet test`, or other command-line testing with `--eager` NOT set, in which the cumulative visit numbers are available, rather than everything having been dumped to file instead.</remarks>
     public static bool TryGetVisitTotals(out PointCount totals)
     {
       var counter = TypeInstance("Counter");

AltCover.PowerShell/Command.fs

@@ -558,13 +558,13 @@ type InvokeAltCoverCommand() =
   member val SourceLink: SwitchParameter = SwitchParameter(false) with get, set
 
   /// <summary>
-  /// <para type="description">Defers writing runner-mode coverage data until process exit.</para>
+  /// <para type="description">Write runner-mode coverage data immediately.</para>
   /// </summary>
   [<Parameter(ParameterSetName = "Instrument",
               Mandatory = false,
               ValueFromPipeline = false,
               ValueFromPipelineByPropertyName = false)>]
-  member val Defer: SwitchParameter = SwitchParameter(false) with get, set
+  member val Eager: SwitchParameter = SwitchParameter(false) with get, set
 
   /// <summary>
   /// <para type="description">Don't instrument code for which the source file is not present.</para>
@@ -717,7 +717,7 @@ type InvokeAltCoverCommand() =
         CommandLine = self.CommandLine
         ExposeReturnCode = not self.DropReturnCode.IsPresent
         SourceLink = self.SourceLink.IsPresent
-        Defer = self.Defer.IsPresent
+        Eager = self.Eager.IsPresent
         LocalSource = self.LocalSource.IsPresent
         VisibleBranches = self.VisibleBranches.IsPresent
         ShowStatic = showStatic.[self.ShowStatic |> int]

AltCover.Recorder/Recorder.cs

@@ -53,10 +53,10 @@ internal static string CanonicalPath(string path)
     /// Gets whether to defer output until process exit
     /// This property's IL code is modified to store the actual value
     /// </summary>
-    public static bool Defer
+    public static bool Eager
     {
       [MethodImpl(MethodImplOptions.NoInlining)]
-      get { return false; }
+      get { return true; }
     }
 
     /// <summary>
@@ -688,7 +688,7 @@ internal static void VisitImpl(string moduleId, int hitPointId, Track context)
           (Sample == Sampling.All
            || TakeSample(Sample, moduleId, hitPointId, context))
         {
-          if (Defer || supervision || !Trace.IsConnected)
+          if (!Eager || supervision || !Trace.IsConnected)
           {
             AddVisit(moduleId, hitPointId, context);
           }

AltCover.Recorder/Recorder.fs

@@ -40,7 +40,7 @@ module Instance =
   /// This property's IL code is modified to store the actual value
   /// </summary>
   [<MethodImplAttribute(MethodImplOptions.NoInlining)>]
-  let Defer = false
+  let Eager = false
 
   /// <summary>
   /// Gets the style of the associated report
@@ -423,7 +423,7 @@ module Instance =
          || takeSample Sample moduleId hitPointId context)
       then
         let adder =
-          if Defer || supervision || (trace.IsConnected |> not) then
+          if !Eager || supervision || (trace.IsConnected |> not) then
             addVisit
           else
             traceVisit

AltCover.Tests/AltCover.Usage.txt

@@ -94,8 +94,8 @@
                                from a launched process.
       --sourcelink           Optional: Display sourcelink URLs rather than file
                                paths if present.
-      --defer                Optional, defers writing runner-mode coverage data
-                               until process exit.
+      --eager                Optional, writes runner-mode coverage data
+                               immediately.
   -v, --visibleBranches      Optional: Hide complex internal IL branching
                                implementation details in switch/match
                                constructs, and just show what the source level

AltCover.Tests/Expecto.fs

@@ -814,9 +814,9 @@ module ExpectoTestManifest =
        Tests.AltCoverTests3.ParsingDropGivesDrop, "Tests3.ParsingDropGivesDrop"
        Tests.AltCoverTests3.ParsingMultipleDropGivesFailure,
        "Tests3.ParsingMultipleDropGivesFailure"
-       Tests.AltCoverTests3.ParsingDeferWorks, "Tests3.ParsingDeferWorks"
-       Tests.AltCoverTests3.ParsingMultipleDeferGivesFailure,
-       "Tests3.ParsingMultipleDeferGivesFailure"
+       Tests.AltCoverTests3.ParsingEagerWorks, "Tests3.ParsingEagerWorks"
+       Tests.AltCoverTests3.ParsingMultipleEagerGivesFailure,
+       "Tests3.ParsingMultipleEagerGivesFailure"
        Tests.AltCoverTests3.ParsingStaticGivesStatic, "Tests3.ParsingStaticGivesStatic"
        Tests.AltCoverTests3.ParsingStaticPlusGivesStatic,
        "Tests3.ParsingStaticPlusGivesStatic"

AltCover.Tests/Tests.fs

@@ -3332,8 +3332,8 @@ module AltCoverTests =
         "GetOperandType"
         "#ctor"
         ".cctor"
-        "get_Defer"
-        "set_Defer"
+        "get_Eager"
+        "set_Eager"
         "get_Property"
         "set_Property"
         "get_ReportFile"
@@ -3387,8 +3387,8 @@ module AltCoverTests =
         "System.Int32 AltCover.Sample3.Class3.GetOperandType(Mono.Cecil.Cil.Instruction)"
         "System.Void AltCover.Sample3.Class3.#ctor()"
         "System.Void AltCover.Sample3.Class3..cctor()"
-        "System.Boolean AltCover.Sample3.Class3+Class4.get_Defer()"
-        "System.Void AltCover.Sample3.Class3+Class4.set_Defer(System.Boolean)"
+        "System.Boolean AltCover.Sample3.Class3+Class4.get_Eager()"
+        "System.Void AltCover.Sample3.Class3+Class4.set_Eager(System.Boolean)"
         "AltCover.Sample3.Class1 AltCover.Sample3.Class3+Class4.get_Property()"
         "System.Void AltCover.Sample3.Class3+Class4.set_Property(AltCover.Sample3.Class1)"
         "System.String AltCover.Sample3.Class3+Class4.get_ReportFile()"