fixes for static and integration tests

Author: glo05363

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

@@ -619,8 +619,7 @@ protected function _getQuotes()
                         "ShipperNumber" => "{$shipperNumber}",
                         "Address" => [
                             "AddressLine" => [
-                                "address currently no idea",
-                                "address2"
+                                "{$residentialAddressIndicator}",
                             ],
                             "City" => "{$shipperCity}",
                             "StateProvinceCode" => "{$shipperStateProvince}",
@@ -629,7 +628,6 @@ protected function _getQuotes()
                         ]
                     ],
                     "ShipTo" => [
-                        "Name" => "Blank for now",
                         "Address" => [
                             "AddressLine" => ["{$params['49_residential']}"],
                             "StateProvinceCode" => "{$params['destRegionCode']}",
@@ -639,7 +637,6 @@ protected function _getQuotes()
                         ]
                     ],
                     "ShipFrom" => [
-                        "Name" => "blank for now",
                         "Address" => [
                             "AddressLine" => [],
                             "StateProvinceCode" => "{$params['origRegionCode']}",
@@ -655,6 +652,9 @@ protected function _getQuotes()
             $rateParams['RateRequest']['Shipment']['ShipmentRatingOptions']['TPFCNegotiatedRatesIndicator'] = "Y";
             $rateParams['RateRequest']['Shipment']['ShipmentRatingOptions']['NegotiatedRatesIndicator'] = "Y";
         }
+        if ($this->getConfigFlag('include_taxes')) {
+            $rateParams['RateRequest']['Shipment']['TaxInformationIndicator'] = "Y";
+        }
 
         if ($serviceCode !== null) {
             $rateParams['RateRequest']['Shipment']['Service']['code'] = $serviceCode;
@@ -772,7 +772,7 @@ protected function _parseRestResponse($rateResponse)
     {
         $costArr = [];
         $priceArr = [];
-        if ($rateResponse !== null) {
+        if ($rateResponse !== null && strlen($rateResponse) > 0) {
             $rateResponseData = json_decode($rateResponse, true);
             if ($rateResponseData['RateResponse']['Response']['ResponseStatus']['Description'] === 'Success') {
                 $arr = $rateResponseData['RateResponse']['RatedShipment'] ?? [];
@@ -792,8 +792,7 @@ protected function _parseRestResponse($rateResponse)
                         $allowedCurrencies,
                         $costArr,
                         $priceArr,
-                        $negotiatedActive,
-                        $rateResponseData
+                        $negotiatedActive
                     );
                 }
             } else {
@@ -1549,7 +1548,6 @@ protected function _doShipmentRequest(DataObject $request)
         $this->_prepareShipmentRequest($request);
         $result = new DataObject();
         $rawXmlRequest = $this->_formShipmentRequest($request);
-        //$this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
         $debugData = [];

app/code/Magento/Ups/Model/UpsAuth.php

@@ -13,7 +13,6 @@
 use Magento\Framework\HTTP\AsyncClient\Request;
 use Magento\Framework\HTTP\AsyncClientInterface;
 
-
 class UpsAuth
 {
     public const TEST_AUTH_URL = 'https://wwwcie.ups.com/security/v1/oauth/token';
@@ -26,9 +25,9 @@ class UpsAuth
     /**
      * @param AsyncClientInterface|null $asyncHttpClient
      */
-    public function __construct(AsyncClientInterface $asyncHttpClient = null) {
+    public function __construct(AsyncClientInterface $asyncHttpClient = null)
+    {
         $this->asyncHttpClient = $asyncHttpClient ?? ObjectManager::getInstance()->get(AsyncClientInterface::class);
-
     }
 
     /**
@@ -51,17 +50,21 @@ public function getAccessToken($clientId, $clientSecret)
             'grant_type' => 'client_credentials',
         ]);
         try {
-            $asyncResponse = $this->asyncHttpClient->request(
-                new Request(self::TEST_AUTH_URL, Request::METHOD_POST, $headers, $authPayload));
-            $responseResult = $asyncResponse->get();
-            $responseData = $responseResult->getBody();
-            $responseData = json_decode($responseData);
+            $asyncResponse = $this->asyncHttpClient->request(new Request(
+                self::TEST_AUTH_URL,
+                Request::METHOD_POST,
+                $headers,
+                $authPayload
+            ));
+                $responseResult = $asyncResponse->get();
+                $responseData = $responseResult->getBody();
+                $responseData = json_decode($responseData);
             if (isset($responseData->access_token)) {
                 $result = $responseData->access_token;
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Unable to retrieve access token.'));
             }
-            return $result ?? '';
+            return $result;
         } catch (\Magento\Framework\HTTP\AsyncClient\HttpException $e) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Error occurred: %1', $e->getMessage()));
         }

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

@@ -36,9 +36,9 @@
  */
 class CarrierTest extends TestCase
 {
-    const FREE_METHOD_NAME = 'free_method';
+    public const FREE_METHOD_NAME = 'free_method';
 
-    const PAID_METHOD_NAME = 'paid_method';
+    public const PAID_METHOD_NAME = 'paid_method';
 
     /**
      * @var Error|MockObject

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -56,6 +56,11 @@ class CarrierTest extends TestCase
      */
     private $logs = [];
 
+    /**
+     * @var \Magento\Ups\Model\UpsAuth|MockObject
+     */
+    private $upsAuthMock;
+
     /**
      * @inheritDoc
      */
@@ -71,7 +76,11 @@ function (string $message) {
                     $this->logs[] = $message;
                 }
             );
-        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class, ['logger' => $this->loggerMock]);
+        $this->upsAuthMock = $this->getMockBuilder(\Magento\Ups\Model\UpsAuth::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class, ['logger' => $this->loggerMock,
+            'upsAuth' => $this->upsAuthMock]);
     }
 
     /**
@@ -135,18 +144,15 @@ public function testCollectFreeRates()
                 new Response(
                     200,
                     [],
-                    file_get_contents(__DIR__ . "/../_files/ups_rates_response_option9.json")
+                    file_get_contents(__DIR__ . "/../_files/ups_rates_response_option5.json")
                 )
             ]
         );
-        $upsAuthMock = $this->getMockBuilder(\Magento\Ups\Model\UpsAuth::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $upsAuthMock->method('getAccessToken')
-            ->willReturn('abcdefghijklmnop');
 
+        $this->upsAuthMock->method('getAccessToken')
+            ->willReturn('abcdefghijklmnop');
         $rates = $this->carrier->collectRates($request)->getAllRates();
-        $this->assertEquals('19.19', $rates[0]->getPrice());
+        $this->assertEquals('115.01', $rates[0]->getPrice());
         $this->assertEquals('03', $rates[0]->getMethod());
     }
 
@@ -176,12 +182,12 @@ public function testCollectRates(int $negotiable, int $tax, int $responseId, str
             RateRequest::class,
             [
                 'data' => [
-                    'dest_country' => 'GB',
-                    'dest_postal' => '01104',
+                    'dest_country' => 'US',
+                    'dest_postal' => '90001',
                     'product' => '11',
                     'action' => 'Rate',
                     'unit_measure' => 'KGS',
-                    'base_currency' => new DataObject(['code' => 'GBP'])
+                    'base_currency' => new DataObject(['code' => 'USD'])
                 ]
             ]
         );
@@ -191,7 +197,7 @@ public function testCollectRates(int $negotiable, int $tax, int $responseId, str
                 new Response(
                     200,
                     [],
-                    file_get_contents(__DIR__ . "/../_files/ups_rates_response_option$responseId.xml")
+                    file_get_contents(__DIR__ . "/../_files/ups_rates_response_option$responseId.json")
                 )
             ]
         );
@@ -200,14 +206,16 @@ public function testCollectRates(int $negotiable, int $tax, int $responseId, str
         $this->config->setValue('carriers/ups/include_taxes', $tax, 'store');
         $this->config->setValue('carriers/ups/allowed_methods', $method, 'store');
 
+        $this->upsAuthMock->method('getAccessToken')
+            ->willReturn('abcdefghijklmnop');
         $rates = $this->carrier->collectRates($request)->getAllRates();
         $this->assertEquals($price, $rates[0]->getPrice());
         $this->assertEquals($method, $rates[0]->getMethod());
 
         $requestFound = false;
         foreach ($this->logs as $log) {
-            if (mb_stripos($log, 'RatingServiceSelectionRequest') &&
-                mb_stripos($log, 'RatingServiceSelectionResponse')
+            if (mb_stripos($log, 'RateRequest') &&
+                mb_stripos($log, 'RateResponse')
             ) {
                 $requestFound = true;
                 break;
@@ -246,6 +254,8 @@ public function testCollectRatesWithoutAnyAllowedMethods(): void
             ]
         );
         $this->config->setValue('carriers/ups/allowed_methods', '', 'store');
+        $this->upsAuthMock->method('getAccessToken')
+            ->willReturn('abcdefghijklmnop');
         $rates = $this->carrier->collectRates($request)->getAllRates();
         $this->assertInstanceOf(Error::class, current($rates));
         $this->assertEquals(current($rates)['carrier_title'], $this->carrier->getConfigData('title'));
@@ -260,14 +270,10 @@ public function testCollectRatesWithoutAnyAllowedMethods(): void
     public function collectRatesDataProvider()
     {
         return [
-            [0, 0, 1, '11', 6.45 ],
-            [0, 0, 2, '65', 29.59 ],
-            [0, 1, 3, '11', 7.74 ],
-            [0, 1, 4, '65', 29.59 ],
-            [1, 0, 5, '11', 9.35 ],
-            [1, 0, 6, '65', 41.61 ],
-            [1, 1, 7, '11', 11.22 ],
-            [1, 1, 8, '65', 41.61 ],
+            [0, 0, 1, '03', 136.09 ],
+            [0, 1, 2, '03', 136.09 ],
+            [1, 0, 3, '03', 92.12 ],
+            [1, 1, 4, '03', 92.12 ],
         ];
     }
 
@@ -289,14 +295,12 @@ public function collectRatesDataProvider()
     public function testRequestToShipment(): void
     {
         //phpcs:disable Magento2.Functions.DiscouragedFunction
-        $expectedShipmentRequest = file_get_contents(__DIR__ . '/../_files/ShipmentConfirmRequest.xml');
-        $shipmentResponse = file_get_contents(__DIR__ . '/../_files/ShipmentConfirmResponse.xml');
-        $acceptResponse = file_get_contents(__DIR__ . '/../_files/ShipmentAcceptResponse.xml');
+        $expectedShipmentRequest = str_replace("\n","",file_get_contents(__DIR__ . '/../_files/ShipmentConfirmRequest.json'));
+        $shipmentResponse = file_get_contents(__DIR__ . '/../_files/ShipmentConfirmResponse.json');
         //phpcs:enable Magento2.Functions.DiscouragedFunction
         $this->httpClient->nextResponses(
             [
-                new Response(200, [], $shipmentResponse),
-                new Response(200, [], $acceptResponse)
+                new Response(200, [], $shipmentResponse)
             ]
         );
         $this->httpClient->clearRequests();
@@ -348,24 +352,18 @@ public function testRequestToShipment(): void
 
         $requests = $this->httpClient->getRequests();
         $this->assertNotEmpty($requests);
-        $shipmentRequest = $this->extractShipmentRequest($requests[0]->getBody());
+        $shipmentRequest = $requests[0]->getBody();
         $this->assertEquals(
-            $this->formatXml($expectedShipmentRequest),
-            $this->formatXml($shipmentRequest)
+            $expectedShipmentRequest,
+            $shipmentRequest
         );
-
         $this->assertEmpty($result->getErrors());
         $this->assertNotEmpty($result->getInfo());
         $this->assertEquals(
-            '1Z207W886698856557',
+            '1ZXXXXXXXXXXXXXXXX',
             $result->getInfo()[0]['tracking_number'],
             'Tracking Number must match.'
         );
-        $this->assertEquals(
-            '2V467W886398839541',
-            $result->getInfo()[1]['tracking_number'],
-            'Tracking Number must match.'
-        );
         $this->httpClient->clearRequests();
     }
 
@@ -411,37 +409,4 @@ public function testGetRatesWithHttpException(): void
 
         $this->assertEquals($error, $resultRate);
     }
-
-    /**
-     * Extracts shipment request.
-     *
-     * @param string $requestBody
-     * @return string
-     */
-    private function extractShipmentRequest(string $requestBody): string
-    {
-        $resultXml = '';
-        $pattern = '%(<\?xml version="1.0"\?>\n<ShipmentConfirmRequest)(.*)$%im';
-        if (preg_match($pattern, $requestBody, $result)) {
-            $resultXml = array_shift($result);
-        }
-
-        return $resultXml;
-    }
-
-    /**
-     * Format XML string.
-     *
-     * @param string $xmlString
-     * @return string
-     */
-    private function formatXml(string $xmlString): string
-    {
-        $xmlDocument = new \DOMDocument('1.0');
-        $xmlDocument->preserveWhiteSpace = false;
-        $xmlDocument->formatOutput = true;
-        $xmlDocument->loadXML($xmlString);
-
-        return $xmlDocument->saveXML();
-    }
 }

dev/tests/integration/testsuite/Magento/Ups/Model/UpsAuthTest.php

@@ -35,23 +35,35 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->asyncHttpClientMock = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
-        $this->upsAuth = $this->objectManager->create(UpsAuth::class, ['asyncHttpClient' => $this->asyncHttpClientMock]);
+        $this->upsAuth = $this->objectManager->create(
+            UpsAuth::class,
+            ['asyncHttpClient' => $this->asyncHttpClientMock]
+        );
     }
 
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
     public function testGetAccessToken()
     {
         // Prepare test data
         $clientId = 'user';
         $clientSecret = 'pass';
 
-        // Prepare the expected request data
-        $expectedFormData = [
-            'grant_type' => 'client_credentials',
-        ];
-
         // Prepare the expected response data
         $expectedAccessToken = 'abcdefghijklmnop';
-        $responseData = '{"token_type":"Bearer","issued_at":"1690460887368","client_id":"abcdef","access_token":"abcdefghijklmnop","expires_in":"14399","status":"approved"}';
+        $responseData = '{
+            "token_type":"Bearer",
+            "issued_at":"1690460887368",
+            "client_id":"abcdef",
+            "access_token":"abcdefghijklmnop",
+            "expires_in":"14399",
+            "status":"approved"
+            }';
 
         // Mock the HTTP client behavior to return a mock response
         $request = new Request(