feat(baseline): Allow force creating fresh baseline

docs/configuration.md

@@ -491,33 +491,30 @@ Use [globbing syntax](https://en.wikipedia.org/wiki/Glob_(programming)) for wild
 
 ## Baseline
 
-### `with-baseline` <`flag`> [`:committish`]
+### `baseline` <`command`>
 
-Default: `false`  
-Command line: `--with-baseline:feat-2`  
+Default: `false`
+Command line: `dotnet stryker baseline`
 Config file: `"baseline": { }`
 
 Enabling `with-baseline` saves the mutation report to a storage location such as the filesystem. The mutation report is loaded at the start of the next mutation run. Any changed source code or unit test results in a reset of the mutants affected by the change. For unchanged mutants the previous result is reused. This feature expands on the [since](#since-flag-committish) feature by providing you with a full report after a partial mutation testrun.
 
 The report name is based on the current branch name or the [project-info.version](#project-infoversion-committish).
 
-Set the diffing target on the command line by passing a committish with the since flag.
-Set the diffing target in the config file by setting the [since target](#sincetarget-committish) option.
-
 *\* The baseline and since features are mutually exclusive. This feature implicitly enables the [since](#since-flag-committish) feature for now.*
 
-### `baseline.enabled` <`flag`>
+### `target` <`string`>
 
-Default: `null`  
-Command line: `N/A`  
-Config file: `"baseline": { "enabled": false }`
+Default: `false`
+Command line: `dotnet stryker baseline --target feat-2`
+Config file: `"baseline": { "target": "feat-2" }`
 
-Enable or disable [with-baseline](#with-baseline-flag-committish). If the enabled property is not set but the `baseline` object exists in the config file it is assumed to be enabled. Use this option to (temporarily) disable `with-baseline` without having to delete the other baseline configuration.
+Set the target on the command line by passing a committish with the baseline target option.
 
 ### `baseline.fallback-version` &lt;`string`&gt;
 
-Default: [since-target](#since-flag-committish)  
-Command line: `N/A`  
+Default: [since-target](#since-flag-committish)
+Command line: `N/A`
 Config file: `"baseline": { "fallback-version": 'develop' }`
 
 When [with-baseline](#with-baseline-flag-committish) is enabled and Stryker cannot find an existing report for the current branch the fallback version is used. When Stryker is still unable to find a baseline we will do a complete instead of partial testrun. The complete testrun will then be saved as the new baseline for the next mutation testrun.
@@ -586,7 +583,7 @@ Providing a subfolder is optional but allowed. In the case of a custom subfolder
 ### `azure-fileshare-sas` &lt;`string`&gt;
 
 Default: `null`  
-Command line: `--azure-fileshare-sas "se=2022-08-25T14%3A27Z&sp=rwdl&spr=https&sv=2021-06-08&sr=d&sdd=1&sig=XXXXXXXXXXXXX"`  
+Command line: `dotnet stryker baseline --azure-fileshare-sas "se=2022-08-25T14%3A27Z&sp=rwdl&spr=https&sv=2021-06-08&sr=d&sdd=1&sig=XXXXXXXXXXXXX"`  
 Config file: `N/A`
 
 When using the azure file storage [provider](#baselineprovider-string) you must pass credentials for the fileshare to Stryker.
@@ -600,6 +597,14 @@ Allowed permissions: `Read`, `Write`, `Create`
 
 For more information on how to configure a SAS check the [Azure documentation](https://docs.microsoft.com/en-us/azure/storage/common/storage-sas-overview).
 
+### `baseline recreate`
+
+Default: `false`
+Command line: `dotnet stryker baseline recreate`
+Config file: `N/A`
+
+Sometimes your baseline can get corrupted or out of touch with reality. In that case the baseline can be recreated using this command. This will test all mutations in your project and save the result as the new baseline.
+
 ## Troubleshooting
 
 ### `verbosity` &lt;`log-level`&gt;
@@ -619,7 +624,7 @@ All available loglevels are
 
 ### `log-to-file` &lt;`flag`&gt;
 
-Default: `false`  
+Default: `false`
 Command line: `[-L|--log-to-file]`  
 Config file: `N/A`
 

src/Stryker.CLI/Stryker.CLI.UnitTest/ConfigBuilderTests.cs

@@ -98,7 +98,7 @@ private static Mock<IStrykerInputs> GetMockInputs()
             inputs.Setup(x => x.MutateInput).Returns(new MutateInput());
             inputs.Setup(x => x.MutationLevelInput).Returns(new MutationLevelInput());
             inputs.Setup(x => x.SinceInput).Returns(new SinceInput());
-            inputs.Setup(x => x.WithBaselineInput).Returns(new WithBaselineInput());
+            inputs.Setup(x => x.BaselineEnabledInput).Returns(new BaselineEnabledInput());
             inputs.Setup(x => x.OpenReportInput).Returns(new OpenReportInput());
             inputs.Setup(x => x.ReportersInput).Returns(new ReportersInput());
             inputs.Setup(x => x.ProjectVersionInput).Returns(new ProjectVersionInput());

src/Stryker.CLI/Stryker.CLI.UnitTest/StrykerCLITests.cs

@@ -59,7 +59,7 @@ public void ShouldDisplayInfoOnHelp()
 
                 var expected = @"Stryker: Stryker mutator for .Net
 
-Stryker mutator for .Net
+The mutation test framework for .Net
 
 Usage: Stryker [command] [options]
 
@@ -413,7 +413,30 @@ public void ShouldSupplyWithBaselineWhenPassed(params string[] argName)
 
             _strykerRunnerMock.VerifyAll();
 
-            _inputs.WithBaselineInput.SuppliedInput.Value.ShouldBeTrue();
+            _inputs.BaselineEnabledInput.SuppliedInput.Value.ShouldBeTrue();
+        }
+
+        [Theory]
+        [InlineData("baseline")]
+        public void ShouldSupplyWithBaselineWhenCommandPassed(params string[] argName)
+        {
+            _target.Run(argName);
+
+            _strykerRunnerMock.VerifyAll();
+
+            _inputs.BaselineEnabledInput.SuppliedInput.Value.ShouldBeTrue();
+        }
+
+        [Theory]
+        [InlineData("baseline", "recreate")]
+        public void ShouldSetBaselineRecreateWhenCommandPassed(params string[] argName)
+        {
+            _target.Run(argName);
+
+            _strykerRunnerMock.VerifyAll();
+
+            _inputs.BaselineEnabledInput.SuppliedInput.Value.ShouldBeTrue();
+            _inputs.BaselineRecreateEnabledInput.SuppliedInput.ShouldBeTrue();
         }
 
         [Theory]

src/Stryker.CLI/Stryker.CLI.UnitTest/packages.lock.json

@@ -1924,4 +1924,4 @@
       }
     }
   }
-}
+}

src/Stryker.CLI/Stryker.CLI/CommandLineConfig/CommandLineConfigReader.cs

@@ -68,6 +68,35 @@ public void RegisterInitCommand(CommandLineApplication app, IFileSystem fileSyst
             });
         }
 
+        public void RegisterBaselineCommand(CommandLineApplication app, IStrykerInputs inputs, string[] args, StrykerCli strykerCli)
+        {
+            app.Command("baseline", baselineCmd =>
+            {
+                RegisterCliInputs(baselineCmd);
+
+                baselineCmd.OnExecute(() =>
+                {
+                    inputs.BaselineEnabledInput.SuppliedInput = true;
+                    baselineCmd.Description = "Starts a stryker run based on the results of a previous run.";
+                    return strykerCli.StartApp(inputs, args, app, this);
+                });
+
+                baselineCmd.Command("recreate", createCmd =>
+                {
+                    RegisterCliInputs(createCmd);
+
+                    createCmd.OnExecute(() =>
+                    {
+                        inputs.BaselineEnabledInput.SuppliedInput = true;
+                        createCmd.Description = "Creates a new baseline by doing a full stryker run";
+                        // Enable recreate
+                        inputs.BaselineRecreateEnabledInput.SuppliedInput = true;
+                        return strykerCli.StartApp(inputs, args, app, this);
+                    });
+                });
+            });
+        }
+
         public CommandOption GetConfigFileOption(string[] args, CommandLineApplication app)
         {
             var commands = app.Parse(args);
@@ -146,8 +175,8 @@ private static void HandleSingleOrNoValue(IInput strykerInput, CommandOption cli
                     inputs.SinceTargetInput.SuppliedInput = cliInput.Value();
                     break;
 
-                case WithBaselineInput withBaselineInput:
-                    withBaselineInput.SuppliedInput = true;
+                case BaselineEnabledInput baselineEnabledInput:
+                    baselineEnabledInput.SuppliedInput = true;
                     inputs.SinceTargetInput.SuppliedInput = cliInput.Value();
                     break;
 
@@ -182,7 +211,8 @@ private void PrepareCliOptions(IStrykerInputs inputs)
             AddCliInput(inputs.MutateInput, "mutate", "m", optionType: CommandOptionType.MultipleValue, argumentHint: "glob-pattern", category: InputCategory.Mutation);
             AddCliInput(inputs.MutationLevelInput, "mutation-level", "l", category: InputCategory.Mutation);
             AddCliInput(inputs.SinceInput, "since", "", optionType: CommandOptionType.SingleOrNoValue, argumentHint: "committish", category: InputCategory.Mutation);
-            AddCliInput(inputs.WithBaselineInput, "with-baseline", "", optionType: CommandOptionType.SingleOrNoValue, argumentHint: "committish", category: InputCategory.Mutation);
+            AddCliInput(inputs.BaselineEnabledInput, "with-baseline", "", optionType: CommandOptionType.SingleOrNoValue, argumentHint: "committish", category: InputCategory.Mutation);
+            AddCliInput(inputs.BaselineTargetInput, "target", "", argumentHint: "committish", category: InputCategory.Mutation);
             // Category: Reporting
             AddCliInput(inputs.OpenReportInput, "open-report", "o", CommandOptionType.SingleOrNoValue, argumentHint: "report-type", category: InputCategory.Reporting);
             AddCliInput(inputs.ReportersInput, "reporter", "r", optionType: CommandOptionType.MultipleValue, category: InputCategory.Reporting);
@@ -195,7 +225,7 @@ private void PrepareCliOptions(IStrykerInputs inputs)
             AddCliInput(inputs.DevModeInput, "dev-mode", null, optionType: CommandOptionType.NoValue, category: InputCategory.Misc);
         }
 
-        private void RegisterCliInput(CommandLineApplication app, CliInput option)
+        public void RegisterCliInput(CommandLineApplication app, CliInput option)
         {
             var argumentHint = option.OptionType switch
             {
@@ -230,7 +260,7 @@ private CliInput AddCliOnlyInput(string argumentName, string argumentShortName,
             return cliOption;
         }
 
-        private void AddCliInput(IInput input, string argumentName, string argumentShortName,
+        public void AddCliInput(IInput input, string argumentName, string argumentShortName,
             CommandOptionType optionType = CommandOptionType.SingleValue, InputCategory category = InputCategory.Generic, string argumentHint = null)
         {
             var cliOption = new CliInput

src/Stryker.CLI/Stryker.CLI/CommandLineConfig/GroupedHelpTextGenerator.cs

@@ -8,7 +8,7 @@
 
 namespace Stryker.CLI
 {
-    [ExcludeFromCodeCoverage] // Not worth the effort to test
+    [ExcludeFromCodeCoverage(Justification = "Not worth the effort to test")]
     internal class GroupedHelpTextGenerator : DefaultHelpTextGenerator
     {
         protected override void GenerateOptions(CommandLineApplication application, TextWriter output, IReadOnlyList<CommandOption> visibleOptions, int firstColumnWidth)

src/Stryker.CLI/Stryker.CLI/FileBasedInput.cs

@@ -112,9 +112,6 @@ public class Since : IExtraData
 
     public class Baseline : IExtraData
     {
-        [JsonPropertyName("enabled")]
-        public bool? Enabled { get; init; }
-
         [JsonPropertyName("provider")]
         public string Provider { get; init; }
 

src/Stryker.CLI/Stryker.CLI/FileConfigReader.cs

@@ -33,15 +33,11 @@ public static void DeserializeConfig(string configFilePath, IStrykerInputs input
 
             if (config.Baseline is not null)
             {
-                // Baseline is implicitly enabled when the object exists in the file config
-                inputs.WithBaselineInput.SuppliedInput = config.Baseline.Enabled ?? true;
-
                 inputs.BaselineProviderInput.SuppliedInput = config.Baseline.Provider;
                 inputs.FallbackVersionInput.SuppliedInput = config.Baseline.FallbackVersion;
                 inputs.AzureFileStorageUrlInput.SuppliedInput = config.Baseline.AzureFileShareUrl;
             }
 
-
             inputs.CoverageAnalysisInput.SuppliedInput = config.CoverageAnalysis;
             inputs.DisableBailInput.SuppliedInput = config.DisableBail;
             inputs.DisableMixMutantsInput.SuppliedInput = config.DisableMixMutants;

src/Stryker.CLI/Stryker.CLI/FileConfigWriter.cs

@@ -20,7 +20,6 @@ private static FileBasedInputOuter CreateConfig(IStrykerInputs inputs)
             {
                 Baseline = new Baseline
                 {
-                    Enabled = inputs.WithBaselineInput.SuppliedInput ?? inputs.WithBaselineInput.Default,
                     Provider = inputs.BaselineProviderInput.SuppliedInput ?? inputs.BaselineProviderInput.Default,
                     FallbackVersion = inputs.FallbackVersionInput.SuppliedInput ?? inputs.FallbackVersionInput.Default,
                     AzureFileShareUrl = inputs.AzureFileStorageUrlInput.SuppliedInput ?? inputs.AzureFileStorageUrlInput.Default,

src/Stryker.CLI/Stryker.CLI/StrykerCLI.cs

@@ -50,7 +50,7 @@ public int Run(string[] args)
             {
                 Name = "Stryker",
                 FullName = "Stryker: Stryker mutator for .Net",
-                Description = "Stryker mutator for .Net",
+                Description = "The mutation test framework for .Net",
                 ExtendedHelpText = "Welcome to Stryker for .Net! Run dotnet stryker to kick off a mutation test run",
                 HelpTextGenerator = new GroupedHelpTextGenerator()
             };
@@ -61,18 +61,11 @@ public int Run(string[] args)
 
             cmdConfigReader.RegisterCommandLineOptions(app, inputs);
             cmdConfigReader.RegisterInitCommand(app, _fileSystem, inputs, args);
+            cmdConfigReader.RegisterBaselineCommand(app, inputs, args, this);
 
             app.OnExecute(() =>
             {
-                // app started
-                PrintStrykerASCIIName();
-
-                _configReader.Build(inputs, args, app, cmdConfigReader);
-                _loggingInitializer.SetupLogOptions(inputs);
-
-                PrintStrykerVersionInformationAsync();
-                RunStryker(inputs);
-                return ExitCode;
+                return StartApp(inputs, args, app, cmdConfigReader);
             });
 
             try
@@ -87,16 +80,29 @@ public int Run(string[] args)
                 {
                     Console.Error.WriteLine();
                     Console.Error.WriteLine("Did you mean this?");
-                    foreach(var match in uex.NearestMatches)
+                    foreach (var nearMatch in uex.NearestMatches)
                     {
-                        Console.Error.WriteLine("    " + match);
+                        Console.Error.WriteLine("    " + nearMatch);
                     }
                 }
 
                 return ExitCodes.OtherError;
             }
         }
 
+        internal int StartApp(IStrykerInputs inputs, string[] args, CommandLineApplication app, CommandLineConfigReader cmdConfigReader)
+        {
+            // app started
+            PrintStrykerASCIIName();
+
+            _configReader.Build(inputs, args, app, cmdConfigReader);
+            _loggingInitializer.SetupLogOptions(inputs);
+
+            PrintStrykerVersionInformationAsync();
+            RunStryker(inputs);
+            return ExitCode;
+        }
+
         private void RunStryker(IStrykerInputs inputs)
         {
             var result = _stryker.RunMutationTest(inputs, ApplicationLogging.LoggerFactory);

src/Stryker.Core/Stryker.Core.UnitTest/MutantFilters/BaselineMutantFilterTests.cs

@@ -46,7 +46,7 @@ public void GetBaseline_UsesBaselineFallbackVersion_WhenReportForCurrentVersionN
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 DashboardApiKey = "Acces_Token",
                 ProjectName = "github.com/JohnDoe/project",
                 ProjectVersion = "version/human/readable",
@@ -83,7 +83,7 @@ public void GetBaseline_UsesFallbackVersion_WhenBaselineFallbackVersionNotFound(
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 DashboardApiKey = "Acces_Token",
                 ProjectName = "github.com/JohnDoe/project",
                 ProjectVersion = "version/human/readable",
@@ -121,7 +121,7 @@ public void GetBaseline_UsesCurrentVersionReport_IfReportExists()
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 DashboardApiKey = "Access_Token",
                 ProjectName = "github.com/JohnDoe/project",
                 ProjectVersion = "version/human/readable",
@@ -155,7 +155,7 @@ public void FilterMutantsReturnAllMutantsWhenCompareToDashboardEnabledAndBaselin
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 ProjectVersion = "version",
             };
 
@@ -187,7 +187,7 @@ public void FilterMutants_WhenMutantSourceCodeIsNull_MutantIsReturned()
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 ProjectVersion = "version",
             };
             var file = new CsharpFileLeaf
@@ -239,7 +239,7 @@ public void FilterMutants_WhenMutantMatchesSourceCode_StatusIsSetToJsonMutant()
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 ProjectVersion = "version",
             };
             var file = new CsharpFileLeaf
@@ -302,7 +302,7 @@ public void FilterMutants_WhenMultipleMatchingMutants_ResultIsSetToNotRun()
 
             var options = new StrykerOptions()
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 ProjectVersion = "version",
             };
             var file = new CsharpFileLeaf
@@ -375,7 +375,7 @@ public void ShouldNotUpdateMutantsWithBaselineIfFileNotInBaseline()
 
             var options = new StrykerOptions
             {
-                WithBaseline = true,
+                BaselineEnabled = true,
                 ProjectVersion = "version"
             };