Fixing aggregate query provider and adding tests

Author: moufmouf

src/AggregateControllerQueryProvider.php

@@ -97,7 +97,7 @@ public function getMutations(): array
 
         foreach ($this->controllers as $controllerName) {
             $controller = $this->container->get($controllerName);
-            $queryProvider = new ControllerQueryProvider($controller, $this->annotationReader, $this->typeMapper, $this->hydrator);
+            $queryProvider = new ControllerQueryProvider($controller, $this->annotationReader, $this->typeMapper, $this->hydrator, $this->authenticationService, $this->authorizationService);
             $mutationList = array_merge($mutationList, $queryProvider->getMutations());
         }
 

tests/AbstractQueryProviderTest.php

@@ -0,0 +1,71 @@
+<?php
+
+
+namespace TheCodingMachine\GraphQL\Controllers;
+
+
+use PHPUnit\Framework\TestCase;
+use TheCodingMachine\GraphQL\Controllers\Fixtures\TestObject;
+use Youshido\GraphQL\Type\Object\ObjectType;
+use Youshido\GraphQL\Type\Scalar\StringType;
+use Youshido\GraphQL\Type\TypeInterface;
+
+abstract class AbstractQueryProviderTest extends TestCase
+{
+    private $testObjectType;
+    private $typeMapper;
+    private $hydrator;
+
+    protected function getTestObjectType()
+    {
+        if ($this->testObjectType === null) {
+            $this->testObjectType = new ObjectType([
+                'name'    => 'TestObject',
+                'fields'  => [
+                    'test'   => new StringType(),
+                ],
+            ]);
+        }
+        return $this->testObjectType;
+    }
+
+    protected function getTypeMapper()
+    {
+        if ($this->typeMapper === null) {
+            $this->typeMapper = new class($this->getTestObjectType()) implements TypeMapperInterface {
+                /**
+                 * @var ObjectType
+                 */
+                private $testObjectType;
+
+                public function __construct(ObjectType $testObjectType)
+                {
+                    $this->testObjectType = $testObjectType;
+                }
+
+                public function mapClassToType(string $className): TypeInterface
+                {
+                    if ($className === TestObject::class) {
+                        return $this->testObjectType;
+                    } else {
+                        throw new \RuntimeException('Unexpected type');
+                    }
+                }
+            };
+        }
+        return $this->typeMapper;
+    }
+
+    protected function getHydrator()
+    {
+        if ($this->hydrator === null) {
+            $this->hydrator = new class implements HydratorInterface {
+                public function hydrate(array $data, TypeInterface $type)
+                {
+                    return new TestObject($data['test']);
+                }
+            };
+        }
+        return $this->hydrator;
+    }
+}

tests/AggregateControllerQueryProviderTest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace TheCodingMachine\GraphQL\Controllers;
+
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use TheCodingMachine\GraphQL\Controllers\Fixtures\TestController;
+use TheCodingMachine\GraphQL\Controllers\Security\VoidAuthenticationService;
+use TheCodingMachine\GraphQL\Controllers\Security\VoidAuthorizationService;
+
+class AggregateControllerQueryProviderTest extends AbstractQueryProviderTest
+{
+    public function testAggregate()
+    {
+        $controller = new TestController();
+        $reader = new AnnotationReader();
+
+        $container = new class([ 'controller' => $controller ]) implements ContainerInterface {
+
+            /**
+             * @var array
+             */
+            private $controllers;
+
+            public function __construct(array $controllers)
+            {
+                $this->controllers = $controllers;
+            }
+
+            public function get($id)
+            {
+                return $this->controllers[$id];
+            }
+
+            public function has($id)
+            {
+                return isset($this->controllers[$id]);
+            }
+        };
+
+        $aggregateQueryProvider = new AggregateControllerQueryProvider([ 'controller' ], $container, $reader, $this->getTypeMapper(), $this->getHydrator(), new VoidAuthenticationService(), new VoidAuthorizationService());
+
+        $queries = $aggregateQueryProvider->getQueries();
+        $this->assertCount(1, $queries);
+
+        $mutations = $aggregateQueryProvider->getMutations();
+        $this->assertCount(1, $mutations);
+    }
+}

tests/ControllerQueryProviderTest.php

@@ -16,64 +16,8 @@
 use Youshido\GraphQL\Type\Scalar\StringType;
 use Youshido\GraphQL\Type\TypeInterface;
 
-class ControllerQueryProviderTest extends TestCase
+class ControllerQueryProviderTest extends AbstractQueryProviderTest
 {
-    private $testObjectType;
-    private $typeMapper;
-    private $hydrator;
-
-    private function getTestObjectType()
-    {
-        if ($this->testObjectType === null) {
-            $this->testObjectType = new ObjectType([
-                'name'    => 'TestObject',
-                'fields'  => [
-                    'test'   => new StringType(),
-                ],
-            ]);
-        }
-        return $this->testObjectType;
-    }
-
-    private function getTypeMapper()
-    {
-        if ($this->typeMapper === null) {
-            $this->typeMapper = new class($this->getTestObjectType()) implements TypeMapperInterface {
-                /**
-                 * @var ObjectType
-                 */
-                private $testObjectType;
-
-                public function __construct(ObjectType $testObjectType)
-                {
-                    $this->testObjectType = $testObjectType;
-                }
-
-                public function mapClassToType(string $className): TypeInterface
-                {
-                    if ($className === TestObject::class) {
-                        return $this->testObjectType;
-                    } else {
-                        throw new \RuntimeException('Unexpected type');
-                    }
-                }
-            };
-        }
-        return $this->typeMapper;
-    }
-
-    private function getHydrator()
-    {
-        if ($this->hydrator === null) {
-            $this->hydrator = new class implements HydratorInterface {
-                public function hydrate(array $data, TypeInterface $type)
-                {
-                    return new TestObject($data['test']);
-                }
-            };
-        }
-        return $this->hydrator;
-    }
 
     public function testQueryProvider()
     {