simplify the design (#2268)

Author: adamsitnik

tests/BenchmarkDotNet.Tests/Columns/RatioColumnTest.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Xml.Linq;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Reports;
 using BenchmarkDotNet.Tests.Mocks;
@@ -21,13 +22,12 @@ public RatioColumnTest(ITestOutputHelper output)
         [Fact]
         public void RatioColumnTest01()
         {
-            var measurer = MockMeasurer.Create(name => name switch
+            var summary = MockRunner.Run<BenchmarkClass>(output, name => name switch
             {
                 "Foo" => new double[] { 2, 2, 2 },
                 "Bar" => new double[] { 4, 4, 4 },
                 _ => throw new InvalidOperationException()
             });
-            var summary = MockRunner.Run<BenchmarkClass>(output, measurer);
 
             var ratioColumn = summary.GetColumns().FirstOrDefault(column => column.ColumnName == "Ratio");
             Assert.NotNull(ratioColumn);

tests/BenchmarkDotNet.Tests/Mocks/MockRunner.cs

@@ -1,17 +1,26 @@
 using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Exporters;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Reports;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Tests.Mocks.Toolchain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Xunit.Abstractions;
 
 namespace BenchmarkDotNet.Tests.Mocks
 {
     public static class MockRunner
     {
-        public static Summary Run<T>(ITestOutputHelper output, IMockMeasurer measurer)
+        public static Summary Run<T>(ITestOutputHelper output, Func<string, double[]> measurer)
+            => Run<T>(output, benchmarkCase => measurer(benchmarkCase.Descriptor.WorkloadMethod.Name)
+                        .Select((value, i) => new Measurement(1, IterationMode.Workload, IterationStage.Result, i, 1, value))
+                        .ToList());
+
+        public static Summary Run<T>(ITestOutputHelper output, Func<BenchmarkCase, List<Measurement>> measurer)
         {
             var job = new Job("MockJob")
             {

tests/BenchmarkDotNet.Tests/Mocks/Toolchain/IMockMeasurer.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using BenchmarkDotNet.Characteristics;
 using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Reports;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains;
 using BenchmarkDotNet.Toolchains.Parameters;
@@ -12,14 +14,13 @@ namespace BenchmarkDotNet.Tests.Mocks.Toolchain
 {
     public class MockToolchain : IToolchain
     {
-        private readonly IMockMeasurer measurer;
-
-        public MockToolchain(IMockMeasurer measurer) => this.measurer = measurer;
+        public MockToolchain(Func<BenchmarkCase, List<Measurement>> measurer)
+            => Executor = new MockExecutor(measurer);
 
         public string Name => nameof(MockToolchain);
         public IGenerator Generator => new MockGenerator();
         public IBuilder Builder => new MockBuilder();
-        public IExecutor Executor => new MockExecutor(measurer);
+        public IExecutor Executor { get; private set; }
         public bool IsInProcess => false;
         public IEnumerable<ValidationError> Validate(BenchmarkCase benchmarkCase, IResolver resolver) => ImmutableArray<ValidationError>.Empty;
 
@@ -38,11 +39,11 @@ private class MockBuilder : IBuilder
 
         private class MockExecutor : IExecutor
         {
-            private readonly IMockMeasurer mockMeasurer;
+            private readonly Func<BenchmarkCase, List<Measurement>> measurer;
 
-            public MockExecutor(IMockMeasurer mockMeasurer) => this.mockMeasurer = mockMeasurer;
+            public MockExecutor(Func<BenchmarkCase, List<Measurement>> measurer) => this.measurer = measurer;
 
-            public ExecuteResult Execute(ExecuteParameters executeParameters) => new (mockMeasurer.Measure(executeParameters.BenchmarkCase));
+            public ExecuteResult Execute(ExecuteParameters executeParameters) => new (measurer(executeParameters.BenchmarkCase));
         }
     }
 }