AC-9138::Fedex Ship API upgrade from SOAP to REST - Fix PHP Unit and Static test

Author: Atul-glo35265

app/code/Magento/Fedex/Model/Carrier.php

@@ -1,7 +1,21 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 
 namespace Magento\Fedex\Model;
@@ -153,12 +167,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
         'Key', 'Password', 'MeterNumber',
     ];
 
-    /**
-     * Version of tracking service
-     * @var int
-     */
-    private static $trackServiceVersion = 10;
-
     /**
      * @var Json
      */
@@ -467,7 +475,7 @@ protected function _formRateRequest($purpose) : array
     protected function _doRatesRequest($purpose) : mixed
     {
         $response = null;
-        $accessToken = $this->_getAccessToken(null);
+        $accessToken = $this->_getAccessToken();
         if (empty($accessToken)) {
             return null;
         }
@@ -1033,8 +1041,10 @@ protected function _getTrackingInformation($tracking) : void
             $this->_debug($debugData);
             $this->_parseTrackingResponse($tracking, $response);
         } else {
-            $this->appendTrackingError($tracking, __('Authorization Error.
-            No Access Token found with given credentials.'));
+            $this->appendTrackingError(
+                $tracking,
+                __('Authorization Error. No Access Token found with given credentials.')
+            );
             return;
         }
     }
@@ -1326,9 +1336,9 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request) :
         $this->_prepareShipmentRequest($request);
         $result = new \Magento\Framework\DataObject();
         $response = null;
-        $accessToken = $this->_getAccessToken(null);
+        $accessToken = $this->_getAccessToken();
         if (empty($accessToken)) {
-            return $result->setErrors('No access token found.');
+            return $result->setErrors(__('Authorization Error. No Access Token found with given credentials.'));
         }
 
         $requestClient = $this->_formShipmentRequest($request);
@@ -1401,9 +1411,10 @@ private function getPackagingLabel($pieceResponses) : string
      */
     public function rollBack($data): bool
     {
-        $accessToken = $this->_getAccessToken(null);
+        $accessToken = $this->_getAccessToken();
         if (empty($accessToken)) {
-            return $result->setErrors('No acccess token found.');
+            $this->_debug('Authorization Error. No Access Token found with given credentials.');
+            return false;
         }
 
         $requestData['accountNumber'] = ['value' => $this->getConfigData('account')];

app/code/Magento/Fedex/Model/Source/PickupType.php

@@ -1,6 +1,10 @@
 <?php
 /************************************************************************
- * Copyright 2014 Adobe
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2023 Adobe
  * All Rights Reserved.
  *
  * NOTICE: All information contained herein is, and remains

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

@@ -1,7 +1,21 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 
 declare(strict_types=1);
@@ -45,6 +59,7 @@
 use Psr\Log\LoggerInterface;
 use Magento\Framework\HTTP\Client\CurlFactory;
 use Magento\Framework\HTTP\Client\Curl;
+use Magento\Framework\Url\DecoderInterface;
 
 /**
  * CarrierTest contains units test for Fedex carrier methods
@@ -93,11 +108,6 @@ class CarrierTest extends TestCase
      */
     private $result;
 
-    /**
-     * @var \SoapClient|MockObject
-     */
-    private $soapClient;
-
     /**
      * @var Json|MockObject
      */
@@ -123,6 +133,11 @@ class CarrierTest extends TestCase
      */
     private $curlClient;
 
+    /**
+     * @var DecoderInterface
+     */
+    private $decoderInterface;
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -180,10 +195,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $reader = $this->getMockBuilder(Reader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->serializer = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -200,6 +211,11 @@ protected function setUp(): void
             ->setMethods(['setHeaders', 'getBody', 'post'])
             ->getMock();
 
+        $this->decoderInterface = $this->getMockBuilder(DecoderInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['decode'])
+            ->getMock();
+
         $this->carrier = $this->getMockBuilder(Carrier::class)
             ->setMethods(['_createSoapClient'])
             ->setConstructorArgs(
@@ -220,19 +236,13 @@ protected function setUp(): void
                     'directoryData' => $data,
                     'stockRegistry' => $stockRegistry,
                     'storeManager' => $storeManager,
-                    'configReader' => $reader,
                     'productCollectionFactory' => $collectionFactory,
                     'curlFactory' => $this->curlFactory,
+                    'decoderInterface' => $this->decoderInterface,
                     'data' => [],
                     'serializer' => $this->serializer,
                 ]
             )->getMock();
-        $this->soapClient = $this->getMockBuilder(\SoapClient::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getRates', 'track'])
-            ->getMock();
-        $this->carrier->method('_createSoapClient')
-            ->willReturn($this->soapClient);
     }
 
     public function testSetRequestWithoutCity()
@@ -769,7 +779,7 @@ public function getAccessToken() : array
         $this->curlFactory->expects($this->any())->method('create')->willReturn($this->curlClient);
         $this->curlClient->expects($this->any())->method('setHeaders')->willReturnSelf();
         $this->curlClient->expects($this->any())->method('post')->willReturnSelf();
-        $this->curlClient->expects($this->any())->method('getBody')->willReturnSelf();
+        $this->curlClient->expects($this->any())->method('getBody')->willReturn(json_encode($accessTokenResponse));
         return $accessTokenResponse;
     }
 

app/code/Magento/Fedex/etc/adminhtml/system.xml

@@ -1,8 +1,22 @@
 <?xml version="1.0"?>
 <!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">

app/code/Magento/Fedex/etc/config.xml

@@ -1,8 +1,22 @@
 <?xml version="1.0"?>
 <!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">