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

Author: shashi011

app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php

@@ -13,6 +13,7 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\ScopeInterface as ModelScopeInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,18 +35,16 @@ class AbstractConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
-            ->onlyMethods(['getValue', 'isSetFlag'])
-            ->getMockForAbstractClass();
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
 
         $this->config = new AbstractConfigTesting($this->scopeConfigMock);
     }
 
     /**
      * @param string|MethodInterface $method
      * @param $expected
-     * @dataProvider setMethodDataProvider
      */
+    #[DataProvider('setMethodDataProvider')]
     public function testSetMethod($method, $expected)
     {
         if (is_callable($method)) {
@@ -58,14 +57,13 @@ public function testSetMethod($method, $expected)
     public function testSetMethodInstance()
     {
         /** @var MethodInterface $methodInterfaceMock */
-        $methodInterfaceMock = $this->getMockBuilder(MethodInterface::class)
-            ->getMockForAbstractClass();
+        $methodInterfaceMock = $this->createMock(MethodInterface::class);
         $this->assertSame($this->config, $this->config->setMethodInstance($methodInterfaceMock));
     }
 
-    protected function getMockForMethodInterface() {
-        $methodInterfaceMock = $this->getMockBuilder(MethodInterface::class)
-            ->getMockForAbstractClass();
+    protected function getMockForMethodInterface()
+    {
+        $methodInterfaceMock = $this->createMock(MethodInterface::class);
         $methodInterfaceMock->expects($this->once())
             ->method('getCode')
             ->willReturn('payment_code');
@@ -106,9 +104,8 @@ public function testSetStoreId()
      * @param string $method
      * @param array $returnMap
      * @param string $expectedValue
-     *
-     * @dataProvider getValueDataProvider
      */
+    #[DataProvider('getValueDataProvider')]
     public function testGetValue($key, $method, $returnMap, $expectedValue)
     {
         $this->config->setMethod($method);
@@ -198,9 +195,8 @@ public static function getValueDataProvider()
     /**
      * @param array $returnMap
      * @param bool $expectedValue
-     *
-     * @dataProvider isWppApiAvailabeDataProvider
      */
+    #[DataProvider('isWppApiAvailabeDataProvider')]
     public function testIsWppApiAvailable($returnMap, $expectedValue)
     {
         $this->config->setMethod('paypal_express');
@@ -272,9 +268,8 @@ public static function isWppApiAvailabeDataProvider()
     /**
      * @param string|null $methodCode
      * @param bool $expectedFlag
-     *
-     * @dataProvider isMethodAvailableDataProvider
      */
+    #[DataProvider('isMethodAvailableDataProvider')]
     public function testIsMethodAvailable($methodCode, $expectedFlag)
     {
         $this->config->setMethod('settedMethod');
@@ -311,9 +306,8 @@ public function testIsMethodActive()
      * @param string|null $disableFundingOptions
      * @param int $expressBml
      * @param bool $expectedValue
-     *
-     * @dataProvider isMethodActiveBmlDataProvider
      */
+    #[DataProvider('isMethodActiveBmlDataProvider')]
     public function testIsMethodActiveBml(
         $disableFundingOptions,
         $expressBml,
@@ -366,9 +360,7 @@ public static function isMethodActiveBmlDataProvider()
      */
     public function testGetBuildNotationCode()
     {
-        $productMetadata = $this->getMockBuilder(ProductMetadataInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $productMetadata = $this->createMock(ProductMetadataInterface::class);
         $productMetadata->method('getEdition')
             ->willReturn('SomeEdition');
 

app/code/Magento/Paypal/Test/Unit/Model/Adminhtml/ExpressTest.php

@@ -7,7 +7,10 @@
 
 namespace Magento\Paypal\Test\Unit\Model\Adminhtml;
 
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Paypal\Model\Adminhtml\Express;
@@ -18,6 +21,7 @@
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -26,6 +30,8 @@
  */
 class ExpressTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var Express
      */
@@ -69,11 +75,19 @@ class ExpressTest extends TestCase
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-        $this->nvp = $this->getMockBuilder(Nvp::class)
-            ->addMethods(['setProcessableErrors'])
-            ->onlyMethods(['getData', 'callDoAuthorization'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        
+        $jsonHelper = $this->createMock(JsonHelper::class);
+        $directoryHelper = $this->createMock(DirectoryHelper::class);
+        
+        $objectManager->prepareObjectManager([
+            [JsonHelper::class, $jsonHelper],
+            [DirectoryHelper::class, $directoryHelper]
+        ]);
+        
+        $this->nvp = $this->createPartialMockWithReflection(
+            Nvp::class,
+            ['setProcessableErrors', 'getData', 'callDoAuthorization']
+        );
         $this->nvp->method('getData')->willReturn([]);
         $this->nvp->method('setProcessableErrors')->willReturnSelf();
 
@@ -83,7 +97,7 @@ protected function setUp(): void
         );
         $this->pro->method('getApi')->willReturn($this->nvp);
 
-        $this->transaction = $this->getMockForAbstractClass(TransactionInterface::class);
+        $this->transaction = $this->createMock(TransactionInterface::class);
         $this->transactionRepository = $this->createPartialMock(
             TransactionRepository::class,
             ['getByTransactionType']
@@ -98,7 +112,7 @@ protected function setUp(): void
             ]
         );
 
-        $this->paymentInstance = $this->getMockForAbstractClass(MethodInterface::class);
+        $this->paymentInstance = $this->createMock(MethodInterface::class);
         $this->payment = $this->createPartialMock(
             Payment::class,
             [
@@ -181,8 +195,8 @@ public function testAuthorizeOrder()
      * @param float $authorizedAmount
      * @param bool $isAuthAllowed
      * @throws LocalizedException
-     * @dataProvider paymentDataProvider
      */
+    #[DataProvider('paymentDataProvider')]
     public function testIsOrderAuthorizationAllowed(
         string $method,
         string $action,

app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php

@@ -22,6 +22,7 @@
 use Magento\Paypal\Model\Api\ProcessableExceptionFactory;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\Info;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -70,12 +71,9 @@ class NvpTest extends TestCase
     protected function setUp(): void
     {
         $this->customerAddressHelper = $this->createMock(Address::class);
-        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
-        $this->customLoggerMock = $this->getMockBuilder(Logger::class)
-            ->setConstructorArgs([$this->getMockForAbstractClass(LoggerInterface::class)])
-            ->onlyMethods(['debug'])
-            ->getMock();
-        $this->resolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->customLoggerMock = $this->createMock(Logger::class);
+        $this->resolver = $this->createMock(ResolverInterface::class);
         $this->regionFactory = $this->createMock(RegionFactory::class);
         $this->countryFactory = $this->createMock(CountryFactory::class);
         $processableExceptionFactory = $this->createPartialMock(
@@ -86,9 +84,9 @@ protected function setUp(): void
             ->method('create')
             ->willReturnCallback(
                 function ($arguments) {
-                    $this->processableException = $this->getMockBuilder(
-                        ProcessableException::class
-                    )->setConstructorArgs([$arguments['phrase'], null, $arguments['code']])->getMock();
+                    $this->processableException = $this->getMockBuilder(ProcessableException::class)
+                        ->setConstructorArgs([$arguments['phrase'], null, $arguments['code']])
+                        ->getMock();
                     return $this->processableException;
                 }
             );
@@ -149,8 +147,8 @@ protected function _invokeNvpProperty(Nvp $nvpObject, $property)
      * @param null|string $exception
      * @param string $exceptionMessage
      * @param null|int $exceptionCode
-     * @dataProvider callDataProvider
      */
+    #[DataProvider('callDataProvider')]
     public function testCall($response, $processableErrors, $exception, $exceptionMessage = '', $exceptionCode = null)
     {
         if (isset($exception)) {
@@ -212,8 +210,8 @@ public static function callDataProvider()
      *
      * @param $input
      * @param $expected
-     * @dataProvider callGetExpressCheckoutDetailsDataProvider
      */
+    #[DataProvider('callGetExpressCheckoutDetailsDataProvider')]
     public function testCallGetExpressCheckoutDetails($input, $expected)
     {
         $this->curl->expects($this->once())

app/code/Magento/Paypal/Test/Unit/Model/Api/ProcessableExceptionTest.php

@@ -8,11 +8,12 @@
 namespace Magento\Paypal\Test\Unit\Model\Api;
 
 use Magento\Paypal\Model\Api\ProcessableException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ProcessableExceptionTest extends TestCase
 {
-    const UNKNOWN_CODE = 10411;
+    private const UNKNOWN_CODE = 10411;
 
     /**
      * @var ProcessableException
@@ -23,8 +24,8 @@ class ProcessableExceptionTest extends TestCase
      * @param int $code
      * @param string $msg
      * @return void
-     * @dataProvider getUserMessageDataProvider
      */
+    #[DataProvider('getUserMessageDataProvider')]
     public function testGetUserMessage($code, $msg)
     {
         $this->model = new ProcessableException(__($msg), null, $code);

app/code/Magento/Paypal/Test/Unit/Model/Billing/AbstractAgreementTest.php

@@ -30,9 +30,7 @@ protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
 
-        $this->paymentDataMock = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->paymentDataMock = $this->createMock(Data::class);
 
         $this->model = $objectManager->getObject(
             Agreement::class,
@@ -44,8 +42,7 @@ public function testGetPaymentMethodInstance()
     {
         $paymentMethodInstance = $this->getMockBuilder(AbstractMethod::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['setStore'])
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $paymentMethodInstance->expects($this->once())
             ->method('setStore');

app/code/Magento/Paypal/Test/Unit/Model/Billing/AgreementTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Paypal\Test\Unit\Model\Billing;
 
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Helper\Data;
 use Magento\Payment\Model\Method\AbstractMethod;
@@ -18,6 +19,8 @@
 
 class AgreementTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var Agreement
      */
@@ -37,26 +40,21 @@ protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
 
-        $this->paymentDataMock = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getMethodInstance'])
-            ->getMock();
+        $this->paymentDataMock = $this->createMock(Data::class);
 
-        $this->paymentMethodInstanceMock = $this->getMockBuilder(AbstractMethod::class)
-            ->disableOriginalConstructor()
-            ->addMethods([
+        $this->paymentMethodInstanceMock = $this->createPartialMockWithReflection(
+            AbstractMethod::class,
+            [
                 'initBillingAgreementToken',
                 'getBillingAgreementTokenInfo',
-                'placeBillingAgreement'
-            ])
-            ->onlyMethods([
+                'placeBillingAgreement',
                 'setStore',
                 'getCode',
                 'getFormBlockType',
                 'getTitle',
                 'getStore'
-            ])
-            ->getMock();
+            ]
+        );
 
         $this->model = $objectManager->getObject(
             Agreement::class,
@@ -114,19 +112,15 @@ public function testImportOrderPaymentWithoutMethodCode()
      */
     private function importOrderPaymentCommonPart($baData)
     {
-        $paymentMock = $this->getMockBuilder(Payment::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getBillingAgreementData'])
-            ->onlyMethods(['getMethodInstance', 'getOrder'])
-            ->getMock();
+        $paymentMock = $this->createPartialMockWithReflection(
+            Payment::class,
+            ['getBillingAgreementData', 'getMethodInstance', 'getOrder']
+        );
 
         $storeId = null;
         $customerId = 2;
 
-        $order = $this->getMockBuilder(Order::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getCustomerId'])
-            ->getMock();
+        $order = $this->createMock(Order::class);
 
         $order->expects($this->once())
             ->method('getCustomerId')

app/code/Magento/Paypal/Test/Unit/Model/BillingAgreementConfigProviderTest.php

@@ -34,15 +34,15 @@ class BillingAgreementConfigProviderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->currentCustomerMock = $this->getMockBuilder(CurrentCustomer::class)
-            ->onlyMethods(['getCustomerId'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->currentCustomerMock = $this->createPartialMock(
+            CurrentCustomer::class,
+            ['getCustomerId']
+        );
 
-        $this->agreementFactoryMock = $this->getMockBuilder(AgreementFactory::class)
-            ->onlyMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->agreementFactoryMock = $this->createPartialMock(
+            AgreementFactory::class,
+            ['create']
+        );
 
         $this->configProvider = new BillingAgreementConfigProvider(
             $this->currentCustomerMock,
@@ -72,9 +72,7 @@ public function testGetConfig()
 
         $this->currentCustomerMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
 
-        $agreementMock = $this->getMockBuilder(Agreement::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $agreementMock = $this->createMock(Agreement::class);
 
         $agreementMock->expects($this->once())
             ->method('getAvailableCustomerBillingAgreements')