Merge remote-tracking branch 'origin/MC-20660' into 2.3-develop-com-pr3

Author: zakdma

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
@@ -19,6 +20,8 @@
 
 /**
  * Provide tests for loading gallery images on product load.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -47,6 +50,11 @@ class ReadHandlerTest extends \PHPUnit\Framework\TestCase
      */
     private $productResource;
 
+    /**
+     * @var Gallery
+     */
+    private $galleryResource;
+
     /**
      * @var StoreRepositoryInterface
      */
@@ -67,6 +75,7 @@ protected function setUp()
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productFactory = $this->objectManager->get(ProductInterfaceFactory::class);
         $this->productResource = $this->objectManager->get(ProductResource::class);
+        $this->galleryResource = $this->objectManager->create(Gallery::class);
         $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
         $this->productLinkField =  $this->objectManager->get(MetadataPool::class)
             ->getMetadata(ProductInterface::class)
@@ -261,6 +270,20 @@ public function executeOnStoreViewDataProvider(): array
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE));
+    }
+
     /**
      * Returns product for testing.
      *