Update unit tests

Author: schmengler

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -577,5 +577,4 @@ public function getAttributeRawValue($entityId, $attribute, $store)
 
         return $attributesData === false ? false : $attributesData;
     }
-
 }

app/code/Magento/Catalog/Model/ResourceModel/Product.php

@@ -129,7 +129,7 @@ public function __construct(
         $this->setFactory = $setFactory;
         $this->typeFactory = $typeFactory;
         $this->defaultAttributes = $defaultAttributes;
-        $this->metadataService = $metadataService ?? ObjectManager::getInstance(
+        $this->metadataService = $metadataService ?? ObjectManager::getInstance()->get(
             ProductAttributeRepositoryInterface::class
         );
         parent::__construct(
@@ -253,8 +253,11 @@ public function getCustomAttributesCodes()
     {
         if ($this->customAttributesCodes === null) {
             $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
-            $this->customAttributesCodes = array_diff($this->customAttributesCodes, ProductInterface::ATTRIBUTES);
+            $this->customAttributesCodes = array_values(
+                array_diff($this->customAttributesCodes, ProductInterface::ATTRIBUTES)
+            );
         }
+        return $this->customAttributesCodes;
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
@@ -140,11 +141,6 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $dataObjectHelperMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $metadataServiceMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -274,9 +270,7 @@ protected function setUp()
         );
         $optionFactory->expects($this->any())->method('create')->willReturn($this->optionInstanceMock);
 
-        $this->resource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->resource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
 
         $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
             ->disableOriginalConstructor()
@@ -328,7 +322,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
         $this->attributeValueFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class)
             ->disableOriginalConstructor()->getMock();
 
@@ -391,7 +384,7 @@ protected function setUp()
                 'catalogProduct' => $this->_catalogProduct,
                 'imageCacheFactory' => $this->imageCacheFactory,
                 'mediaGalleryEntryFactory' => $this->mediaGalleryEntryFactoryMock,
-                'metadataService' => $this->metadataServiceMock,
+                'metadataService' => $this->createMock(ProductAttributeRepositoryInterface::class),
                 'customAttributeFactory' => $this->attributeValueFactory,
                 'mediaGalleryEntryConverterPool' => $this->mediaGalleryEntryConverterPoolMock,
                 'linkRepository' => $this->productLinkRepositoryMock,
@@ -1269,19 +1262,10 @@ public function testGetCustomAttributes()
     {
         $priceCode = 'price';
         $colorAttributeCode = 'color';
-        $interfaceAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-        $interfaceAttribute->expects($this->once())
-            ->method('getAttributeCode')
-            ->willReturn($priceCode);
-        $colorAttribute = $this->createMock(\Magento\Framework\Api\MetadataObjectInterface::class);
-        $colorAttribute->expects($this->once())
-            ->method('getAttributeCode')
-            ->willReturn($colorAttributeCode);
-        $customAttributesMetadata = [$interfaceAttribute, $colorAttribute];
-
-        $this->metadataServiceMock->expects($this->once())
-            ->method('getCustomAttributesMetadata')
-            ->willReturn($customAttributesMetadata);
+
+        $this->resource
+            ->method('getCustomAttributesCodes')
+            ->willReturn([$colorAttributeCode]);
         $this->model->setData($priceCode, 10);
 
         //The color attribute is not set, expect empty custom attribute array

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/ProductTest.php

@@ -6,10 +6,14 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
 
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\MetadataObjectInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
+    private $metadataService;
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product
      */
@@ -38,11 +42,20 @@ protected function setUp()
             ['create', '__wakeup']
         );
 
+        $this->metadataService = $this->createMock(ProductAttributeRepositoryInterface::class);
+
+        $entityTypeMock = $this->createPartialMock(\Magento\Eav\Model\Entity\Type::class, ['getEntityModel']);
+        $entityTypeMock->method('getEntityModel')->willReturn(Product::class);
+        $eavConfigMock = $this->createMock(\Magento\Eav\Model\Config::class);
+        $eavConfigMock->method('getEntityType')->willReturn($entityTypeMock);
+
         $this->model = $objectManager->getObject(
             \Magento\Catalog\Model\ResourceModel\Product::class,
             [
                 'setFactory' => $this->setFactoryMock,
                 'typeFactory' => $this->typeFactoryMock,
+                'eavConfig' => $eavConfigMock,
+                'metadataService' => $this->metadataService,
             ]
         );
     }
@@ -78,4 +91,25 @@ public function testValidateWrongAttributeSet()
 
         $this->assertEquals($expectedErrorMessage, $this->model->validate($productMock));
     }
+
+    public function testGetCustomAttributes()
+    {
+        $priceCode = 'price';
+        $colorAttributeCode = 'color';
+        $interfaceAttribute = $this->createMock(MetadataObjectInterface::class);
+        $interfaceAttribute->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn($priceCode);
+        $colorAttribute = $this->createMock(MetadataObjectInterface::class);
+        $colorAttribute->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn($colorAttributeCode);
+        $customAttributesMetadata = [$interfaceAttribute, $colorAttribute];
+
+        $this->metadataService->expects($this->once())
+            ->method('getCustomAttributesMetadata')
+            ->willReturn($customAttributesMetadata);
+
+        $this->assertEquals([$colorAttributeCode], $this->model->getCustomAttributesCodes());
+    }
 }

lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php

@@ -35,6 +35,7 @@ abstract class AbstractExtensibleModel extends AbstractModel implements
     protected $customAttributeFactory;
 
     /**
+     * @deprecated Attribute codes are the same for all entities of the same type and should be saved in resource model
      * @var string[]
      */
     protected $customAttributesCodes = null;
@@ -286,6 +287,8 @@ protected function getCustomAttributesCodes()
      *
      * Can be used in child classes, which represent EAV entities.
      *
+     * @deprecated attribute codes should be managed centrally in resource model
+     * @see \Magento\Eav\Model\Entity\AbstractEntity::getEavAttributesCodes()
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
      * @return string[]
      */