MAGETWO-64224: Remove usages of AttributeCache from customer module

- refactoring tests

Author: Igor Melnikov

app/code/Magento/Customer/Model/Metadata/AttributeMetadataHydrator.php

@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Customer\Api\Data\OptionInterface;
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
+use Magento\Customer\Api\Data\ValidationRuleInterface;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
@@ -71,17 +72,15 @@ public function hydrate(array $data)
             );
         }
         if (isset($data[AttributeMetadataInterface::VALIDATION_RULES])) {
-            $validationRules = [];
-            foreach ($data[AttributeMetadataInterface::VALIDATION_RULES] as $validationRuleData) {
-                $validationRules[] = $this->validationRuleFactory->create(['data' => $validationRuleData]);
-            }
-            $data[AttributeMetadataInterface::VALIDATION_RULES] = $validationRules;
+            $data[AttributeMetadataInterface::VALIDATION_RULES] = $this->createValidationRules(
+                $data[AttributeMetadataInterface::VALIDATION_RULES]
+            );
         }
         return $this->attributeMetadataFactory->create(['data' => $data]);
     }
 
     /**
-     * Convert AttributeMetadataInterface to array
+     * Populate options with data
      *
      * @param array $data
      * @return OptionInterface[]
@@ -98,6 +97,22 @@ private function createOptions(array $data)
     }
 
     /**
+     * Populate validation rules with data
+     *
+     * @param array $data
+     * @return ValidationRuleInterface[]
+     */
+    private function createValidationRules(array $data)
+    {
+        foreach ($data as $key => $validationRuleData) {
+            $data[$key] = $this->validationRuleFactory->create(['data' => $validationRuleData]);
+        }
+        return $data;
+    }
+
+    /**
+     * Convert AttributeMetadataInterface to array
+     *
      * @param AttributeMetadataInterface $attributeMetadata
      * @return array
      */

app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php

@@ -75,7 +75,10 @@ public function testLoadCacheDisabled()
             ->method('isEnabled')
             ->with(Type::TYPE_IDENTIFIER)
             ->willReturn(false);
+        $this->cacheMock->expects($this->never())
+            ->method('load');
         $this->assertFalse($this->attributeMetadataCache->load($entityType, $suffix));
+        // Make sure isEnabled called once
         $this->attributeMetadataCache->load($entityType, $suffix);
     }
 
@@ -124,9 +127,18 @@ public function testLoad()
             ->method('hydrate')
             ->with($attributeMetadataOneData)
             ->willReturn($attributeMetadataMock);
+        $attributesMetadata = $this->attributeMetadataCache->load($entityType, $suffix);
+        $this->assertInternalType(
+            \PHPUnit_Framework_Constraint_IsType::TYPE_ARRAY,
+            $attributesMetadata
+        );
+        $this->assertArrayHasKey(
+            0,
+            $attributesMetadata
+        );
         $this->assertInstanceOf(
             AttributeMetadataInterface::class,
-            $this->attributeMetadataCache->load($entityType, $suffix)[0]
+            $attributesMetadata[0]
         );
     }
 

app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataHydratorTest.php

@@ -7,14 +7,16 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
-use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
-use Magento\Customer\Api\Data\OptionInterfaceFactory;
-use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
 use Magento\Customer\Model\Data\AttributeMetadata;
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Api\Data\OptionInterface;
 use Magento\Customer\Model\Data\Option;
+use Magento\Customer\Api\Data\OptionInterfaceFactory;
+use Magento\Customer\Api\Data\ValidationRuleInterface;
 use Magento\Customer\Model\Data\ValidationRule;
-use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
 use Magento\Customer\Model\Metadata\AttributeMetadataHydrator;
+use Magento\Framework\Reflection\DataObjectProcessor;
 
 class AttributeMetadataHydratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -168,18 +170,43 @@ public function testHydrate()
 
         $attributeMetadata = $this->attributeMetadataHydrator->hydrate($attributeMetadataData);
 
+        $this->assertInstanceOf(AttributeMetadataInterface::class, $attributeMetadata);
         $this->assertEquals(
             $attributeMetadataData['attribute_code'],
             $attributeMetadata->getAttributeCode()
         );
+        $this->assertInternalType(
+            \PHPUnit_Framework_Constraint_IsType::TYPE_ARRAY,
+            $attributeMetadata->getOptions()
+        );
+        $this->assertArrayHasKey(
+            0,
+            $attributeMetadata->getOptions()
+        );
+        $this->assertInstanceOf(OptionInterface::class, $attributeMetadata->getOptions()[0]);
         $this->assertEquals(
             $optionOneData['label'],
             $attributeMetadata->getOptions()[0]->getLabel()
         );
+        $this->assertArrayHasKey(1, $attributeMetadata->getOptions());
+        $this->assertInstanceOf(OptionInterface::class, $attributeMetadata->getOptions()[1]);
+
+        $this->assertInternalType(
+            \PHPUnit_Framework_Constraint_IsType::TYPE_ARRAY,
+            $attributeMetadata->getOptions()[1]->getOptions()
+        );
+        $this->assertArrayHasKey(0, $attributeMetadata->getOptions()[1]->getOptions());
+        $this->assertInstanceOf(OptionInterface::class, $attributeMetadata->getOptions()[1]->getOptions()[0]);
         $this->assertEquals(
             $optionThreeData['label'],
             $attributeMetadata->getOptions()[1]->getOptions()[0]->getLabel()
         );
+        $this->assertInternalType(
+            \PHPUnit_Framework_Constraint_IsType::TYPE_ARRAY,
+            $attributeMetadata->getValidationRules()
+        );
+        $this->assertArrayHasKey(0, $attributeMetadata->getValidationRules());
+        $this->assertInstanceOf(ValidationRuleInterface::class, $attributeMetadata->getValidationRules()[0]);
         $this->assertEquals(
             $validationRuleOneData['name'],
             $attributeMetadata->getValidationRules()[0]->getName()