diff --git a/AltCover.Cake/Options.cs b/AltCover.Cake/Options.cs index b67d8414..5dcf0508 100644 --- a/AltCover.Cake/Options.cs +++ b/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"); /// /// Corresponds to command line option `-l, --localSource` diff --git a/AltCover.DotNet/Options.fs b/AltCover.DotNet/Options.fs index 7e489876..c8c9e5df 100644 --- a/AltCover.DotNet/Options.fs +++ b/AltCover.DotNet/Options.fs @@ -117,7 +117,7 @@ module Options = member val CommandLine = Seq.empty 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 = diff --git a/AltCover.Engine/Abstract.fs b/AltCover.Engine/Abstract.fs index fdfff30b..edccf616 100644 --- a/AltCover.Engine/Abstract.fs +++ b/AltCover.Engine/Abstract.fs @@ -238,9 +238,9 @@ module Abstract = /// abstract member SourceLink : bool with get /// - /// Corresponds to command line option `--defer` + /// Corresponds to command line option `--eager` /// - abstract member Defer : bool with get + abstract member Eager : bool with get /// /// Corresponds to command line option `-l, --localSource` /// diff --git a/AltCover.Engine/AltCover.fs b/AltCover.Engine/AltCover.fs index 6e44ab64..317c8b94 100644 --- a/AltCover.Engine/AltCover.fs +++ b/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 = diff --git a/AltCover.Engine/AltCover.fsi b/AltCover.Engine/AltCover.fsi index 64bed3b9..cff2ea50 100644 --- a/AltCover.Engine/AltCover.fsi +++ b/AltCover.Engine/AltCover.fsi @@ -285,9 +285,9 @@ namespace AltCoverFake.DotNet.Testing /// member SourceLink : bool /// - /// Corresponds to command line option `--defer` + /// Corresponds to command line option `--eager` /// - member Defer : bool + member Eager : bool /// /// Corresponds to command line option `-l, --localSource` /// diff --git a/AltCover.Engine/Args.fs b/AltCover.Engine/Args.fs index 1b129c35..bc6b2805 100644 --- a/AltCover.Engine/Args.fs +++ b/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) diff --git a/AltCover.Engine/Instrument.fs b/AltCover.Engine/Instrument.fs index c2171319..86f3086c 100644 --- a/AltCover.Engine/Instrument.fs +++ b/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() diff --git a/AltCover.Engine/Main.fs b/AltCover.Engine/Main.fs index 3aeb370e..a2b7abbe 100644 --- a/AltCover.Engine/Main.fs +++ b/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 -> diff --git a/AltCover.Engine/Primitive.fs b/AltCover.Engine/Primitive.fs index 66feb216..2f4b06d0 100644 --- a/AltCover.Engine/Primitive.fs +++ b/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 = "-" diff --git a/AltCover.Engine/Primitive.fsi b/AltCover.Engine/Primitive.fsi index 9c5cb92e..b1b94a87 100644 --- a/AltCover.Engine/Primitive.fsi +++ b/AltCover.Engine/Primitive.fsi @@ -223,9 +223,9 @@ namespace AltCoverFake.DotNet.Testing /// SourceLink: bool /// - /// Corresponds to command line option `--defer` + /// Corresponds to command line option `--eager` /// - Defer: bool + Eager: bool /// /// Corresponds to command line option `-l, --localSource` /// diff --git a/AltCover.Engine/Strings.eo.resx b/AltCover.Engine/Strings.eo.resx index 3ed9036b..349e964d 100644 --- a/AltCover.Engine/Strings.eo.resx +++ b/AltCover.Engine/Strings.eo.resx @@ -155,7 +155,7 @@ Vidu ankaŭ '--inplace' Krei dosierujon {0} - 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] [-- ] [...] + 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'. - - Laŭvola, transdono de skriba kurant-reĝimaj priraportado ĝis elira procezo. + + Laŭvola, tuj skribas priraportajn datumojn pri kuristo. {0} estis jam specifita por {1} diff --git a/AltCover.Engine/Strings.resx b/AltCover.Engine/Strings.resx index ae2534d2..78d079ec 100644 --- a/AltCover.Engine/Strings.resx +++ b/AltCover.Engine/Strings.resx @@ -155,7 +155,7 @@ See also '--inplace' Creating folder {0} - 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] [-- ] [...] + 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'. - - Optional, defers writing runner-mode coverage data until process exit. + + Optional, writes runner-mode coverage data immediately. {0} was already specified for {1} diff --git a/AltCover.Engine/Tasks.fs b/AltCover.Engine/Tasks.fs index 5f76bb11..864c230b 100644 --- a/AltCover.Engine/Tasks.fs +++ b/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 diff --git a/AltCover.Engine/Tasks.fsi b/AltCover.Engine/Tasks.fsi index e6041f29..d28b5315 100644 --- a/AltCover.Engine/Tasks.fsi +++ b/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 // ``` /// /// Description of the `AltCover` command @@ -146,9 +146,9 @@ type Prepare = /// member SourceLink : bool with get, set /// - /// Corresponds to command line option `--defer` + /// Corresponds to command line option `--eager` /// - member Defer : bool with get, set + member Eager : bool with get, set /// /// Corresponds to command line option `-l, --localSource` /// diff --git a/AltCover.Engine/TypeSafe.fs b/AltCover.Engine/TypeSafe.fs index 34241dc5..14a95c20 100644 --- a/AltCover.Engine/TypeSafe.fs +++ b/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 diff --git a/AltCover.Engine/TypeSafe.fsi b/AltCover.Engine/TypeSafe.fsi index b30ac438..1d78fa1d 100644 --- a/AltCover.Engine/TypeSafe.fsi +++ b/AltCover.Engine/TypeSafe.fsi @@ -653,9 +653,9 @@ namespace AltCoverFake.DotNet.Testing /// SourceLink: Flag /// - /// Corresponds to command line option `--defer` + /// Corresponds to command line option `--eager` /// - Defer: Flag + Eager: Flag /// /// Corresponds to command line option `-l, --localSource` /// diff --git a/AltCover.Engine/Visitor.fs b/AltCover.Engine/Visitor.fs index ce11fddf..eba903b5 100644 --- a/AltCover.Engine/Visitor.fs +++ b/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 diff --git a/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs b/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs index e5b783d7..49bbcb28 100644 --- a/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs +++ b/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 diff --git a/AltCover.Monitor/Monitor.cs b/AltCover.Monitor/Monitor.cs index bbf4bc0e..85c472ea 100644 --- a/AltCover.Monitor/Monitor.cs +++ b/AltCover.Monitor/Monitor.cs @@ -214,7 +214,7 @@ internal static PointCount CountVisitPoints(XmlDocument doc) /// /// The visited point counts if running under AltCover coverage /// True if running under AltCover coverage - /// 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. + /// 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. public static bool TryGetVisitTotals(out PointCount totals) { var counter = TypeInstance("Counter"); diff --git a/AltCover.PowerShell/Command.fs b/AltCover.PowerShell/Command.fs index 558368eb..9f3e354f 100644 --- a/AltCover.PowerShell/Command.fs +++ b/AltCover.PowerShell/Command.fs @@ -558,13 +558,13 @@ type InvokeAltCoverCommand() = member val SourceLink: SwitchParameter = SwitchParameter(false) with get, set /// - /// Defers writing runner-mode coverage data until process exit. + /// Write runner-mode coverage data immediately. /// [] - member val Defer: SwitchParameter = SwitchParameter(false) with get, set + member val Eager: SwitchParameter = SwitchParameter(false) with get, set /// /// Don't instrument code for which the source file is not present. @@ -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] diff --git a/AltCover.Recorder/Recorder.cs b/AltCover.Recorder/Recorder.cs index d7c35a4d..c4ae7775 100644 --- a/AltCover.Recorder/Recorder.cs +++ b/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 /// - public static bool Defer + public static bool Eager { [MethodImpl(MethodImplOptions.NoInlining)] - get { return false; } + get { return true; } } /// @@ -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); } diff --git a/AltCover.Recorder/Recorder.fs b/AltCover.Recorder/Recorder.fs index 88d97573..6a0fcbd5 100644 --- a/AltCover.Recorder/Recorder.fs +++ b/AltCover.Recorder/Recorder.fs @@ -40,7 +40,7 @@ module Instance = /// This property's IL code is modified to store the actual value /// [] - let Defer = false + let Eager = false /// /// 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 diff --git a/AltCover.Tests/AltCover.Usage.txt b/AltCover.Tests/AltCover.Usage.txt index cb07e794..db551f1f 100644 --- a/AltCover.Tests/AltCover.Usage.txt +++ b/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 diff --git a/AltCover.Tests/Expecto.fs b/AltCover.Tests/Expecto.fs index 79b726e9..e3d34f05 100644 --- a/AltCover.Tests/Expecto.fs +++ b/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" diff --git a/AltCover.Tests/Tests.fs b/AltCover.Tests/Tests.fs index 24e4e463..e29c74fd 100644 --- a/AltCover.Tests/Tests.fs +++ b/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()" diff --git a/AltCover.Tests/Tests2.fs b/AltCover.Tests/Tests2.fs index 6f3dc66e..6578a354 100644 --- a/AltCover.Tests/Tests2.fs +++ b/AltCover.Tests/Tests2.fs @@ -892,7 +892,7 @@ module AltCoverTests2 = let pathGetterDef = ``module``.MainModule.GetTypes() |> Seq.collect _.Methods - |> Seq.find _.Name.Equals("get_Defer") + |> Seq.find _.Name.Equals("get_Eager") let body = pathGetterDef.Body let worker = body.GetILProcessor() @@ -940,7 +940,7 @@ module AltCoverTests2 = (* was IL_0000: ldarg.0 - IL_0001: ldfld bool Sample31.Class3/Class4::'k__BackingField' + IL_0001: ldfld bool Sample31.Class3/Class4::'k__BackingField' IL_0006: stloc.0 IL_0007: br IL_000c diff --git a/AltCover.Tests/Tests3.fs b/AltCover.Tests/Tests3.fs index 565810e8..73eb7d72 100644 --- a/AltCover.Tests/Tests3.fs +++ b/AltCover.Tests/Tests3.fs @@ -223,7 +223,7 @@ module AltCoverTests3 = |> Seq.sort |> Seq.toList - // dotnet test loses commandline, defer, exposereturncode, save + // dotnet test loses commandline, eager, exposereturncode, save // N/A, fixed, N/A, fixed // inplace is explicitly hard-coded testWithFallback @@ -2680,12 +2680,12 @@ module AltCoverTests3 = CommandLine.dropReturnCode.Value <- false [] - let ParsingDeferWorks () = + let ParsingEagerWorks () = Main.init () try let options = Main.I.declareOptions () - let input = [| "--defer" |] + let input = [| "--eager" |] let parse = CommandLine.parseCommandLine input options @@ -2695,18 +2695,18 @@ module AltCoverTests3 = Assert.That(y, Is.SameAs options) Assert.That(x, Is.Empty) - Assert.That(CoverageParameters.defer.Value) - Assert.That(CoverageParameters.deferOpCode (), Is.EqualTo OpCodes.Ldc_I4_1) + Assert.That(CoverageParameters.eager.Value) + Assert.That(CoverageParameters.eagerOpCode (), Is.EqualTo OpCodes.Ldc_I4_1) finally - CoverageParameters.defer.Value <- false + CoverageParameters.eager.Value <- false [] - let ParsingMultipleDeferGivesFailure () = + let ParsingMultipleEagerGivesFailure () = Main.init () try let options = Main.I.declareOptions () - let input = [| "--defer"; "--defer" |] + let input = [| "--eager"; "--eager" |] let parse = CommandLine.parseCommandLine input options @@ -2718,11 +2718,11 @@ module AltCoverTests3 = Assert.That( CommandLine.error |> Seq.head, - Is.EqualTo "--defer : specify this only once" + Is.EqualTo "--eager : specify this only once" ) finally - CoverageParameters.defer.Value <- false + CoverageParameters.eager.Value <- false [] let ParsingQuietWorks () = @@ -3987,7 +3987,7 @@ module AltCoverTests3 = [ "--reportFormat" "OpenCover" "--save" - "--defer" ] + "--eager" ] ) finally Main.effectiveMain <- save @@ -4045,7 +4045,7 @@ module AltCoverTests3 = [ "--reportFormat" "OpenCover" "--save" - "--defer" ] + "--eager" ] @ q ), level @@ -4095,7 +4095,7 @@ module AltCoverTests3 = "--reportFormat" "Ncover" "--save" - "--defer" + "--eager" "--" "testing" "1" @@ -4138,7 +4138,7 @@ module AltCoverTests3 = "--reportFormat" "ncover" "--save" - "--defer" + "--eager" "--" "testing" "1" diff --git a/Build/prepareDocumentation.ps1 b/Build/prepareDocumentation.ps1 index 9428b979..13b984a9 100644 --- a/Build/prepareDocumentation.ps1 +++ b/Build/prepareDocumentation.ps1 @@ -348,8 +348,6 @@ or, for the global tool only * valid arguments for ``--teamcity`` are ``B``, ``R``, ``+B``, ``+R`` or nothing at all (same as ``B``). The letter indicates which symbol to use in the TeamCity format for branch coverage (``B`` is for ``Block``, which by experiment did show in the build report, and ``R`` is for ``bRanch`` which is documented, but did not show when I tried it), the optional ``+`` indicates that the OpenCover summary should also be emitted. -* valid arguments for ``--defer`` are ``+``, ``-`` or nothing at all (same as ``+``). ``+`` keeps coverage data in memory until process exit, ``-`` writes promptly to file in runner mode, i.e. acts as in previous releases since 1.6). - * ``ImportModule`` will print a string on Mono/non-Windows, but Windows PowerShell won't be there to make use of it. #### ``-e`` vs ``-s`` : what gives? diff --git a/Build/targets.fs b/Build/targets.fs index 9054eca1..3667713f 100644 --- a/Build/targets.fs +++ b/Build/targets.fs @@ -2445,7 +2445,7 @@ module Targets = OutputDirectories = [| output |] StrongNameKey = keyfile ReportFormat = "NCover" - Defer = true + Eager = true InPlace = false Save = false } |> AltCoverFilter diff --git a/Samples/Sample3/Class1.cs b/Samples/Sample3/Class1.cs index 6547b79a..ccc300d9 100644 --- a/Samples/Sample3/Class1.cs +++ b/Samples/Sample3/Class1.cs @@ -51,7 +51,7 @@ public List ToList(T item) public int CoverageFormat { get; set; } public int Sample { get; set; } public Int64 Timer { get; set; } - public bool Defer { get; set; } + public bool Eager { get; set; } public static string[] Modules { get; set; } }