MAGETWO-52836: Enable EAV attributes caching - unskip unit

Author: valdislav

app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Eav\Test\Unit\Model\ResourceModel\Entity;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class AttributeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -22,7 +24,6 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->markTestSkipped();
         $this->contextMock = $this->getMock(
             '\Magento\Framework\Model\Context',
             ['getCacheManager', 'getEventDispatcher', 'getLogger', 'getAppState', 'getActionValidator'],
@@ -41,8 +42,8 @@ protected function setUp()
     public function testSaveOptionSystemAttribute()
     {
         /** @var $connectionMock \PHPUnit_Framework_MockObject_MockObject */
-        /** @var $resourceModelMock \Magento\Eav\Model\ResourceModel\Entity\Attribute */
-        list($connectionMock, $resourceModelMock) = $this->_prepareResourceModel();
+        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $attributeData = [
             'attribute_id' => '123',
@@ -103,7 +104,7 @@ public function testSaveOptionSystemAttribute()
         );
         $connectionMock->expects($this->never())->method('delete');
 
-        $resourceModelMock->save($model);
+        $resourceModel->save($model);
     }
 
     /**
@@ -112,8 +113,8 @@ public function testSaveOptionSystemAttribute()
     public function testSaveOptionNewUserDefinedAttribute()
     {
         /** @var $connectionMock \PHPUnit_Framework_MockObject_MockObject */
-        /** @var $resourceModelMock \Magento\Eav\Model\ResourceModel\Entity\Attribute */
-        list($connectionMock, $resourceModelMock) = $this->_prepareResourceModel();
+        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $attributeData = [
             'entity_type_id' => 4,
@@ -198,7 +199,7 @@ public function testSaveOptionNewUserDefinedAttribute()
             )
         );
 
-        $resourceModelMock->save($model);
+        $resourceModel->save($model);
     }
 
     /**
@@ -207,8 +208,8 @@ public function testSaveOptionNewUserDefinedAttribute()
     public function testSaveOptionNoValue()
     {
         /** @var $connectionMock \PHPUnit_Framework_MockObject_MockObject */
-        /** @var $resourceModelMock \Magento\Eav\Model\ResourceModel\Entity\Attribute */
-        list($connectionMock, $resourceModelMock) = $this->_prepareResourceModel();
+        /** @var $resourceModel \Magento\Eav\Model\ResourceModel\Entity\Attribute */
+        list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         /** @var $model \Magento\Framework\Model\AbstractModel */
@@ -221,7 +222,7 @@ public function testSaveOptionNoValue()
         $connectionMock->expects($this->never())->method('delete');
         $connectionMock->expects($this->never())->method('update');
 
-        $resourceModelMock->save($model);
+        $resourceModel->save($model);
     }
 
     /**
@@ -331,18 +332,29 @@ protected function _prepareResourceModel()
         $contextMock->expects($this->once())->method('getResources')->willReturn($resource);
         $contextMock->expects($this->once())->method('getObjectRelationProcessor')->willReturn($relationProcessorMock);
 
+        $configMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)->disableOriginalConstructor()->getMock();
+        $attributeCacheMock = $this->getMockBuilder(
+            \Magento\Eav\Model\Entity\AttributeCache::class
+        )->disableOriginalConstructor()->getMock();
         $arguments = [
             'context' => $contextMock,
             'storeManager' => $storeManager,
             'eavEntityType' => $eavEntityType,
         ];
-        $resourceModelMock = $this->getMock(
-            'Magento\Eav\Model\ResourceModel\Entity\Attribute',
-            ['getAdditionalAttributeTable'],
-            $arguments
+        $helper = new ObjectManager($this);
+        $resourceModel = $helper->getObject(\Magento\Eav\Model\ResourceModel\Entity\Attribute::class, $arguments);
+        $helper->setBackwardCompatibleProperty(
+            $resourceModel,
+            'config',
+            $configMock
         );
-
-        return [$connectionMock, $resourceModelMock];
+        $helper->setBackwardCompatibleProperty(
+            $resourceModel,
+            'attributeCache',
+            $attributeCacheMock
+        );
+        
+        return [$connectionMock, $resourceModel];
     }
 
     /**