Updated tests

Author: italolelis

src/CommandBus/TacticianCommandBus.php

@@ -6,71 +6,29 @@
 use Collections\Dictionary;
 use Collections\MapInterface;
 use Collections\Queue;
+use League\Tactician\CommandBus;
 
 class TacticianCommandBus implements CommandBusInterface
 {
     /**
-     * @var MapInterface
+     * @var CommandBus
      */
-    private $commandHandlers;
+    private $commandBus;
 
     /**
-     * @var Queue
+     * TacticianCommandBus constructor.
+     * @param CommandBus $commandBus
      */
-    private $queue;
-
-    /**
-     * @var bool
-     */
-    private $isDispatching = false;
-
-    /**
-     * SimpleCommandBus constructor.
-     */
-    public function __construct()
-    {
-        $this->commandHandlers = new Dictionary();
-        $this->queue = new Queue();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function subscribe($commandName, $handler)
+    public function __construct(CommandBus $commandBus)
     {
-        \Assert\that($commandName)->notEmpty()->string();
-        $this->commandHandlers->add($commandName, $handler);
+        $this->commandBus = $commandBus;
     }
 
     /**
      * {@inheritDoc}
      */
     public function execute($command)
     {
-        $this->queue->enqueue($command);
-
-        if (!$this->isDispatching) {
-            $this->isDispatching = true;
-            try {
-                while (!$this->queue->isEmpty()) {
-                    $this->processCommand($this->queue->pop());
-                }
-            } finally {
-                $this->isDispatching = false;
-            }
-        }
-    }
-
-    /**
-     * @param $command
-     */
-    private function processCommand($command)
-    {
-        $this->commandHandlers->filterWithKey(function ($commandName, $handler) use ($command) {
-            return $commandName === get_class($command);
-        })->each(function ($handler) use ($command) {
-            Assertion::methodExists('handle', $handler);
-            $handler->handle($command);
-        });
+        $this->commandBus->handle($command);
     }
 }

tests/CommandBus/SimpleCommandBusTest.php

@@ -3,6 +3,7 @@
 namespace HelloFresh\Tests\Engine\CommandBus;
 
 use HelloFresh\Engine\CommandBus\CommandBusInterface;
+use HelloFresh\Engine\CommandBus\Handler\InMemoryLocator;
 use HelloFresh\Engine\CommandBus\SimpleCommandBus;
 use HelloFresh\Tests\Engine\Mock\InvalidHandler;
 use HelloFresh\Tests\Engine\Mock\TestCommand;
@@ -15,9 +16,15 @@ class SimpleCommandBusTest extends \PHPUnit_Framework_TestCase
      */
     private $commandBus;
 
+    /**
+     * @var InMemoryLocator
+     */
+    private $locator;
+
     protected function setUp()
     {
-        $this->commandBus = new SimpleCommandBus();
+        $this->locator = new InMemoryLocator();
+        $this->commandBus = new SimpleCommandBus($this->locator);
     }
 
     /**
@@ -26,7 +33,7 @@ protected function setUp()
     public function itExecutesAMessage()
     {
         $handler = new TestHandler();
-        $this->commandBus->subscribe(TestCommand::class, $handler);
+        $this->locator->addHandler(TestCommand::class, $handler);
 
         $command = new TestCommand("hey");
         $this->commandBus->execute($command);
@@ -57,7 +64,7 @@ public function itFailsWhenHaveInvalidSubscriber()
         $command = new TestCommand("hey");
         $handler = new TestHandler();
 
-        $this->commandBus->subscribe($command, $handler);
+        $this->locator->addHandler($command, $handler);
         $this->commandBus->execute($command);
     }
 
@@ -68,7 +75,7 @@ public function itFailsWhenHaveInvalidSubscriber()
     public function itFailsWhenHandlerHasAnInvalidHandleMethod()
     {
         $handler = new InvalidHandler();
-        $this->commandBus->subscribe(TestCommand::class, $handler);
+        $this->locator->addHandler(TestCommand::class, $handler);
 
         $command = new TestCommand("hey");
         $this->commandBus->execute($command);