magento#27638 Fix fatal errors in Unit Tests

lbajsarowicz · Apr 10, 2020 · f34f8c3 · f34f8c3
1 parent a73532a
commit f34f8c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-use Magento\Catalog\Api\Data\ProductExtension;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Product;
@@ -106,9 +106,9 @@ protected function setUp()
     public function testCopy(): void
     {
         $stockItem = $this->createMock(StockItemInterface::class);
-        $extensionAttributes = $this->getMockBuilder(ProductExtension::class)
+        $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem', 'setData'])
-            ->getMock();
+            ->getMockForAbstractClass();
         $extensionAttributes
             ->expects($this->once())
             ->method('getStockItem')
@@ -262,9 +262,9 @@ public function testUrlAlreadyExistsExceptionWhileCopyStoresUrl(): void
     {
         $stockItem = $this->getMockBuilder(StockItemInterface::class)
             ->getMock();
-        $extensionAttributes = $this->getMockBuilder(ProductExtension::class)
+        $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem', 'setData'])
-            ->getMock();
+            ->getMockForAbstractClass();
         $extensionAttributes
             ->expects($this->once())
             ->method('getStockItem')

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/ReadHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/ReadHandlerTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Website;
 
-use Magento\Catalog\Api\Data\ProductExtension;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Website\ReadHandler;
 use Magento\Catalog\Model\ResourceModel\Product as ResourceModel;
@@ -27,10 +27,10 @@ public function setUp()
         $this->websiteLink = $this->getMockBuilder(ResourceModel\Website\Link::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extensionAttributes = $this->getMockBuilder(ProductExtension::class)
+        $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['setWebsiteIds', 'getWebsiteIds'])
             ->disableArgumentCloning()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->readHandler = new ReadHandler($this->websiteLink);
     }
 

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Website;
 
-use Magento\Catalog\Api\Data\ProductExtension;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
 use Magento\Catalog\Model\Product\Website\SaveHandler;

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -175,7 +175,7 @@ class ProductRepositoryTest extends TestCase
     /**
      * @var ProductExtensionInterface|MockObject
      */
-    private $productExtension;
+    private $ProductExtensionInterface;
 
     /**
      * @var Json|MockObject

diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
@@ -149,7 +149,7 @@ public function testAddChild()
             ->disableOriginalConstructor()
             ->setMethods(['getId', 'getData'])
             ->getMock();
-        $extensionAttributesMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtension::class)
+        $extensionAttributesMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -158,7 +158,7 @@ public function testAddChild()
                     'setConfigurableProductLinks'
                 ]
             )
-            ->getMock();
+            ->getMockForAbstractClass();
         $optionMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\Option::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProductAttribute', 'getPosition', 'getAttributeId'])