B2B-2658: Implement GraphQL Resolver Cache for Customer query

- test fix

Author: rganin

app/code/Magento/GraphQlResolverCache/Model/Resolver/Result/HydratorDehydratorProvider.php

@@ -146,31 +146,9 @@ private function getInstancesForResolver(
         }
         $dataProcessingClassList = [];
         foreach ($resolverClassesConfig as $resolverClass => $classChain) {
+            $this->validateClassChain($classChain, $interfaceName, $resolverClass);
             foreach ($classChain as $classData) {
-                if (is_a($classData['class'], $interfaceName, true)) {
-                    $dataProcessingClassList[] = $classData;
-                } else {
-                    if ($interfaceName == HydratorInterface::class) {
-                        throw new ConfigurationMismatchException(
-                            __(
-                                'Hydrator %1 configured for resolver %2 must implement %3.',
-                                $classData['class'],
-                                $resolverClass,
-                                $interfaceName
-                            )
-                        );
-                    } else {
-                        throw new ConfigurationMismatchException(
-                            __(
-                                'Dehydrator %1 configured for resolver %2 must implement %3.',
-                                $classData['class'],
-                                $resolverClass,
-                                $interfaceName
-                            )
-                        );
-                    }
-
-                }
+                $dataProcessingClassList[] = $classData;
             }
         }
         usort($dataProcessingClassList, function ($data1, $data2) {
@@ -183,6 +161,43 @@ private function getInstancesForResolver(
         return $dataProcessingInstances;
     }
 
+    /**
+     * Validate hydrator or dehydrator classes and throw exception if class does not implement relevant interface.
+     *
+     * @param array $classChain
+     * @param string $interfaceName
+     * @param string $resolverClass
+     * @return void
+     * @throws ConfigurationMismatchException
+     */
+    private function validateClassChain(array $classChain, string $interfaceName, string $resolverClass)
+    {
+        foreach ($classChain as $classData) {
+            if (!is_a($classData['class'], $interfaceName, true)) {
+                if ($interfaceName == HydratorInterface::class) {
+                    throw new ConfigurationMismatchException(
+                        __(
+                            'Hydrator %1 configured for resolver %2 must implement %3.',
+                            $classData['class'],
+                            $resolverClass,
+                            $interfaceName
+                        )
+                    );
+                } else {
+                    throw new ConfigurationMismatchException(
+                        __(
+                            'Dehydrator %1 configured for resolver %2 must implement %3.',
+                            $classData['class'],
+                            $resolverClass,
+                            $interfaceName
+                        )
+                    );
+                }
+
+            }
+        }
+    }
+
     /**
      * Get class inheritance chain for the given resolver object.
      *

dev/tests/integration/testsuite/Magento/GraphQlResolverCache/Model/Resolver/Result/HydratorDehydratorProviderTest.php

@@ -169,6 +169,77 @@ public function testHydratorDoesNotExist()
         $this->assertNull($this->provider->getHydratorForResolver($resolver));
     }
 
+    /**
+     * @magentoAppArea graphql
+     *
+     * @return void
+     */
+    public function testHydratorClassMismatch()
+    {
+        $this->expectExceptionMessage('Hydrator TestResolverModelDehydrator configured for resolver '
+            . 'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver must implement '
+            . 'Magento\GraphQlResolverCache\Model\Resolver\Result\HydratorInterface.');
+        $testModelDehydrator = $this->getMockBuilder(DehydratorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMockClassName('TestResolverModelDehydrator')
+            ->onlyMethods(['dehydrate'])
+            ->getMock();
+        $this->objectManager->addSharedInstance($testModelDehydrator, 'TestResolverModelDehydrator');
+
+        $this->provider = $this->objectManager->create(
+            HydratorDehydratorProvider::class,
+            [
+                'hydratorConfig' => [
+                    'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver' => [
+                        'simple_dehydrator' => [
+                            'sortOrder' => 10,
+                            'class' => 'TestResolverModelDehydrator'
+                        ],
+                    ]
+                ]
+            ]
+        );
+        $resolver = $this->getMockBuilder(StoreConfigResolver::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->assertNull($this->provider->getHydratorForResolver($resolver));
+    }
+
+    /**
+     * @magentoAppArea graphql
+     *
+     * @return void
+     */
+    public function testDehydratorClassMismatch()
+    {
+        $this->expectExceptionMessage('Dehydrator TestResolverModelHydrator configured for resolver '
+            . 'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver must implement '
+            . 'Magento\GraphQlResolverCache\Model\Resolver\Result\DehydratorInterface.');
+        $hydrator = $this->getMockBuilder(HydratorInterface::class)
+            ->disableOriginalConstructor()
+            ->setMockClassName('TestResolverModelHydrator')
+            ->getMock();
+        $this->objectManager->addSharedInstance($hydrator, 'TestResolverModelHydrator');
+
+        $this->provider = $this->objectManager->create(
+            HydratorDehydratorProvider::class,
+            [
+                'dehydratorConfig' => [
+                    'Magento\StoreGraphQl\Model\Resolver\StoreConfigResolver' => [
+                        'simple_dehydrator' => [
+                            'sortOrder' => 10,
+                            'class' => 'TestResolverModelHydrator'
+                        ],
+                    ]
+                ]
+            ]
+        );
+        $resolver = $this->getMockBuilder(StoreConfigResolver::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->assertNull($this->provider->getDehydratorForResolver($resolver));
+    }
+
     /**
      * @magentoAppArea graphql
      *