Updated Unit Tests for new Class

Author: Graham Wharton

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php

@@ -12,7 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\StoreWebsiteRelationInterface;
 use Magento\Store\Model\Store;
-use Magento\UrlRewrite\Model\Storage\DbStorage;
+use Magento\UrlRewrite\Model\Storage\DeleteEntitiesFromStores;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Event;
@@ -116,9 +116,9 @@ class ProductProcessUrlRewriteSavingObserverTest extends TestCase
     private $productRepository;
 
     /**
-     * @var DbStorage|MockObject
+     * @var DeleteEntitiesFromStores|MockObject
      */
-    private $dbStorage;
+    private $deleteEntitiesFromStores;
 
     /**
      * Set up
@@ -165,7 +165,10 @@ protected function setUp()
                 [1, false, 2, true, $this->product2],
                 [1, false, 5, true, $this->product5]
             ]));
-        $this->dbStorage = $this->createPartialMock(DbStorage::class, ['deleteEntitiesFromStores']);
+        $this->deleteEntitiesFromStores = $this->createPartialMock(
+            DeleteEntitiesFromStores::class,
+            ['execute']
+        );
         $this->event = $this->createPartialMock(Event::class, ['getProduct']);
         $this->event->expects($this->any())->method('getProduct')->willReturn($this->product);
         $this->observer = $this->createPartialMock(Observer::class, ['getEvent']);
@@ -216,7 +219,7 @@ protected function setUp()
                 'storeManager' => $this->storeManager,
                 'storeWebsiteRelation' => $this->storeWebsiteRelation,
                 'productRepository' => $this->productRepository,
-                'dbStorage' => $this->dbStorage,
+                'deleteEntitiesFromStores' => $this->deleteEntitiesFromStores,
                 'productScopeRewriteGenerator' => $this->productScopeRewriteGenerator
             ]
         );
@@ -387,8 +390,8 @@ public function testExecuteUrlKey(
             ->method('replace')
             ->with([1 => 'rewrite']);
 
-        $this->dbStorage->expects($this->any())
-            ->method('deleteEntitiesFromStores')
+        $this->deleteEntitiesFromStores->expects($this->any())
+            ->method('execute')
             ->with(
                 $expectedRemoves,
                 [1],

app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/ProductProcessUrlRewriteRemovingPluginTest.php

@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Product\Action;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\UrlRewrite\Model\Storage\DbStorage;
+use Magento\UrlRewrite\Model\Storage\DeleteEntitiesFromStores;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
@@ -97,9 +97,9 @@ class ProductProcessUrlRewriteRemovingPluginTest extends TestCase
     private $storeWebsiteRelation;
 
     /**
-     * @var DbStorage|MockObject
+     * @var DeleteEntitiesFromStores|MockObject
      */
-    private $dbStorage;
+    private $deleteEntitiesFromStores;
 
     /**
      * Set up
@@ -153,7 +153,10 @@ protected function setUp()
                 [3, false, 0, true, $this->product3]
             ]));
 
-        $this->dbStorage = $this->createPartialMock(DbStorage::class, ['deleteEntitiesFromStores']);
+        $this->deleteEntitiesFromStores = $this->createPartialMock(
+            DeleteEntitiesFromStores::class,
+            ['execute']
+        );
 
         $this->subject = $this->createMock(
             Action::class
@@ -167,7 +170,7 @@ protected function setUp()
                 'storeWebsiteRelation' => $this->storeWebsiteRelation,
                 'urlPersist' => $this->urlPersist,
                 'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
-                'dbStorage' => $this->dbStorage
+                'deleteEntitiesFromStores' => $this->deleteEntitiesFromStores
 
             ]
         );
@@ -320,8 +323,8 @@ public function testAfterUpdateWebsites(
             ->method('replace')
             ->with($rewrites);
 
-        $this->dbStorage->expects($this->exactly($expectedDeleteCount))
-            ->method('deleteEntitiesFromStores')
+        $this->deleteEntitiesFromStores->expects($this->exactly($expectedDeleteCount))
+            ->method('execute')
             ->with(
                 $expectedStoreRemovals,
                 $productids,