Fixed tests

Author: italolelis

src/CommandBus/Handler/InMemoryLocator.php

@@ -21,12 +21,15 @@ public function __construct(array $commandClassToHandlerMap = [])
 
     /**
      * Bind a handler instance to receive all commands with a certain class
-     *
-     * @param object $handler Handler to receive class
      * @param string $commandClassName Command class e.g. "My\TaskAddedCommand"
+     * @param object $handler Handler to receive class
      */
-    public function addHandler($handler, $commandClassName)
+    public function addHandler($commandClassName, $handler)
     {
+        if (!is_string($commandClassName)) {
+            throw new \InvalidArgumentException('The command name should be a string');
+        }
+
         $this->handlers[$commandClassName] = $handler;
     }
 
@@ -37,7 +40,7 @@ public function addHandler($handler, $commandClassName)
     protected function addHandlers(array $commandClassToHandlerMap)
     {
         foreach ($commandClassToHandlerMap as $commandClass => $handler) {
-            $this->addHandler($handler, $commandClass);
+            $this->addHandler($commandClass, $handler);
         }
     }
 

src/CommandBus/SimpleCommandBus.php

@@ -58,7 +58,7 @@ public function execute($command)
     private function processCommand($command)
     {
         $handler = $this->handlerLocator->getHandlerForCommand(get_class($command));
-        $methodName = 'handler';
+        $methodName = 'handle';
 
         if (!is_callable([$handler, $methodName])) {
             throw CanNotInvokeHandlerException::forCommand(

tests/CommandBus/EventDispatchingCommandBusTest.php

@@ -4,6 +4,8 @@
 
 use HelloFresh\Engine\CommandBus\CommandBusInterface;
 use HelloFresh\Engine\CommandBus\EventDispatchingCommandBus;
+use HelloFresh\Engine\CommandBus\Exception\MissingHandlerException;
+use HelloFresh\Engine\CommandBus\Handler\InMemoryLocator;
 use HelloFresh\Engine\CommandBus\SimpleCommandBus;
 use HelloFresh\Engine\EventDispatcher\EventDispatcher;
 use HelloFresh\Tests\Engine\Mock\InvalidHandler;
@@ -12,14 +14,20 @@
 
 class EventDispatchingCommandBusTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var InMemoryLocator
+     */
+    private $locator;
+
     /**
      * @var CommandBusInterface
      */
     private $commandBus;
 
     protected function setUp()
     {
-        $simpleCommandBus = new SimpleCommandBus();
+        $this->locator = new InMemoryLocator();
+        $simpleCommandBus = new SimpleCommandBus($this->locator);
         $eventDispatcher = new EventDispatcher();
         $this->commandBus = new EventDispatchingCommandBus($simpleCommandBus, $eventDispatcher);
     }
@@ -30,7 +38,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);
@@ -42,6 +50,7 @@ public function itExecutesAMessage()
 
     /**
      * @test
+     * @expectedException \HelloFresh\Engine\CommandBus\Exception\MissingHandlerException
      */
     public function itLosesMessageWhenThereIsNoHandlers()
     {
@@ -54,25 +63,25 @@ public function itLosesMessageWhenThereIsNoHandlers()
 
     /**
      * @test
-     * @expectedException \Assert\InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function itFailsWhenHaveInvalidSubscriber()
     {
         $command = new TestCommand("hey");
         $handler = new TestHandler();
 
-        $this->commandBus->subscribe($command, $handler);
+        $this->locator->addHandler($command, $handler);
         $this->commandBus->execute($command);
     }
 
     /**
      * @test
-     * @expectedException \Assert\InvalidArgumentException
+     * @expectedException \HelloFresh\Engine\CommandBus\Exception\CanNotInvokeHandlerException
      */
     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);

tests/CommandBus/SimpleCommandBusTest.php

@@ -45,6 +45,7 @@ public function itExecutesAMessage()
 
     /**
      * @test
+     * @expectedException \HelloFresh\Engine\CommandBus\Exception\MissingHandlerException
      */
     public function itLosesMessageWhenThereIsNoHandlers()
     {
@@ -57,7 +58,7 @@ public function itLosesMessageWhenThereIsNoHandlers()
 
     /**
      * @test
-     * @expectedException \Assert\InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function itFailsWhenHaveInvalidSubscriber()
     {
@@ -70,7 +71,7 @@ public function itFailsWhenHaveInvalidSubscriber()
 
     /**
      * @test
-     * @expectedException \Assert\InvalidArgumentException
+     * @expectedException \HelloFresh\Engine\CommandBus\Exception\CanNotInvokeHandlerException
      */
     public function itFailsWhenHandlerHasAnInvalidHandleMethod()
     {