MC-24010: Broken integration test RelationTest.php on mainline 2.3

Author: OlgaVasyltsun

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RelationTest.php

@@ -11,7 +11,12 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\TestFramework\Catalog\Model\Indexer\Product\Flat\Action\Full as FlatIndexerFull;
+use Magento\Catalog\Model\Indexer\Product\Flat\Action\Full as FlatIndexerFull;
+use Magento\Catalog\Helper\Product\Flat\Indexer;
+use Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder;
+use Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Test relation customization
@@ -42,33 +47,79 @@ class RelationTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $flatUpdated = [];
 
+    /**
+     * @var Indexer
+     */
+    private $productIndexerHelper;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
-        $tableBuilderMock = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\TableBuilder::class);
-        $flatTableBuilderMock = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class);
+        $tableBuilderMock = $objectManager->get(TableBuilder::class);
+        $flatTableBuilderMock =
+            $objectManager->get(FlatTableBuilder::class);
 
-        $productIndexerHelper = $objectManager->create(
-            \Magento\Catalog\Helper\Product\Flat\Indexer::class,
-            ['addChildData' => 1]
+        $this->productIndexerHelper = $objectManager->create(
+            Indexer::class,
+            ['addChildData' => true]
         );
         $this->indexer = $objectManager->create(
             FlatIndexerFull::class,
             [
-                'productHelper' => $productIndexerHelper,
+                'productHelper' => $this->productIndexerHelper,
                 'tableBuilder' => $tableBuilderMock,
                 'flatTableBuilder' => $flatTableBuilderMock
             ]
         );
-        $this->storeManager = $objectManager->create(StoreManagerInterface::class);
+        $this->storeManager = $objectManager->get(StoreManagerInterface::class);
         $this->connection = $objectManager->get(ResourceConnection::class)->getConnection();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        foreach ($this->flatUpdated as $flatTable) {
+            $this->connection->dropColumn($flatTable, 'child_id');
+            $this->connection->dropColumn($flatTable, 'is_child');
+        }
+    }
+
+    /**
+     * Test that SQL generated for relation customization is valid
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws \Exception
+     */
+    public function testExecute() : void
+    {
+        $this->addChildColumns();
+        try {
+            $result = $this->indexer->execute();
+        } catch (LocalizedException $e) {
+            if ($e->getPrevious() instanceof \Zend_Db_Statement_Exception) {
+                $this->fail($e->getMessage());
+            }
+            throw $e;
+        }
+        $this->assertInstanceOf(FlatIndexerFull::class, $result);
+    }
 
+    /**
+     * Add child columns to tables if needed
+     *
+     * @return void
+     */
+    private function addChildColumns(): void
+    {
         foreach ($this->storeManager->getStores() as $store) {
-            $flatTable = $productIndexerHelper->getFlatTableName($store->getId());
+            $flatTable = $this->productIndexerHelper->getFlatTableName($store->getId());
             if ($this->connection->isTableExists($flatTable) &&
                 !$this->connection->tableColumnExists($flatTable, 'child_id') &&
                 !$this->connection->tableColumnExists($flatTable, 'is_child')
@@ -103,35 +154,4 @@ protected function setUp(): void
             }
         }
     }
-
-    /**
-     * @inheritdoc
-     */
-    protected function tearDown(): void
-    {
-        foreach ($this->flatUpdated as $flatTable) {
-            $this->connection->dropColumn($flatTable, 'child_id');
-            $this->connection->dropColumn($flatTable, 'is_child');
-        }
-    }
-
-    /**
-     * Test that SQL generated for relation customization is valid
-     *
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Exception
-     */
-    public function testExecute() : void
-    {
-        $this->markTestSkipped('MC-19675');
-        try {
-            $this->indexer->execute();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            if ($e->getPrevious() instanceof \Zend_Db_Statement_Exception) {
-                $this->fail($e->getMessage());
-            }
-            throw $e;
-        }
-    }
 }