Merge pull request #622 from tienvx/revert-code-because-step-color-is…

…-separated-from-command-values Revert code because step's color is separated from command values
tienvx · May 4, 2022 · 9690e85 · 9690e85
2 parents ed92b9a + 48904e4
commit 9690e85
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 409 deletions.
diff --git a/src/Reducer/HandlerTemplate.php b/src/Reducer/HandlerTemplate.php
@@ -8,29 +8,25 @@
 use Tienvx\Bundle\MbtBundle\Model\BugInterface;
 use Tienvx\Bundle\MbtBundle\Repository\BugRepositoryInterface;
 use Tienvx\Bundle\MbtBundle\Service\Step\Builder\StepsBuilderInterface;
-use Tienvx\Bundle\MbtBundle\Service\Step\Runner\ReduceStepsRunner;
-use Tienvx\Bundle\MbtBundle\Service\Step\StepHelperInterface;
+use Tienvx\Bundle\MbtBundle\Service\Step\Runner\BugStepsRunner;
 
 abstract class HandlerTemplate implements HandlerInterface
 {
     protected BugRepositoryInterface $bugRepository;
     protected MessageBusInterface $messageBus;
-    protected ReduceStepsRunner $stepsRunner;
+    protected BugStepsRunner $stepsRunner;
     protected StepsBuilderInterface $stepsBuilder;
-    protected StepHelperInterface $stepHelper;
 
     public function __construct(
         BugRepositoryInterface $bugRepository,
         MessageBusInterface $messageBus,
-        ReduceStepsRunner $stepsRunner,
-        StepsBuilderInterface $stepsBuilder,
-        StepHelperInterface $stepHelper
+        BugStepsRunner $stepsRunner,
+        StepsBuilderInterface $stepsBuilder
     ) {
         $this->bugRepository = $bugRepository;
         $this->messageBus = $messageBus;
         $this->stepsRunner = $stepsRunner;
         $this->stepsBuilder = $stepsBuilder;
-        $this->stepHelper = $stepHelper;
     }
 
     public function handle(BugInterface $bug, int $from, int $to): void
@@ -42,7 +38,7 @@ public function handle(BugInterface $bug, int $from, int $to): void
 
         $bug->setDebug(false);
         $this->stepsRunner->run(
-            $this->stepHelper->cloneAndResetSteps($newSteps, $bug->getTask()->getModelRevision()),
+            $newSteps,
             $bug,
             function (Throwable $throwable) use ($bug, $newSteps): void {
                 if ($throwable->getMessage() === $bug->getMessage()) {

diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -64,13 +64,10 @@
 use Tienvx\Bundle\MbtBundle\Service\SelenoidHelperInterface;
 use Tienvx\Bundle\MbtBundle\Service\Step\Builder\ShortestPathStepsBuilder;
 use Tienvx\Bundle\MbtBundle\Service\Step\Builder\StepsBuilderInterface;
+use Tienvx\Bundle\MbtBundle\Service\Step\Runner\BugStepsRunner;
 use Tienvx\Bundle\MbtBundle\Service\Step\Runner\ExploreStepsRunner;
-use Tienvx\Bundle\MbtBundle\Service\Step\Runner\RecordStepsRunner;
-use Tienvx\Bundle\MbtBundle\Service\Step\Runner\ReduceStepsRunner;
 use Tienvx\Bundle\MbtBundle\Service\Step\Runner\StepRunner;
 use Tienvx\Bundle\MbtBundle\Service\Step\Runner\StepRunnerInterface;
-use Tienvx\Bundle\MbtBundle\Service\Step\StepHelper;
-use Tienvx\Bundle\MbtBundle\Service\Step\StepHelperInterface;
 use Tienvx\Bundle\MbtBundle\Service\Task\TaskHelper;
 use Tienvx\Bundle\MbtBundle\Service\Task\TaskHelperInterface;
 use Tienvx\Bundle\MbtBundle\Validator\TagsValidator;
@@ -137,9 +134,8 @@
             ->args([
                 service(BugRepositoryInterface::class),
                 service(MessageBusInterface::class),
-                service(ReduceStepsRunner::class),
+                service(BugStepsRunner::class),
                 service(StepsBuilderInterface::class),
-                service(StepHelperInterface::class),
             ])
         ->set(RandomReducer::class)
             ->args([
@@ -155,9 +151,8 @@
             ->args([
                 service(BugRepositoryInterface::class),
                 service(MessageBusInterface::class),
-                service(ReduceStepsRunner::class),
+                service(BugStepsRunner::class),
                 service(StepsBuilderInterface::class),
-                service(StepHelperInterface::class),
             ])
         ->set(SplitReducer::class)
             ->args([
@@ -235,8 +230,7 @@
                 service(BugRepositoryInterface::class),
                 service(MessageBusInterface::class),
                 service(BugNotifierInterface::class),
-                service(StepHelperInterface::class),
-                service(RecordStepsRunner::class),
+                service(BugStepsRunner::class),
                 service(ConfigInterface::class),
             ])
             ->alias(BugHelperInterface::class, BugHelper::class)
@@ -264,12 +258,6 @@
             ])
             ->alias(PetrinetDomainLogicInterface::class, PetrinetDomainLogic::class)
 
-        ->set(StepHelper::class)
-            ->args([
-                service(ModelHelperInterface::class),
-            ])
-            ->alias(StepHelperInterface::class, StepHelper::class)
-
         ->set(StepRunner::class)
             ->args([
                 service(CommandRunnerManagerInterface::class),
@@ -282,15 +270,7 @@
                 service(StepRunnerInterface::class),
                 service(ConfigInterface::class),
             ])
-        ->set(ReduceStepsRunner::class)
-            ->args([
-                service(SelenoidHelperInterface::class),
-                service(StepRunnerInterface::class),
-                service(PetrinetHelperInterface::class),
-                service(MarkingHelperInterface::class),
-                service(GuardedTransitionServiceInterface::class),
-            ])
-        ->set(RecordStepsRunner::class)
+        ->set(BugStepsRunner::class)
             ->args([
                 service(SelenoidHelperInterface::class),
                 service(StepRunnerInterface::class),

diff --git a/src/Service/Bug/BugHelper.php b/src/Service/Bug/BugHelper.php
@@ -13,33 +13,29 @@
 use Tienvx\Bundle\MbtBundle\Reducer\ReducerManagerInterface;
 use Tienvx\Bundle\MbtBundle\Repository\BugRepositoryInterface;
 use Tienvx\Bundle\MbtBundle\Service\ConfigInterface;
-use Tienvx\Bundle\MbtBundle\Service\Step\Runner\RecordStepsRunner;
-use Tienvx\Bundle\MbtBundle\Service\Step\StepHelperInterface;
+use Tienvx\Bundle\MbtBundle\Service\Step\Runner\BugStepsRunner;
 
 class BugHelper implements BugHelperInterface
 {
     protected ReducerManagerInterface $reducerManager;
     protected BugRepositoryInterface $bugRepository;
     protected MessageBusInterface $messageBus;
     protected BugNotifierInterface $bugNotifier;
-    protected StepHelperInterface $stepHelper;
-    protected RecordStepsRunner $stepsRunner;
+    protected BugStepsRunner $stepsRunner;
     protected ConfigInterface $config;
 
     public function __construct(
         ReducerManagerInterface $reducerManager,
         BugRepositoryInterface $bugRepository,
         MessageBusInterface $messageBus,
         BugNotifierInterface $bugNotifier,
-        StepHelperInterface $stepHelper,
-        RecordStepsRunner $stepsRunner,
+        BugStepsRunner $stepsRunner,
         ConfigInterface $config
     ) {
         $this->reducerManager = $reducerManager;
         $this->bugRepository = $bugRepository;
         $this->messageBus = $messageBus;
         $this->bugNotifier = $bugNotifier;
-        $this->stepHelper = $stepHelper;
         $this->stepsRunner = $stepsRunner;
         $this->config = $config;
     }
@@ -101,7 +97,7 @@ public function recordVideo(int $bugId): void
             $this->bugRepository->startRecording($bug);
             $bug->setDebug(true);
             $this->stepsRunner->run(
-                $this->stepHelper->cloneAndResetSteps($bug->getSteps(), $bug->getTask()->getModelRevision()),
+                $bug->getSteps(),
                 $bug,
                 function (Throwable $throwable) use ($bug) {
                     $bug->getVideo()->setErrorMessage(

diff --git a/src/Service/Step/Runner/BugStepsRunner.php b/src/Service/Step/Runner/BugStepsRunner.php
@@ -5,7 +5,7 @@
 use Throwable;
 use Tienvx\Bundle\MbtBundle\Model\Bug\StepInterface;
 
-abstract class BugStepsRunner extends StepsRunner
+class BugStepsRunner extends StepsRunner
 {
     protected function catchException(callable $handleException, Throwable $throwable, ?StepInterface $step): void
     {

diff --git a/src/Service/Step/Runner/RecordStepsRunner.php b/src/Service/Step/Runner/RecordStepsRunner.php
diff --git a/src/Service/Step/Runner/ReduceStepsRunner.php b/src/Service/Step/Runner/ReduceStepsRunner.php
diff --git a/src/Service/Step/StepHelper.php b/src/Service/Step/StepHelper.php
diff --git a/src/Service/Step/StepHelperInterface.php b/src/Service/Step/StepHelperInterface.php
diff --git a/tests/Reducer/HandlerTestCase.php b/tests/Reducer/HandlerTestCase.php
@@ -17,17 +17,15 @@
 use Tienvx\Bundle\MbtBundle\Reducer\HandlerInterface;
 use Tienvx\Bundle\MbtBundle\Repository\BugRepositoryInterface;
 use Tienvx\Bundle\MbtBundle\Service\Step\Builder\StepsBuilderInterface;
-use Tienvx\Bundle\MbtBundle\Service\Step\Runner\ReduceStepsRunner;
-use Tienvx\Bundle\MbtBundle\Service\Step\StepHelperInterface;
+use Tienvx\Bundle\MbtBundle\Service\Step\Runner\BugStepsRunner;
 
 abstract class HandlerTestCase extends TestCase
 {
     protected HandlerInterface $handler;
     protected BugRepositoryInterface $bugRepository;
     protected MessageBusInterface $messageBus;
-    protected ReduceStepsRunner $stepsRunner;
+    protected BugStepsRunner $stepsRunner;
     protected StepsBuilderInterface $stepsBuilder;
-    protected StepHelperInterface $stepHelper;
     protected array $newSteps;
     protected Revision $revision;
     protected BugInterface $bug;
@@ -36,9 +34,8 @@ protected function setUp(): void
     {
         $this->bugRepository = $this->createMock(BugRepositoryInterface::class);
         $this->messageBus = $this->createMock(MessageBusInterface::class);
-        $this->stepsRunner = $this->createMock(ReduceStepsRunner::class);
+        $this->stepsRunner = $this->createMock(BugStepsRunner::class);
         $this->stepsBuilder = $this->createMock(StepsBuilderInterface::class);
-        $this->stepHelper = $this->createMock(StepHelperInterface::class);
         $this->newSteps = [
             $this->createMock(StepInterface::class),
             $this->createMock(StepInterface::class),
@@ -83,11 +80,6 @@ public function testHandleOldBug(): void
      */
     public function testHandle(?Throwable $exception, bool $updateSteps): void
     {
-        $this->stepHelper
-            ->expects($this->once())
-            ->method('cloneAndResetSteps')
-            ->with($this->newSteps, $this->revision)
-            ->willReturnArgument(0);
         $this->stepsRunner->expects($this->once())
             ->method('run')
             ->with(

diff --git a/tests/Reducer/Random/RandomHandlerTest.php b/tests/Reducer/Random/RandomHandlerTest.php
@@ -27,8 +27,7 @@ protected function setUp(): void
             $this->bugRepository,
             $this->messageBus,
             $this->stepsRunner,
-            $this->stepsBuilder,
-            $this->stepHelper
+            $this->stepsBuilder
         );
     }
 }
diff --git a/tests/Reducer/Split/SplitHandlerTest.php b/tests/Reducer/Split/SplitHandlerTest.php
@@ -27,8 +27,7 @@ protected function setUp(): void
             $this->bugRepository,
             $this->messageBus,
             $this->stepsRunner,
-            $this->stepsBuilder,
-            $this->stepHelper
+            $this->stepsBuilder
         );
     }
 }