Brought factory tests up to spec to test the entire factory

Author: WyriHaximus

src/Factory.php

@@ -10,6 +10,7 @@
 use ApiClients\Tools\CommandBus\Factory as CommandBusFactory;
 use DI\ContainerBuilder;
 use Interop\Container\ContainerInterface;
+use InvalidArgumentException;
 use League\Event\Emitter;
 use League\Event\EmitterInterface;
 use React\EventLoop\LoopInterface;
@@ -51,17 +52,17 @@ private static function createTransport(
         LoopInterface $loop = null,
         array $options = []
     ): TransportClient {
+        if (!isset($options[Options::TRANSPORT_OPTIONS])) {
+            throw new InvalidArgumentException('Missing Transport options');
+        }
+
         return TransportFactory::create($container, $loop, $options[Options::TRANSPORT_OPTIONS]);
     }
 
     private static function createHydrator(ContainerInterface $container, array $options = [])
     {
-        if (isset($options[Options::HYDRATOR]) && $options[Options::HYDRATOR] instanceof Hydrator) {
-            return $options[Options::HYDRATOR];
-        }
-
         if (!isset($options[Options::HYDRATOR_OPTIONS])) {
-            throw new \Exception('Missing Hydrator options');
+            throw new InvalidArgumentException('Missing Hydrator options');
         }
 
         return HydratorFactory::create($container, $options[Options::HYDRATOR_OPTIONS]);

tests/FactoryTest.php

@@ -3,14 +3,15 @@
 namespace ApiClients\Tests\Foundation;
 
 use ApiClients\Foundation\Client;
-use ApiClients\Foundation\Events\CommandLocatorEvent;
 use ApiClients\Foundation\Factory;
+use ApiClients\Foundation\Hydrator\Hydrator;
+use ApiClients\Foundation\Transport\Client as TransportClient;
 use ApiClients\Foundation\Options;
 use ApiClients\Tools\TestUtilities\TestCase;
-use League\Event\CallbackListener;
-use League\Event\EmitterInterface;
+use InvalidArgumentException;
 use League\Tactician\Exception\MissingHandlerException;
 use React\EventLoop\Factory as LoopFactory;
+use React\EventLoop\LoopInterface;
 use Throwable;
 use function Clue\React\Block\await;
 
@@ -31,27 +32,46 @@ public function testCreate()
         $this->assertInstanceOf(Client::class, $client);
 
         $container = $client->getContainer();
-
-        $called = false;
-        $container->get(EmitterInterface::class)->addListener(
-            CommandLocatorEvent::NAME,
-            CallbackListener::fromCallable(
-                function (CommandLocatorEvent $event) use (&$called) {
-                    $called = true;
-                }
-            )
-        );
-
-        $this->assertFalse($called);
+        $this->assertInstanceOf(LoopInterface::class, $container->get(LoopInterface::class));
+        $this->assertSame($loop, $container->get(LoopInterface::class));
+        $this->assertInstanceOf(Hydrator::class, $container->get(Hydrator::class));
+        $this->assertInstanceOf(TransportClient::class, $container->get(TransportClient::class));
 
         try {
             await($client->handle(new class() {}), $loop);
         } catch (Throwable $exception) {
 
         }
 
-        $this->assertTrue($called);
         $this->assertTrue(isset($exception));
         $this->assertInstanceOf(MissingHandlerException::class, $exception);
     }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Missing Hydrator options
+     */
+    public function testCreateMissingHydratorOptions()
+    {
+        Factory::create(
+            LoopFactory::create(),
+            [
+                Options::TRANSPORT_OPTIONS => [],
+            ]
+        )->getContainer()->get(Hydrator::class);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Missing Transport options
+     */
+    public function testCreateMissingTransportOptions()
+    {
+        Factory::create(
+            LoopFactory::create(),
+            [
+                Options::HYDRATOR_OPTIONS => [],
+            ]
+        )->getContainer()->get(TransportClient::class);
+    }
 }