if iteration cleanup is provided, the benchmark should be executed on…

…ce per iteration, dotnet#730
alinasmirnova · Sep 22, 2018 · 2c09474 · 2c09474
1 parent 64d1939
commit 2c09474
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/BenchmarkDotNet/Jobs/JobExtensions.cs b/src/BenchmarkDotNet/Jobs/JobExtensions.cs
@@ -228,7 +228,7 @@ public static class JobExtensions
         internal static Job MakeSettingsUserFriendly(this Job job, Descriptor descriptor)
         {
             // users expect that if IterationSetup is configured, it should be run before every benchmark invocation https://github.com/dotnet/BenchmarkDotNet/issues/730
-            if (descriptor.IterationSetupMethod != null
+            if ((descriptor.IterationSetupMethod != null || descriptor.IterationCleanupMethod != null) 
                 && !job.HasValue(RunMode.InvocationCountCharacteristic)
                 && !job.HasValue(RunMode.UnrollFactorCharacteristic))
             {

diff --git a/tests/BenchmarkDotNet.Tests/Running/BenchmarkConverterTests.cs b/tests/BenchmarkDotNet.Tests/Running/BenchmarkConverterTests.cs
@@ -83,6 +83,21 @@ public void IfIterationSetupIsProvidedTheBenchmarkShouldRunOncePerIteration()
             Assert.Equal(1, benchmark.Job.Run.InvocationCount);
             Assert.Equal(1, benchmark.Job.Run.UnrollFactor);
         }
+
+        [Fact]
+        public void IfIterationCleanupIsProvidedTheBenchmarkShouldRunOncePerIteration()
+        {
+            var benchmark = BenchmarkConverter.TypeToBenchmarks(typeof(WithIterationCleanupOnly)).BenchmarksCases.Single();
+
+            Assert.Equal(1, benchmark.Job.Run.InvocationCount);
+            Assert.Equal(1, benchmark.Job.Run.UnrollFactor);
+        }
+
+        public class WithIterationCleanupOnly
+        {
+            [IterationCleanup] public void Cleanup() { }
+            [Benchmark] public void Benchmark() { }
+        }
 
         [Fact]
         public void InvocationCountIsRespectedForBenchmarksWithIterationSetup()