AC-15105: [CE] PHPUnit 12: Upgrade Payment & Shipping related test cases

Author: shashi011

app/code/Magento/OfflinePayments/Test/Unit/Block/Form/AbstractInstructionTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\OfflinePayments\Test\Unit\Block\Form;
 
-use Magento\Framework\View\Element\Template\Context;
 use Magento\OfflinePayments\Block\Form\AbstractInstruction;
 use Magento\Payment\Model\MethodInterface;
 use PHPUnit\Framework\TestCase;
@@ -21,17 +20,15 @@ class AbstractInstructionTest extends TestCase
 
     protected function setUp(): void
     {
-        $context = $this->createMock(Context::class);
-        $this->model = $this->getMockForAbstractClass(
-            AbstractInstruction::class,
-            ['context' => $context]
-        );
+        $this->model = $this->getMockBuilder(AbstractInstruction::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods([])
+            ->getMock();
     }
 
     public function testGetInstructions()
     {
-        $method = $this->getMockBuilder(MethodInterface::class)
-            ->getMockForAbstractClass();
+        $method = $this->createMock(MethodInterface::class);
 
         $method->expects($this->once())
             ->method('getConfigData')

app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\Template\Context;
 use Magento\OfflinePayments\Block\Info\Checkmo;
 use Magento\Payment\Model\Info;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -33,15 +34,9 @@ class CheckmoTest extends TestCase
      */
     protected function setUp(): void
     {
-        $context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->addMethods([])
-            ->getMock();
+        $context = $this->createMock(Context::class);
 
-        $this->infoMock = $this->getMockBuilder(Info::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getAdditionalInformation'])
-            ->getMock();
+        $this->infoMock = $this->createPartialMock(Info::class, ['getAdditionalInformation']);
 
         $this->block = new Checkmo($context);
     }
@@ -51,9 +46,9 @@ protected function setUp(): void
      * @param string|null $expected
      *
      * @return void
-     * @dataProvider getPayableToDataProvider
      * @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
      */
+    #[DataProvider('getPayableToDataProvider')]
     public function testGetPayableTo($details, $expected): void
     {
         $this->infoMock
@@ -76,7 +71,7 @@ public function testGetPayableTo($details, $expected): void
     public static function getPayableToDataProvider(): array
     {
         return [
-            ['details' => 'payable', 'payable'],
+            ['payable', 'payable'],
             ['', null]
         ];
     }
@@ -86,9 +81,9 @@ public static function getPayableToDataProvider(): array
      * @param string|null $expected
      *
      * @return void
-     * @dataProvider getMailingAddressDataProvider
      * @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
      */
+    #[DataProvider('getMailingAddressDataProvider')]
     public function testGetMailingAddress($details, $expected): void
     {
         $this->infoMock
@@ -114,8 +109,8 @@ public function testGetMailingAddress($details, $expected): void
     public static function getMailingAddressDataProvider(): array
     {
         return [
-            ['details' => 'blah@blah.com', 'blah@blah.com'],
-            ['details' => '', null]
+            ['blah@blah.com', 'blah@blah.com'],
+            ['', null]
         ];
     }
 

app/code/Magento/OfflinePayments/Test/Unit/Model/BanktransferTest.php

@@ -31,9 +31,9 @@ class BanktransferTest extends TestCase
     protected function setUp(): void
     {
         $objectManagerHelper = new ObjectManager($this);
-        $eventManager = $this->getMockForAbstractClass(ManagerInterface::class);
+        $eventManager = $this->createMock(ManagerInterface::class);
         $paymentDataMock = $this->createMock(Data::class);
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->object = $objectManagerHelper->getObject(
             Banktransfer::class,
             [

app/code/Magento/OfflinePayments/Test/Unit/Model/CashondeliveryTest.php

@@ -32,10 +32,10 @@ protected function setUp(): void
     {
         $helper = new ObjectManager($this);
 
-        $eventManager = $this->getMockForAbstractClass(ManagerInterface::class);
+        $eventManager = $this->createMock(ManagerInterface::class);
         $paymentDataMock = $this->createMock(Data::class);
 
-        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->object = $helper->getObject(
             Cashondelivery::class,
             [

app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php

@@ -11,6 +11,7 @@
 use Magento\OfflinePayments\Model\Checkmo;
 use Magento\OfflinePayments\Model\CheckmoConfigProvider;
 use Magento\Payment\Helper\Data as PaymentHelper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -58,8 +59,8 @@ protected function setUp(): void
      * @param string $mailingAddress
      * @param string $payableTo
      * @param array $result
-     * @dataProvider dataProviderGetConfig
      */
+    #[DataProvider('dataProviderGetConfig')]
     public function testGetConfig($isAvailable, $mailingAddress, $payableTo, $result)
     {
         $this->methodMock->expects($this->once())

app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoTest.php

@@ -30,7 +30,7 @@ class CheckmoTest extends TestCase
     protected function setUp(): void
     {
         $objectManagerHelper = new ObjectManager($this);
-        $eventManager = $this->getMockForAbstractClass(ManagerInterface::class);
+        $eventManager = $this->createMock(ManagerInterface::class);
         $paymentDataMock = $this->createMock(Data::class);
         $this->scopeConfigMock = $this->createPartialMock(ScopeConfigInterface::class, ['getValue', 'isSetFlag']);
         $this->object = $objectManagerHelper->getObject(

app/code/Magento/OfflinePayments/Test/Unit/Model/InstructionsConfigProviderTest.php

@@ -8,16 +8,20 @@
 namespace Magento\OfflinePayments\Test\Unit\Model;
 
 use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\OfflinePayments\Model\Banktransfer;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\InstructionsConfigProvider;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Payment\Model\Method\AbstractMethod;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class InstructionsConfigProviderTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var InstructionsConfigProvider
      */
@@ -40,16 +44,14 @@ class InstructionsConfigProviderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->methodOneMock = $this->getMockBuilder(AbstractMethod::class)
-            ->addMethods(['getInstructions'])
-            ->onlyMethods(['isAvailable'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->methodTwoMock = $this->getMockBuilder(AbstractMethod::class)
-            ->addMethods(['getInstructions'])
-            ->onlyMethods(['isAvailable'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->methodOneMock = $this->createPartialMockWithReflection(
+            AbstractMethod::class,
+            ['getInstructions', 'isAvailable']
+        );
+        $this->methodTwoMock = $this->createPartialMockWithReflection(
+            AbstractMethod::class,
+            ['getInstructions', 'isAvailable']
+        );
 
         /** @var PaymentHelper|MockObject $paymentHelperMock */
         $paymentHelperMock = $this->createMock(PaymentHelper::class);
@@ -77,8 +79,8 @@ protected function setUp(): void
      * @param bool $isTwoAvailable
      * @param string $instructionsTwo
      * @param array $result
-     * @dataProvider dataProviderGetConfig
      */
+    #[DataProvider('dataProviderGetConfig')]
     public function testGetConfig($isOneAvailable, $instructionsOne, $isTwoAvailable, $instructionsTwo, $result)
     {
         $this->methodOneMock->expects($this->once())

app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php

@@ -10,7 +10,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\OfflinePayments\Model\Purchaseorder;
 use Magento\Payment\Helper\Data as PaymentHelper;
@@ -36,7 +35,7 @@ class PurchaseorderTest extends TestCase
     protected function setUp(): void
     {
         $objectManagerHelper = new ObjectManager($this);
-        $eventManager = $this->getMockForAbstractClass(EventManagerInterface::class);
+        $eventManager = $this->createMock(EventManagerInterface::class);
         $paymentDataMock = $this->createMock(PaymentHelper::class);
         $this->scopeConfigMock = $this->createPartialMock(
             ScopeConfigInterface::class,
@@ -68,10 +67,10 @@ public function testValidate()
     {
         $data = new DataObject([]);
 
-        $addressMock = $this->getMockForAbstractClass(OrderAddressInterface::class);
+        $addressMock = $this->createMock(OrderAddressInterface::class);
         $addressMock->expects($this->once())->method('getCountryId')->willReturn('UY');
 
-        $orderMock = $this->getMockForAbstractClass(OrderInterface::class);
+        $orderMock = $this->createMock(OrderInterface::class);
         $orderMock->expects($this->once())->method('getBillingAddress')->willReturn($addressMock);
 
         $instance = $this->createMock(Payment::class);

app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php

@@ -9,13 +9,15 @@
 
 use Magento\Framework\Event;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\OfflinePayments\Model\Banktransfer;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
 use Magento\OfflinePayments\Observer\BeforeOrderPaymentSaveObserver;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -24,6 +26,8 @@
  */
 class BeforeOrderPaymentSaveObserverTest extends TestCase
 {
+    use MockCreationTrait;
+
     private const STORE_ID = 1;
 
     /**
@@ -57,30 +61,24 @@ class BeforeOrderPaymentSaveObserverTest extends TestCase
     protected function setUp(): void
     {
         $objectManagerHelper = new ObjectManager($this);
-        $this->paymentMock = $this->getMockBuilder(Payment::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->paymentMock = $this->createMock(Payment::class);
 
-        $this->eventMock = $this->getMockBuilder(Event::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getPayment'])
-            ->getMock();
+        $this->eventMock = $this->createPartialMockWithReflection(
+            Event::class,
+            ['getPayment']
+        );
 
         $this->eventMock->expects(self::once())
             ->method('getPayment')
             ->willReturn($this->paymentMock);
 
-        $this->observerMock = $this->getMockBuilder(Observer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->observerMock = $this->createMock(Observer::class);
 
         $this->observerMock->expects(self::once())
             ->method('getEvent')
             ->willReturn($this->eventMock);
 
-        $this->orderMock = $this->getMockBuilder(Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->orderMock = $this->createMock(Order::class);
         $this->orderMock->method('getStoreId')
             ->willReturn(static::STORE_ID);
 
@@ -93,8 +91,8 @@ protected function setUp(): void
     /**
      * Checks a case when payment method is either bank transfer or cash on delivery
      * @param string $methodCode
-     * @dataProvider dataProviderBeforeOrderPaymentSaveWithInstructions
      */
+    #[DataProvider('dataProviderBeforeOrderPaymentSaveWithInstructions')]
     public function testBeforeOrderPaymentSaveWithInstructions($methodCode)
     {
         $this->paymentMock->expects(self::once())
@@ -103,9 +101,7 @@ public function testBeforeOrderPaymentSaveWithInstructions($methodCode)
         $this->paymentMock->expects(self::once())
             ->method('setAdditionalInformation')
             ->with('instructions', 'payment configuration');
-        $method = $this->getMockBuilder(Banktransfer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $method = $this->createMock(Banktransfer::class);
 
         $method->expects(self::once())
             ->method('getConfigData')
@@ -148,9 +144,7 @@ public function testBeforeOrderPaymentSaveWithCheckmo()
                 ]
             );
 
-        $method = $this->getMockBuilder(Checkmo::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $method = $this->createMock(Checkmo::class);
         $method->method('getConfigData')
             ->willReturnMap(
                 [
@@ -176,9 +170,7 @@ public function testBeforeOrderPaymentSaveWithCheckmoWithoutConfig()
         $this->paymentMock->expects(self::never())
             ->method('setAdditionalInformation');
 
-        $method = $this->getMockBuilder(Checkmo::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $method = $this->createMock(Checkmo::class);
         $method->method('getConfigData')
             ->willReturnMap(
                 [
@@ -208,8 +200,8 @@ public function testBeforeOrderPaymentSaveWithOthers()
 
     /**
      * @param string $methodCode
-     * @dataProvider dataProviderBeforeOrderPaymentSaveWithInstructions
      */
+    #[DataProvider('dataProviderBeforeOrderPaymentSaveWithInstructions')]
     public function testBeforeOrderPaymentSaveWithInstructionsAlreadySet($methodCode)
     {
         $this->paymentMock->method('getMethod')