Merge branch '2.3-develop-phpunit9' of github.com:magento-commerce/magento2ce into merge-from-phpunit9

Author: svera

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php

@@ -68,6 +68,11 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
      */
     private $writer;
 
+    /**
+     * @var string
+     */
+    private $csvFile;
+
     /**
      * @inheritdoc
      */
@@ -87,6 +92,11 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->executeFixtures($this->fixtures, true);
+
+        if ($this->csvFile !== null) {
+            $directoryWrite = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+            $directoryWrite->delete($this->csvFile);
+        }
     }
 
     /**
@@ -101,20 +111,53 @@ protected function tearDown(): void
      * @param string[] $skippedAttributes
      * @return void
      * @dataProvider exportImportDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
     {
+        $this->csvFile = null;
         $this->fixtures = $fixtures;
         $this->executeFixtures($fixtures);
         $this->modifyData($skus);
         $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
         $csvFile = $this->executeExportTest($skus, $skippedAttributes);
 
         $this->executeImportReplaceTest($skus, $skippedAttributes, false, $csvFile);
-        $this->executeImportReplaceTest($skus, $skippedAttributes, true, $csvFile);
         $this->executeImportDeleteTest($skus, $csvFile);
     }
 
+    /**
+     * Run import replace with pagination tests.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testImportReplaceWithPagination(array $fixtures, array $skus, array $skippedAttributes = []): void
+    {
+        $this->fixtures = $fixtures;
+        $this->executeFixtures($fixtures);
+        $this->modifyData($skus);
+        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
+        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
+    }
+
+    /**
+     * Data provider for import replaces tests.
+     *
+     * @return array
+     */
+    public function importReplaceDataProvider()
+    {
+        return $this->exportImportDataProvider();
+    }
+
     /**
      * Provide data for import/export.
      *
@@ -209,7 +252,7 @@ private function assertEqualsOtherThanSkippedAttributes(
 
             $this->assertEquals(
                 $value,
-                isset($actual[$key]) ? $actual[$key] : null,
+                $actual[$key] ?? null,
                 'Assert value at key - ' . $key . ' failed'
             );
         }
@@ -378,6 +421,7 @@ protected function executeImportReplaceTest(
     private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
     {
         $csvfile = uniqid('importexport_') . '.csv';
+        $this->csvFile = $csvfile;
 
         $exportProduct = $exportProduct ?: $this->objectManager->create(
             \Magento\CatalogImportExport\Model\Export\Product::class

dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php

@@ -100,15 +100,19 @@ protected function assertEqualsSpecificAttributes(
     }
 
     /**
-     * @inheritdoc
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function executeImportReplaceTest(
-        $skus,
-        $skippedAttributes,
-        $usePagination = false,
-        string $csvfile = null
-    ) {
-        $skippedAttributes = array_merge($skippedAttributes, ['_cache_instance_product_set_attributes']);
-        parent::executeImportReplaceTest($skus, $skippedAttributes, $usePagination, $csvfile);
+    public function testImportReplaceWithPagination(array $fixtures, array $skus, array $skippedAttributes = []): void
+    {
+        $skippedAttributesExtended = array_merge($skippedAttributes, ['_cache_instance_product_set_attributes']);
+        parent::testImportReplaceWithPagination($fixtures, $skus, $skippedAttributesExtended);
     }
 }

dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php

@@ -49,6 +49,23 @@ public function testImportExport(array $fixtures, array $skus, array $skippedAtt
         parent::testImportExport($fixtures, $skus, $skippedAttributes);
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @param array $fixtures
+     * @param string[] $skus
+     * @param string[] $skippedAttributes
+     * @dataProvider importReplaceDataProvider
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function testImportReplaceWithPagination(array $fixtures, array $skus, array $skippedAttributes = []) : void
+    {
+        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
+    }
+
     /**
      * @inheritdoc
      */