MAGETWO-65245: parent_id of deleted configurable product variation does not get sent to ElasticSearch

nmalevanec · nmalevanec · commit d33e2053c91c · 2017-05-25T09:49:03.000+03:00
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer;
 
-use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Framework\EntityManager\EntityMetadata;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Search\Request\DimensionFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -56,13 +54,6 @@ class FulltextTest extends \PHPUnit_Framework_TestCase
      */
     private $indexSwitcher;
 
-    /**
-     * Holder for MetadataPool mock instance.
-     *
-     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $metadataPool;
-
     protected function setUp()
     {
         $this->fullAction = $this->getClassMock(\Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class);
@@ -104,10 +95,6 @@ protected function setUp()
             ->setMethods(['switchIndex'])
             ->getMock();
 
-        $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
@@ -122,7 +109,6 @@ protected function setUp()
                 'indexSwitcher' => $this->indexSwitcher,
             ]
         );
-        $objectManagerHelper->setBackwardCompatibleProperty($this->model, 'metadataPool', $this->metadataPool);
     }
 
     /**
@@ -139,13 +125,15 @@ public function testExecute()
         $ids = [1, 2, 3];
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
         $indexData = new \ArrayObject([]);
+        $this->fulltextResource->expects($this->exactly(2))
+            ->method('getRelationsByChild')
+            ->willReturn($ids);
         $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
-        $this->mockGetRelationsByChild($ids);
 
         $this->model->execute($ids);
     }
@@ -196,13 +184,15 @@ public function testExecuteList()
         $ids = [1, 2, 3];
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
         $indexData = new \ArrayObject([]);
+        $this->fulltextResource->expects($this->exactly(2))
+            ->method('getRelationsByChild')
+            ->willReturn($ids);
         $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
-        $this->mockGetRelationsByChild($ids);
 
         $this->model->executeList($ids);
     }
@@ -212,90 +202,16 @@ public function testExecuteRow()
         $id = 1;
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
         $indexData = new \ArrayObject([]);
+        $this->fulltextResource->expects($this->exactly(2))
+            ->method('getRelationsByChild')
+            ->willReturn([$id]);
         $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
-        $this->mockGetRelationsByChild([$id]);
 
         $this->model->executeRow($id);
     }
-
-    /**
-     * Mock getRelationsByChild() method.
-     *
-     * @param array $ids
-     * @return void
-     */
-    private function mockGetRelationsByChild(array $ids)
-    {
-        $testTable1 = 'testTable1';
-        $testTable2 = 'testTable2';
-        $fieldForParent = 'testLinkField';
-
-        $metadata = $this->getMockBuilder(EntityMetadata::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $metadata->expects($this->exactly(2))
-            ->method('getLinkField')
-            ->willReturn($fieldForParent);
-
-        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $select->expects($this->exactly(2))
-            ->method('from')
-            ->with(['relation' => $testTable1])
-            ->willReturnSelf();
-        $select->expects($this->exactly(2))
-            ->method('distinct')
-            ->with(true)
-            ->willReturnSelf();
-        $select->expects($this->exactly(2))
-            ->method('where')
-            ->with('relation.child_id IN (?)', $ids)
-            ->willReturnSelf();
-        $select->expects($this->exactly(2))
-            ->method('join')
-            ->with(
-                ['cpe' => $testTable2],
-                'cpe.' . $fieldForParent . ' = relation.parent_id',
-                ['cpe.entity_id']
-            )->willReturnSelf();
-
-        $connection = $this->getMockBuilder(Mysql::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $connection->expects($this->exactly(2))
-            ->method('select')
-            ->willReturn($select);
-        $connection->expects($this->exactly(2))
-            ->method('fetchCol')
-            ->with($select)
-            ->willReturn($ids);
-
-        $this->fulltextResource->expects($this->exactly(2))
-            ->method('getConnection')
-            ->willReturn($connection);
-        $this->fulltextResource->expects($this->exactly(4))
-            ->method('getTable')
-            ->withConsecutive(
-                ['catalog_product_relation'],
-                ['catalog_product_entity'],
-                ['catalog_product_relation'],
-                ['catalog_product_entity']
-            )
-            ->will($this->onConsecutiveCalls(
-                $testTable1,
-                $testTable2,
-                $testTable1,
-                $testTable2
-            ));
-        $this->metadataPool->expects($this->exactly(2))
-            ->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadata);
-    }
 }
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php
@@ -9,6 +9,8 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
@@ -29,6 +31,13 @@ class FulltextTest extends \PHPUnit_Framework_TestCase
      */
     private $context;
 
+    /**
+     * Holder for MetadataPool mock object.
+     *
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
     /**
      * @var Fulltext
      */
@@ -51,12 +60,16 @@ protected function setUp()
         $this->resource->expects($this->once())
             ->method('getConnection')
             ->willReturn($this->connection);
+        $this->metadataPool = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $objectManager = new ObjectManager($this);
         $this->target = $objectManager->getObject(
             \Magento\CatalogSearch\Model\ResourceModel\Fulltext::class,
             [
                 'context' => $this->context,
+                'metadataPool' => $this->metadataPool
             ]
         );
     }
@@ -74,4 +87,71 @@ public function testResetSearchResult()
         $result = $this->target->resetSearchResults();
         $this->assertEquals($this->target, $result);
     }
+
+    /**
+     * @covers \Magento\CatalogSearch\Model\ResourceModel\Fulltext::getRelationsByChild()
+     */
+    public function testGetRelationsByChild()
+    {
+        $ids = [1, 2, 3];
+        $testTable1 = 'testTable1';
+        $testTable2 = 'testTable2';
+        $fieldForParent = 'testLinkField';
+
+        $metadata = $this->getMockBuilder(EntityMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $metadata->expects($this->once())
+            ->method('getLinkField')
+            ->willReturn($fieldForParent);
+
+        $this->metadataPool->expects($this->once())
+            ->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($metadata);
+
+        $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->once())
+            ->method('from')
+            ->with(['relation' => $testTable1])
+            ->willReturnSelf();
+        $select->expects($this->once())
+            ->method('distinct')
+            ->with(true)
+            ->willReturnSelf();
+        $select->expects($this->once())
+            ->method('where')
+            ->with('relation.child_id IN (?)', $ids)
+            ->willReturnSelf();
+        $select->expects($this->once())
+            ->method('join')
+            ->with(
+                ['cpe' => $testTable2],
+                'cpe.' . $fieldForParent . ' = relation.parent_id',
+                ['cpe.entity_id']
+            )->willReturnSelf();
+
+        $this->connection->expects($this->once())
+            ->method('select')
+            ->willReturn($select);
+        $this->connection->expects($this->once())
+            ->method('fetchCol')
+            ->with($select)
+            ->willReturn($ids);
+
+        $this->resource->expects($this->exactly(2))
+            ->method('getTableName')
+            ->withConsecutive(
+                ['catalog_product_relation', ResourceConnection::DEFAULT_CONNECTION],
+                ['catalog_product_entity', ResourceConnection::DEFAULT_CONNECTION]
+            )
+            ->will($this->onConsecutiveCalls(
+                $testTable1,
+                $testTable2
+            ));
+
+        self::assertSame($ids, $this->target->getRelationsByChild($ids));
+    }
 }
