CE-33709: Changed method adding for the generated extensions types

bohdan-harniuk · bohdan-harniuk · commit fd875841e6bf · 2021-08-22T09:18:18.000+03:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php
@@ -94,7 +94,7 @@ public function testExecute(): void
 
         $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['setCategoryLinks'])
+            ->addMethods(['setCategoryLinks'])
             ->getMockForAbstractClass();
         $extensionAttributes->expects(static::once())->method('setCategoryLinks')->with($dtoCategoryLinks);
 
@@ -127,7 +127,7 @@ public function testExecuteNullExtensionAttributes(): void
 
         $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['setCategoryLinks'])
+            ->addMethods(['setCategoryLinks'])
             ->getMockForAbstractClass();
         $extensionAttributes->expects(static::once())->method('setCategoryLinks')->with(null);
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
@@ -88,7 +88,7 @@ public function testExecute(
 
         $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['setCategoryLinks', 'getCategoryLinks'])
+            ->addMethods(['setCategoryLinks', 'getCategoryLinks'])
             ->getMockForAbstractClass();
         $extensionAttributes->expects(static::any())
             ->method('getCategoryLinks')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -310,7 +310,7 @@ private function getProductTierPriceExtensionInterfaceMock(): MockObject
         $mockBuilder = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
             ->disableOriginalConstructor();
         try {
-            $mockBuilder->onlyMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);
+            $mockBuilder->addMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);
         } catch (RuntimeException $e) {
             // ProductTierPriceExtensionInterface already generated and has all necessary methods.
         }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -430,7 +430,7 @@ protected function setUp(): void
         $this->eavConfig = $this->createMock(Config::class);
 
         $this->productExtAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->onlyMethods(['getStockItem'])
+            ->addMethods(['getStockItem'])
             ->getMockForAbstractClass();
         $this->extensionAttributesFactory
             ->expects($this->any())
@@ -842,7 +842,8 @@ public function getIdentitiesProvider(): array
     {
         $extensionAttributesMock = $this->getMockBuilder(ExtensionAttributesInterface::class)
             ->disableOriginalConstructor()
-            ->addMethods(['getStockItem'])->getMockForAbstractClass();
+            ->addMethods(['getStockItem'])
+            ->getMockForAbstractClass();
         $stockItemMock = $this->getMockBuilder(StockItemInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
@@ -632,7 +632,7 @@ private function getCartExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(CartExtension::class);
         try {
-            $mockBuilder->onlyMethods(['getShippingAssignments', 'setShippingAssignments']);
+            $mockBuilder->addMethods(['getShippingAssignments', 'setShippingAssignments']);
         } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
@@ -174,7 +174,7 @@ private function getPaymentExtension(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
-            $mockBuilder->onlyMethods(['getAgreementIds']);
+            $mockBuilder->addMethods(['getAgreementIds']);
         } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
@@ -203,7 +203,7 @@ private function getPaymentExtension(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
-            $mockBuilder->onlyMethods(['getAgreementIds']);
+            $mockBuilder->addMethods(['getAgreementIds']);
         } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
@@ -182,7 +182,7 @@ public function testAddChild(): void
             ->getMock();
         $extensionAttributesMock = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(
+            ->addMethods(
                 [
                     'getConfigurableProductOptions',
                     'setConfigurableProductOptions',
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
@@ -285,7 +285,7 @@ public function testSave(): void
             ->with('_cache_instance_used_product_attribute_ids')
             ->willReturn(true);
         $extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->onlyMethods(['getConfigurableProductOptions', 'getConfigurableProductLinks'])
+            ->addMethods(['getConfigurableProductOptions', 'getConfigurableProductLinks'])
             ->getMockForAbstractClass();
         $this->entityMetadata->expects($this->any())
             ->method('getLinkField')
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
@@ -134,7 +134,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->groupExtensionMock = $this->getMockBuilder(GroupExtension::class)
-            ->onlyMethods(['setExcludeWebsiteIds'])
+            ->addMethods(['setExcludeWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Plugin/SaveCustomerGroupExcludedWebsiteTest.php b/app/code/Magento/Customer/Test/Unit/Model/Plugin/SaveCustomerGroupExcludedWebsiteTest.php
@@ -98,7 +98,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->groupExtensionMock = $this->getMockBuilder(GroupExtensionInterface::class)
-            ->onlyMethods(['getExcludeWebsiteIds'])
+            ->addMethods(['getExcludeWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/CatalogRule/AddCustomerGroupExcludedWebsiteTest.php b/app/code/Magento/Customer/Test/Unit/Observer/CatalogRule/AddCustomerGroupExcludedWebsiteTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->ruleExtensionMock = $this->getMockBuilder(RuleExtension::class)
-            ->onlyMethods(['setExcludeWebsiteIds'])
+            ->addMethods(['setExcludeWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->observerMock->expects(self::atLeastOnce())
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php
@@ -156,7 +156,7 @@ private function getProductExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor();
         try {
-            $mockBuilder->onlyMethods(['getDownloadableProductLinks']);
+            $mockBuilder->addMethods(['getDownloadableProductLinks']);
         } catch (RuntimeException $e) {
             // ProductExtension already generated.
         }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
@@ -250,7 +250,7 @@ private function getProductOptionExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(ProductOptionExtension::class);
         try {
-            $mockBuilder->onlyMethods(['setDownloadableOption']);
+            $mockBuilder->addMethods(['setDownloadableOption']);
         } catch (RuntimeException $e) {
             // ProductOptionExtension already generated.
         }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
@@ -156,7 +156,7 @@ private function getProductExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor();
         try {
-            $mockBuilder->onlyMethods(['getDownloadableProductSamples']);
+            $mockBuilder->addMethods(['getDownloadableProductSamples']);
         } catch (RuntimeException $e) {
             // Product extension already generated.
         }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php
@@ -279,7 +279,7 @@ private function getOrderExtensionMock(): MockObject
     {
         $mockObject = $this->getMockBuilder(OrderExtension::class);
         try {
-            $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // Order extension already generated.
         }
@@ -296,7 +296,7 @@ private function getOrderItemExtensionMock(): MockObject
     {
         $mockObject = $this->getMockBuilder(OrderItemExtension::class);
         try {
-            $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // Order extension already generated.
         }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -199,7 +199,7 @@ private function getOrderExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(OrderExtension::class);
         try {
-            $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // OrderExtension already generated.
         }
@@ -216,7 +216,7 @@ private function getOrderItemExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(OrderItemExtension::class);
         try {
-            $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // OrderItemExtension already generated.
         }
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
@@ -122,7 +122,7 @@ private function getCartExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(CartExtensionInterface::class)
             ->disableOriginalConstructor();
         try {
-            $mockBuilder->onlyMethods(['getShippingAssignments', 'setShippingAssignments']);
+            $mockBuilder->addMethods(['getShippingAssignments', 'setShippingAssignments']);
         } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -429,7 +429,7 @@ private function getExtensionAttributesMock(): MockObject
     {
         $extensionMockBuilder = $this->getMockBuilder(CartExtensionInterface::class);
         try {
-            $extensionMockBuilder->onlyMethods(['setShippingAssignments']);
+            $extensionMockBuilder->addMethods(['setShippingAssignments']);
         } catch (RuntimeException $e) {
             // do nothing as CartExtensionInterface already generated and has 'setShippingAssignments' method.
         }
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php b/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php
@@ -237,8 +237,13 @@ private function getProductAttributeMediaGalleryEntryExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(ProductAttributeMediaGalleryEntryExtension::class)
             ->disableOriginalConstructor();
         try {
-            $mockBuilder->onlyMethods(['setVideoContent', 'getVideoContent'])
-                ->addMethods(['getVideoProvider']);
+            $mockBuilder->addMethods(
+                [
+                    'setVideoContent',
+                    'getVideoContent',
+                    'getVideoProvider'
+                ]
+            );
         } catch (RuntimeException $e) {
             // ProductAttributeMediaGalleryEntryExtension already generated and has all necessary methods.
         }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -141,7 +141,7 @@ public function testCollect(
         $product->expects($this->any())->method('getStore')->willReturn($store);
         $product->expects($this->any())->method('isVisibleInCatalog')->will($this->returnValue(true));
         $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->onlyMethods(['getStockItem'])
+            ->addMethods(['getStockItem'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $extensionAttribute->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/ItemTest.php
@@ -525,7 +525,7 @@ private function generateProductMock(
             ->method('getStore')
             ->willReturn($store);
         $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->onlyMethods(['getStockItem'])
+            ->addMethods(['getStockItem'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $extensionAttribute->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressAssignmentTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressAssignmentTest.php
@@ -131,7 +131,7 @@ private function getCartExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(CartExtension::class);
         try {
-            $mockBuilder->onlyMethods(['setShippingAssignments']);
+            $mockBuilder->addMethods(['setShippingAssignments']);
         } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -254,7 +254,7 @@ private function getOrderExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(OrderExtensionInterface::class)->disableOriginalConstructor();
         try {
             $mockBuilder
-                ->onlyMethods(
+                ->addMethods(
                     [
                         'getShippingAssignments',
                         'setAppliedTaxes',
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
@@ -739,7 +739,7 @@ protected function setupAddressMock(
             ->getMock();
         $cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getShippingAssignments'])
+            ->addMethods(['getShippingAssignments'])
             ->getMockForAbstractClass();
 
         $quoteMock->method('getStore')
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -108,7 +108,7 @@ protected function setupExtensionAttributeMock(): MockObject
     {
         $orderExtensionAttributeMock = $this->getMockBuilder(OrderExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(
+            ->addMethods(
                 [
                     'getAppliedTaxes',
                     'getConvertingFromQuote',
diff --git a/app/code/Magento/WeeeGraphQl/Test/Unit/Model/Resolver/FixedProductTaxResolverTest.php b/app/code/Magento/WeeeGraphQl/Test/Unit/Model/Resolver/FixedProductTaxResolverTest.php
@@ -128,7 +128,7 @@ protected function setUp(): void
             ->getMock();
 
         $this->contextExtensionAttributesMock = $this->getMockBuilder(ContextExtensionInterface::class)
-            ->onlyMethods(['getStore'])
+            ->addMethods(['getStore'])
             ->getMockForAbstractClass();
         $this->storeMock = $this->createMock(StoreInterface::class);
         $this->cartItemMock = $this->createMock(CartItemInterface::class);

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ private function getProductTierPriceExtensionInterfaceMock(): MockObject`
`310`	`310`	`$mockBuilder = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)`
`311`	`311`	`->disableOriginalConstructor();`
`312`	`312`	`try {`
`313`		`- $mockBuilder->onlyMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);`
	`313`	`+ $mockBuilder->addMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);`
`314`	`314`	`} catch (RuntimeException $e) {`
`315`	`315`	`// ProductTierPriceExtensionInterface already generated and has all necessary methods.`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ private function getCartExtensionMock(): MockObject`
`632`	`632`	`{`
`633`	`633`	`$mockBuilder = $this->getMockBuilder(CartExtension::class);`
`634`	`634`	`try {`
`635`		`- $mockBuilder->onlyMethods(['getShippingAssignments', 'setShippingAssignments']);`
	`635`	`+ $mockBuilder->addMethods(['getShippingAssignments', 'setShippingAssignments']);`
`636`	`636`	`} catch (RuntimeException $e) {`
`637`	`637`	`// CartExtension already generated.`
`638`	`638`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private function getPaymentExtension(): MockObject`
`174`	`174`	`{`
`175`	`175`	`$mockBuilder = $this->getMockBuilder(PaymentExtension::class);`
`176`	`176`	`try {`
`177`		`- $mockBuilder->onlyMethods(['getAgreementIds']);`
	`177`	`+ $mockBuilder->addMethods(['getAgreementIds']);`
`178`	`178`	`} catch (RuntimeException $e) {`
`179`	`179`	`// Payment extension already generated.`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private function getPaymentExtension(): MockObject`
`203`	`203`	`{`
`204`	`204`	`$mockBuilder = $this->getMockBuilder(PaymentExtension::class);`
`205`	`205`	`try {`
`206`		`- $mockBuilder->onlyMethods(['getAgreementIds']);`
	`206`	`+ $mockBuilder->addMethods(['getAgreementIds']);`
`207`	`207`	`} catch (RuntimeException $e) {`
`208`	`208`	`// Payment extension already generated.`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function testAddChild(): void`
`182`	`182`	`->getMock();`
`183`	`183`	`$extensionAttributesMock = $this->getMockBuilder(ProductExtensionInterface::class)`
`184`	`184`	`->disableOriginalConstructor()`
`185`		`- ->onlyMethods(`
	`185`	`+ ->addMethods(`
`186`	`186`	`[`
`187`	`187`	`'getConfigurableProductOptions',`
`188`	`188`	`'setConfigurableProductOptions',`