ACP2E-3972: Csv product import : Unable to unset a swatch image

Author: aplapana

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php

@@ -96,14 +96,14 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
+
     /**
      * @return void
      */
-    public function testHideImageWhenColumnContainsEmptyValue(): void
+    public function testImportProductsWithSameImages(): void
     {
-        $productSku = 'ABC';
         $this->moveImages('magento_image.jpg');
-        $source = $this->prepareFile('catalog_import_products_with_swatch_image.csv');
+        $source = $this->prepareFile('catalog_import_products_with_same_images.csv');
         $this->updateUploader();
         $errors = $this->import->setParameters([
             'behavior' => Import::BEHAVIOR_ADD_UPDATE,
@@ -112,11 +112,19 @@ public function testHideImageWhenColumnContainsEmptyValue(): void
             ->setSource($source)->validateData();
         $this->assertEmpty($errors->getAllErrors());
         $this->import->importData();
-        $this->createdProductsSkus[] =  $productSku;
+        $this->createdProductsSkus = ['SimpleProductForTest1', 'SimpleProductForTest2'];
         $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
+    }
 
-        $this->importDataResource->cleanBunches();
-        $source = $this->prepareFile('catalog_import_products_without_swatch_image.csv');
+    /**
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function testHideImageWhenColumnContainsEmptyValue(): void
+    {
+        $productSku = 'ABC';
+        $this->moveImages('magento_image.jpg');
+        $source = $this->prepareFile('catalog_import_products_with_swatch_image.csv');
         $this->updateUploader();
         $errors = $this->import->setParameters([
             'behavior' => Import::BEHAVIOR_ADD_UPDATE,
@@ -125,19 +133,11 @@ public function testHideImageWhenColumnContainsEmptyValue(): void
             ->setSource($source)->validateData();
         $this->assertEmpty($errors->getAllErrors());
         $this->import->importData();
-        $this->productRepository->cleanCache();
-        $product = $this->productRepository->get($productSku);
-        $images = $product->getMediaGalleryImages();
-        $this->assertEmpty($images->getItems());
-    }
+        $this->createdProductsSkus[] = $productSku;
+        $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
 
-    /**
-     * @return void
-     */
-    public function testImportProductsWithSameImages(): void
-    {
-        $this->moveImages('magento_image.jpg');
-        $source = $this->prepareFile('catalog_import_products_with_same_images.csv');
+        $this->importDataResource->cleanBunches();
+        $source = $this->prepareFile('catalog_import_products_without_swatch_image.csv');
         $this->updateUploader();
         $errors = $this->import->setParameters([
             'behavior' => Import::BEHAVIOR_ADD_UPDATE,
@@ -146,8 +146,10 @@ public function testImportProductsWithSameImages(): void
             ->setSource($source)->validateData();
         $this->assertEmpty($errors->getAllErrors());
         $this->import->importData();
-        $this->createdProductsSkus = ['SimpleProductForTest1', 'SimpleProductForTest2'];
-        $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
+        $this->productRepository->cleanCache();
+        $product = $this->productRepository->get($productSku);
+        $images = $product->getMediaGalleryImages();
+        $this->assertEmpty($images->getItems());
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_swatch_image.csv

@@ -1,2 +1,2 @@
-sku,name,swatch_image,swatch_image_label,attribute_set_code,product_type,categories,product_websites
-ABC,abc,magento_image.jpg,testing,Default,simple,Default,base
+sku,name,swatch_image,swatch_image_label,attribute_set_code,product_type,product_websites
+ABC,abc,magento_image.jpg,testing,Default,simple,base