Failing test for running subjects with different executors

dantleech · dantleech · commit f2fddf51870e · 2021-06-27T22:16:03.000+01:00
diff --git a/lib/Benchmark/Runner.php b/lib/Benchmark/Runner.php
@@ -300,7 +300,6 @@ private function runVariant(
             $this->logger->variantEnd($variant);
 
             if ($config->getStopOnError()) {
-                dump($e->getMessage());
                 throw new StopOnErrorException();
             }
 
diff --git a/tests/Unit/Benchmark/RunnerTest.php b/tests/Unit/Benchmark/RunnerTest.php
@@ -376,6 +376,36 @@ public function testCallBeforeAndAfterClassWithBenchmarkExecutorWhenCustomSubjec
         self::assertTrue($this->executor->hasMethodBeenExecuted('afterClass'), 'after');
     }
 
+    public function testRunSubjectsWithDifferentExecutors(): void
+    {
+        TestUtil::configureBenchmarkMetadata($this->benchmark, []);
+
+        $subject1 = new SubjectMetadata($this->benchmark->reveal(), 'name');
+        $subject1->setExecutor(new ExecutorMetadata('executor_1', []));
+        $subject2 = new SubjectMetadata($this->benchmark->reveal(), 'name');
+        $subject2->setExecutor(new ExecutorMetadata('executor_2', []));
+        $this->benchmark->getSubjects()->willReturn([
+            $subject1,
+            $subject2,
+        ]);
+
+        $executor1 = new TestExecutor();
+        $executor2 = new TestExecutor();
+        $this->executorRegistry->getService('executor_1')->willReturn($executor1);
+        $this->executorRegistry->getService('executor_2')->willReturn($executor2);
+        $this->executorRegistry->getConfig(['executor'=> 'executor_1'])->willReturn($this->resolveExecutorConfig([
+            'executor' => 'executor_1'
+        ]));
+        $this->executorRegistry->getConfig(['executor'=> 'executor_2'])->willReturn($this->resolveExecutorConfig([
+            'executor' => 'executor_2'
+        ]));
+
+        $this->runner->run([ $this->benchmark->reveal() ], RunnerConfig::create());
+
+        self::assertEquals(1, $executor1->getExecutedContextCount());
+        self::assertEquals(1, $executor2->getExecutedContextCount());
+    }
+
     /**
      * It should handle exceptions thrown by the executor.
      * It should handle nested exceptions.

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,6 @@ private function runVariant(`
`300`	`300`	`$this->logger->variantEnd($variant);`
`301`	`301`
`302`	`302`	`if ($config->getStopOnError()) {`
`303`		`- dump($e->getMessage());`
`304`	`303`	`throw new StopOnErrorException();`
`305`	`304`	`}`
`306`	`305`