Remove unnecessary settings

si618 · Mar 11, 2024 · d61b6c9 · d61b6c9
1 parent 5787f88
commit d61b6c9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 48 deletions.
diff --git a/Benchmarks.App/BenchmarkRunner.cs b/Benchmarks.App/BenchmarkRunner.cs
@@ -11,7 +11,7 @@ public static IEnumerable<Summary> RunAndBuildSummaries()
     }
 
 
-    public static IEnumerable<Summary> RunAndBuildSummaries(ListSettings settings)
+    public static IEnumerable<Summary> RunAndBuildSummaries(BenchmarkSettings settings)
     {
         var args = settings.BuildArgs();
         var type = Reflection.GetBenchmarkTypes().First(type => type.Name == settings.Name);

diff --git a/Benchmarks.App/Commands/BenchmarkCommand.cs b/Benchmarks.App/Commands/BenchmarkCommand.cs
@@ -1,11 +1,11 @@
 namespace Benchmarks.App.Commands;
 
-internal sealed class BenchmarkCommand : Command<ListSettings>
+internal sealed class BenchmarkCommand : Command<BenchmarkSettings>
 {
     [SuppressMessage("ReSharper", "RedundantNullableFlowAttribute")]
     public override int Execute(
         [NotNull] CommandContext context,
-        [NotNull] ListSettings settings)
+        [NotNull] BenchmarkSettings settings)
     {
         if (BenchmarkRunner.IsDebugConfiguration(settings.Debug))
         {

diff --git a/Benchmarks.App/Commands/ListSettings.cs → Benchmarks.App/Commands/BenchmarkSettings.cs b/Benchmarks.App/Commands/ListSettings.cs → Benchmarks.App/Commands/BenchmarkSettings.cs
@@ -1,6 +1,6 @@
 namespace Benchmarks.App.Commands;
 
-internal sealed class ListSettings : CommandSettings
+internal sealed class BenchmarkSettings : CommandSettings
 {
     [Description("Benchmark name")]
     [CommandArgument(0, "[filter]")]
@@ -10,10 +10,6 @@ internal sealed class ListSettings : CommandSettings
     [CommandOption("--debug")]
     public bool Debug { get; init; }
 
-    [Description("BenchmarkDotNet Exporters: GitHub/StackOverflow/RPlot/CSV/JSON/HTML/XML")]
-    [CommandOption("--exporters")]
-    public string? Exporters { get; init; }
-
     public override ValidationResult Validate()
     {
         if (!Reflection.GetBenchmarkTypes().Any(type => type.Name == Name))
@@ -24,16 +20,5 @@ public override ValidationResult Validate()
         return ValidationResult.Success();
     }
 
-    public string[] BuildArgs()
-    {
-        var args = new List<string> { "--filter", $"*{Name}*" };
-
-        if (!string.IsNullOrEmpty(Exporters))
-        {
-            args.Add("--exporters");
-            args.Add(Exporters);
-        }
-
-        return [.. args];
-    }
+    public string[] BuildArgs() => ["--filter", $"*{Name}*"];
 }
diff --git a/Benchmarks.App/Commands/InfoCommand.cs b/Benchmarks.App/Commands/InfoCommand.cs
@@ -1,11 +1,11 @@
 namespace Benchmarks.App.Commands;
 
-internal sealed class InfoCommand : Command<BenchmarkRunSettings>
+internal sealed class InfoCommand : Command<BenchmarkSettings>
 {
     [SuppressMessage("ReSharper", "RedundantNullableFlowAttribute")]
     public override int Execute(
         [NotNull] CommandContext context,
-        [NotNull] BenchmarkRunSettings settings)
+        [NotNull] BenchmarkSettings settings)
     {
         ConsoleWriter.WriteHeader();
 

diff --git a/Benchmarks.App/Commands/RunSettings.cs b/Benchmarks.App/Commands/RunSettings.cs
diff --git a/Benchmarks.App/Commands/WorkflowCommand.cs b/Benchmarks.App/Commands/WorkflowCommand.cs
@@ -5,14 +5,17 @@ internal sealed class WorkflowCommand : Command
     [SuppressMessage("ReSharper", "RedundantNullableFlowAttribute")]
     public override int Execute([NotNull] CommandContext context)
     {
+        ConsoleWriter.WriteHeader();
+
         if (BenchmarkRunner.IsDebugConfiguration(true))
         {
             return 1;
         }
 
-        var settings = new ListSettings { Exporters = "json" };
+        // Exporters: GitHub/StackOverflow/RPlot/CSV/JSON/HTML/XML")]
+        var args = new[] { "--filter", $"Benchmarks*", "--exporters", "json" };
 
-        BenchmarkRunner.RunBenchmarks(Reflection.GetBenchmarkTypes().ToArray(), settings.BuildArgs());
+        BenchmarkRunner.RunBenchmarks([.. Reflection.GetBenchmarkTypes()], args);
 
         CombineBenchmarkResults();
 

diff --git a/Benchmarks.App/Menus/Selections/RunSelection.cs b/Benchmarks.App/Menus/Selections/RunSelection.cs
@@ -24,7 +24,7 @@ public override int Execute()
             return 1;
         }
 
-        var settings = new ListSettings { Name = Benchmark.Name };
+        var settings = new BenchmarkSettings { Name = Benchmark.Name };
         var summaries = BenchmarkRunner.RunAndBuildSummaries(settings);
         var builder = new SpectreReportBuilder(summaries);
         var report = builder.Build();