Merge branch 'improvement/ce-33707-fix-unit-tests-phpunit-9-3' of github.com:karyna-tsymbal-atwix/magento2 into update-phpunit-to-9-3

Author: bohdan-harniuk

app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php

@@ -78,6 +78,8 @@ protected function setUp(): void
 
     /**
      * Test process alerts with exception in loading websites
+     *
+     * @return void
      */
     public function testGetWebsitesThrowsException(): void
     {
@@ -94,6 +96,8 @@ public function testGetWebsitesThrowsException(): void
 
     /**
      * Test process alerts with exception in creating price collection
+     *
+     * @return void
      */
     public function testProcessPriceThrowsException(): void
     {
@@ -120,6 +124,8 @@ public function testProcessPriceThrowsException(): void
 
     /**
      * Test process alerts with exception in creating stock collection
+     *
+     * @return void
      */
     public function testProcessStockThrowsException(): void
     {
@@ -135,8 +141,9 @@ public function testProcessStockThrowsException(): void
         $websiteMock->method('getDefaultGroup')->willReturn($groupMock);
         $this->storeManagerMock->method('getWebsites')->willReturn([$websiteMock]);
 
-        $this->scopeConfigMock->expects($this->at(0))->method('getValue')->willReturn(false);
-        $this->scopeConfigMock->expects($this->at(1))->method('getValue')->willReturn(true);
+        $this->scopeConfigMock
+            ->method('getValue')
+            ->willReturnOnConsecutiveCalls(false, true);
 
         $this->stockColFactoryMock->expects($this->once())
             ->method('create')

app/code/Magento/Quote/Test/Unit/Model/Cart/ShippingMethodConverterTest.php

@@ -67,6 +67,9 @@ class ShippingMethodConverterTest extends TestCase
      */
     protected $taxHelper;
 
+    /**
+     * @inheriDoc
+     */
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -111,7 +114,10 @@ protected function setUp(): void
         );
     }
 
-    public function testModelToDataObject()
+    /**
+     * @return void
+     */
+    public function testModelToDataObject(): void
     {
         $customerTaxClassId = 100;
         $shippingPriceExclTax = 1000;
@@ -126,12 +132,10 @@ public function testModelToDataObject()
         $this->rateModelMock->expects($this->once())->method('getCarrier')->willReturn('CARRIER_CODE');
         $this->rateModelMock->expects($this->once())->method('getMethod')->willReturn('METHOD_CODE');
         $this->rateModelMock->expects($this->any())->method('getPrice')->willReturn($price);
-        $this->currencyMock->expects($this->at(0))
-            ->method('convert')->with($price, 'USD')->willReturn(100.12);
-        $this->currencyMock->expects($this->at(1))
-            ->method('convert')->with($shippingPriceExclTax, 'USD')->willReturn($shippingPriceExclTax);
-        $this->currencyMock->expects($this->at(2))
-            ->method('convert')->with($shippingPriceInclTax, 'USD')->willReturn($shippingPriceInclTax);
+        $this->currencyMock
+            ->method('convert')
+            ->withConsecutive([$price, 'USD'], [$shippingPriceExclTax, 'USD'], [$shippingPriceInclTax, 'USD'])
+            ->willReturnOnConsecutiveCalls(100.12, $shippingPriceExclTax, $shippingPriceInclTax);
 
         $this->rateModelMock->expects($this->once())
             ->method('getCarrierTitle')->willReturn('CARRIER_TITLE');
@@ -186,15 +190,13 @@ public function testModelToDataObject()
             ->with($shippingPriceInclTax)
             ->willReturn($this->shippingMethodMock);
 
-        $this->taxHelper->expects($this->at(0))
+        $this->taxHelper
             ->method('getShippingPrice')
-            ->with($price, false, $addressMock, $customerTaxClassId)
-            ->willReturn($shippingPriceExclTax);
-
-        $this->taxHelper->expects($this->at(1))
-            ->method('getShippingPrice')
-            ->with($price, true, $addressMock, $customerTaxClassId)
-            ->willReturn($shippingPriceInclTax);
+            ->withConsecutive(
+                [$price, false, $addressMock, $customerTaxClassId],
+                [$price, true, $addressMock, $customerTaxClassId]
+            )
+            ->willReturnOnConsecutiveCalls($shippingPriceExclTax, $shippingPriceInclTax);
 
         $this->assertEquals(
             $this->shippingMethodMock,

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php

@@ -38,27 +38,31 @@ protected function setUp(): void
     {
         $this->priceRounder = $this->getMockBuilder(PriceRounder::class)
             ->disableOriginalConstructor()
-            ->setMethods(['roundPrice'])
+            ->addMethods(['roundPrice'])
             ->getMockForAbstractClass();
 
         $helper = new ObjectManager($this);
         $this->model = $helper->getObject(
             Grand::class,
             [
-                'priceRounder' => $this->priceRounder,
+                'priceRounder' => $this->priceRounder
             ]
         );
     }
 
-    public function testCollect()
+    /**
+     * @return void
+     */
+    public function testCollect(): void
     {
         $totals = [1, 2, 3.4];
         $totalsBase = [4, 5, 6.7];
         $grandTotal = 6.4; // 1 + 2 + 3.4
         $grandTotalBase = 15.7; // 4 + 5 + 6.7
 
-        $this->priceRounder->expects($this->at(0))->method('roundPrice')->willReturn($grandTotal + 2);
-        $this->priceRounder->expects($this->at(1))->method('roundPrice')->willReturn($grandTotalBase + 2);
+        $this->priceRounder
+            ->method('roundPrice')
+            ->willReturnOnConsecutiveCalls($grandTotal + 2, $grandTotalBase + 2);
 
         $totalMock = $this->getMockBuilder(Total::class)
             ->addMethods(['setGrandTotal', 'setBaseGrandTotal', 'getGrandTotal', 'getBaseGrandTotal'])

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

@@ -32,34 +32,54 @@ class ShippingTest extends TestCase
      */
     protected $shippingModel;
 
-    /** @var Quote|MockObject */
+    /**
+     * @var Quote|MockObject
+     */
     protected $quote;
 
-    /** @var Total|MockObject  */
+    /**
+     * @var Total|MockObject
+     */
     protected $total;
 
-    /** @var ShippingAssignmentInterface|MockObject  */
+    /**
+     * @var ShippingAssignmentInterface|MockObject
+     */
     protected $shippingAssignment;
 
-    /** @var Address|MockObject  */
+    /**
+     * @var Address|MockObject
+     */
     protected $address;
 
-    /** @var ShippingInterface|MockObject  */
+    /**
+     * @var ShippingInterface|MockObject
+     */
     protected $shipping;
 
-    /** @var FreeShippingInterface|MockObject */
+    /**
+     * @var FreeShippingInterface|MockObject
+     */
     protected $freeShipping;
 
-    /** @var CartItemInterface|MockObject */
+    /**
+     * @var CartItemInterface|MockObject
+     */
     protected $cartItem;
 
-    /** @var Rate|MockObject */
+    /**
+     * @var Rate|MockObject
+     */
     protected $rate;
 
-    /** @var Store|MockObject */
+    /**
+     * @var Store|MockObject
+     */
     protected $store;
 
-    /** @var PriceCurrencyInterface|MockObject */
+    /**
+     * @var PriceCurrencyInterface|MockObject
+     */
     protected $priceCurrency;
 
     /**
@@ -84,7 +104,7 @@ protected function setUp(): void
             Shipping::class,
             [
                 'freeShipping' => $this->freeShipping,
-                'priceCurrency' => $this->priceCurrency,
+                'priceCurrency' => $this->priceCurrency
             ]
         );
 
@@ -138,7 +158,7 @@ protected function setUp(): void
                 'isVirtual',
                 'getWeight',
                 'getQty',
-                'setRowWeight',
+                'setRowWeight'
             ]
         );
         $this->rate = $this->getMockBuilder(Rate::class)
@@ -270,12 +290,9 @@ public function testCollect(): void
      */
     protected function freeShippingAssertions(): void
     {
-        $this->address->expects($this->at(0))
+        $this->address
             ->method('getFreeShipping')
-            ->willReturn(false);
-        $this->address->expects($this->at(1))
-            ->method('getFreeShipping')
-            ->willReturn(true);
+            ->willReturnOnConsecutiveCalls(false, true);
         $this->cartItem->expects($this->atLeastOnce())
             ->method('getFreeShipping')
             ->willReturn(true);

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php

@@ -32,18 +32,29 @@
  */
 class SubtotalTest extends TestCase
 {
-    /** @var ObjectManager */
+    /**
+     * @var ObjectManager
+     */
     protected $objectManager;
 
-    /**  @var Subtotal */
+    /**
+     * @var Subtotal
+     */
     protected $subtotalModel;
 
-    /** @var MockObject */
+    /**
+     * @var MockObject
+     */
     protected $stockItemMock;
 
-    /** @var MockObject */
+    /**
+     * @var MockObject
+     */
     protected $stockRegistry;
 
+    /**
+     * @inheriDoc
+     */
     protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
@@ -65,7 +76,7 @@ protected function setUp(): void
     /**
      * @return array
      */
-    public function collectDataProvider()
+    public function collectDataProvider(): array
     {
         return [
             [12, 10, false, 12, 10],
@@ -77,18 +88,23 @@ public function collectDataProvider()
     }
 
     /**
-     * @dataProvider collectDataProvider
-     *
      * @param int $price
      * @param int $originalPrice
      * @param bool $itemHasParent
-     * @param int $expectedPrice
-     * @param int $expectedOriginalPrice
+     * @param int|null $expectedPrice
+     * @param int|null $expectedOriginalPrice
      *
+     * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider collectDataProvider
      */
-    public function testCollect($price, $originalPrice, $itemHasParent, $expectedPrice, $expectedOriginalPrice)
-    {
+    public function testCollect(
+        int $price,
+        int $originalPrice,
+        bool $itemHasParent,
+        ?int $expectedPrice,
+        ?int $expectedOriginalPrice
+    ): void {
         $this->stockRegistry->expects($this->any())->method('getStockItem')->willReturn($this->stockItemMock);
 
         $priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)->getMock();
@@ -101,7 +117,7 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
             Item::class,
             [
                 'stockRegistry' => $this->stockRegistry,
-                'priceCurrency' => $priceCurrency,
+                'priceCurrency' => $priceCurrency
             ]
         );
         /** @var Address|MockObject $address */
@@ -125,7 +141,7 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $product->expects($this->any())->method('getStore')->willReturn($store);
         $product->expects($this->any())->method('isVisibleInCatalog')->will($this->returnValue(true));
         $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getStockItem'])
+            ->onlyMethods(['getStockItem'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $extensionAttribute->expects($this->atLeastOnce())
@@ -151,7 +167,9 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
 
         $shipping = $this->createMock(ShippingInterface::class);
         $shipping->expects($this->exactly(2))->method('getAddress')->willReturn($address);
-        $address->expects($this->at(0))->method('setTotalQty')->with(0);
+        $address
+            ->method('setTotalQty')
+            ->with(0);
         $address->expects($this->any())->method('getTotalQty')->willReturn(0);
         $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
         $shippingAssignmentMock->expects($this->exactly(2))->method('getShipping')->willReturn($shipping);
@@ -172,7 +190,10 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $this->assertEquals($convertedPrice, $quoteItem->getConvertedPrice());
     }
 
-    public function testFetch()
+    /**
+     * @return void
+     */
+    public function testFetch(): void
     {
         $expectedResult = [
             'code' => null,
@@ -193,16 +214,18 @@ public function testFetch()
 
     /**
      * Test that invalid items are not collected
+     *
+     * @return void
      */
-    public function testCollectWithInvalidItems()
+    public function testCollectWithInvalidItems(): void
     {
         $addressItemId = 38203;
         $addressQuoteItemId = 7643;
         $storeId = 1;
         $quote = $this->createPartialMock(
             Quote::class,
             [
-                'getItemsCollection',
+                'getItemsCollection'
             ]
         );
         $quote->setData(