Merge remote-tracking branch 'origin/MAGETWO-70844' into pr-regression-ece

Author: iivashchenko

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

@@ -670,7 +670,7 @@ protected function _getWeight($weight, $maxWeight = false, $configWeightUnit = f
 
         if ($configWeightUnit != $countryWeightUnit) {
             $weight = $this->_carrierHelper->convertMeasureWeight(
-                sprintf('%.3f', $weight),
+                (float)$weight,
                 $configWeightUnit,
                 $countryWeightUnit
             );
@@ -870,7 +870,7 @@ protected function _getDimension($dimension, $configWeightUnit = false)
 
         if ($configDimensionUnit != $countryDimensionUnit) {
             $dimension = $this->_carrierHelper->convertMeasureDimension(
-                sprintf('%.3f', $dimension),
+                (float)$dimension,
                 $configDimensionUnit,
                 $countryDimensionUnit
             );
@@ -889,9 +889,9 @@ protected function _addDimension($nodePiece)
     {
         $sizeChecker = (string)$this->getConfigData('size');
 
-        $height = $this->_getDimension((string)$this->getConfigData('height'));
-        $depth = $this->_getDimension((string)$this->getConfigData('depth'));
-        $width = $this->_getDimension((string)$this->getConfigData('width'));
+        $height = $this->_getDimension((float)$this->getConfigData('height'));
+        $depth = $this->_getDimension((float)$this->getConfigData('depth'));
+        $width = $this->_getDimension((float)$this->getConfigData('width'));
 
         if ($sizeChecker && $height && $depth && $width) {
             $nodePiece->addChild('Height', $height);

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

@@ -167,6 +167,15 @@ function ($data) {
 
         $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
 
+        $localeResolver = $this->getMockForAbstractClass(\Magento\Framework\Locale\ResolverInterface::class);
+        $localeResolver->method('getLocale')->willReturn('fr_FR');
+
+        $carrierHelper = $this->objectManager->getObject(
+            \Magento\Shipping\Helper\Carrier::class,
+            [
+                'localeResolver' => $localeResolver
+            ]
+        );
         $this->model = $this->objectManager->getObject(
             \Magento\Dhl\Model\Carrier::class,
             [
@@ -179,6 +188,7 @@ function ($data) {
                 'httpClientFactory' => $httpClientFactory,
                 'readFactory' => $readFactory,
                 'storeManager' => $storeManager,
+                'carrierHelper' => $carrierHelper,
                 'data' => ['id' => 'dhl', 'store' => '1']
             ]
         );
@@ -205,7 +215,11 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/showmethod' => 1,
             'carriers/dhl/title' => 'dhl Title',
             'carriers/dhl/specificerrmsg' => 'dhl error message',
-            'carriers/dhl/unit_of_measure' => 'L',
+            'carriers/dhl/unit_of_measure' => 'K',
+            'carriers/dhl/size' => '1',
+            'carriers/dhl/height' => '1.6',
+            'carriers/dhl/width' => '1.6',
+            'carriers/dhl/depth' => '1.6',
         ];
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
@@ -280,7 +294,10 @@ public function testCollectRates()
         $rawPostData->setAccessible(true);
 
         self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
-        self::assertContains('<Weight>8.266</Weight>', $rawPostData->getValue($this->httpClient));
+        self::assertContains('<Weight>18.223</Weight>', $rawPostData->getValue($this->httpClient));
+        self::assertContains('<Height>0.630</Height>', $rawPostData->getValue($this->httpClient));
+        self::assertContains('<Width>0.630</Width>', $rawPostData->getValue($this->httpClient));
+        self::assertContains('<Depth>0.630</Depth>', $rawPostData->getValue($this->httpClient));
     }
 
     public function testCollectRatesErrorMessage()

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

@@ -1432,7 +1432,7 @@ protected function _formUsExpressShipmentRequest(\Magento\Framework\DataObject $
         if ($packageParams->getWeightUnits() != \Zend_Measure_Weight::OUNCE) {
             $packageWeight = round(
                 $this->_carrierHelper->convertMeasureWeight(
-                    $request->getPackageWeight(),
+                    (float)$request->getPackageWeight(),
                     $packageParams->getWeightUnits(),
                     \Zend_Measure_Weight::OUNCE
                 )
@@ -1526,7 +1526,7 @@ protected function _formUsSignatureConfirmationShipmentRequest(\Magento\Framewor
         if ($packageParams->getWeightUnits() != \Zend_Measure_Weight::OUNCE) {
             $packageWeight = round(
                 $this->_carrierHelper->convertMeasureWeight(
-                    $request->getPackageWeight(),
+                    (float)$request->getPackageWeight(),
                     $packageParams->getWeightUnits(),
                     \Zend_Measure_Weight::OUNCE
                 )
@@ -1609,29 +1609,29 @@ protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $reque
         $packageWeight = $request->getPackageWeight();
         if ($packageParams->getWeightUnits() != \Zend_Measure_Weight::POUND) {
             $packageWeight = $this->_carrierHelper->convertMeasureWeight(
-                $request->getPackageWeight(),
+                (float)$request->getPackageWeight(),
                 $packageParams->getWeightUnits(),
                 \Zend_Measure_Weight::POUND
             );
         }
         if ($packageParams->getDimensionUnits() != \Zend_Measure_Length::INCH) {
             $length = round(
                 $this->_carrierHelper->convertMeasureDimension(
-                    $packageParams->getLength(),
+                    (float)$packageParams->getLength(),
                     $packageParams->getDimensionUnits(),
                     \Zend_Measure_Length::INCH
                 )
             );
             $width = round(
                 $this->_carrierHelper->convertMeasureDimension(
-                    $packageParams->getWidth(),
+                    (float)$packageParams->getWidth(),
                     $packageParams->getDimensionUnits(),
                     \Zend_Measure_Length::INCH
                 )
             );
             $height = round(
                 $this->_carrierHelper->convertMeasureDimension(
-                    $packageParams->getHeight(),
+                    (float)$packageParams->getHeight(),
                     $packageParams->getDimensionUnits(),
                     \Zend_Measure_Length::INCH
                 )
@@ -1640,7 +1640,7 @@ protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $reque
         if ($packageParams->getGirthDimensionUnits() != \Zend_Measure_Length::INCH) {
             $girth = round(
                 $this->_carrierHelper->convertMeasureDimension(
-                    $packageParams->getGirth(),
+                    (float)$packageParams->getGirth(),
                     $packageParams->getGirthDimensionUnits(),
                     \Zend_Measure_Length::INCH
                 )

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

@@ -153,6 +153,15 @@ function ($data) {
 
         $this->errorFactory->expects($this->any())->method('create')->willReturn($this->error);
 
+        $localeResolver = $this->getMockForAbstractClass(\Magento\Framework\Locale\ResolverInterface::class);
+        $localeResolver->method('getLocale')->willReturn('fr_FR');
+        $carrierHelper = $this->objectManager->getObject(
+            \Magento\Shipping\Helper\Carrier::class,
+            [
+                'localeResolver' => $localeResolver
+            ]
+        );
+
         $arguments = [
             'scopeConfig' => $this->scope,
             'xmlSecurity' => new \Magento\Framework\Xml\Security(),
@@ -162,7 +171,7 @@ function ($data) {
             'httpClientFactory' => $httpClientFactory,
             'data' => $data,
             'rateErrorFactory' => $this->errorFactory,
-
+            'carrierHelper' => $carrierHelper,
         ];
 
         $this->dataHelper = $this->getMockBuilder(DataHelper::class)
@@ -246,6 +255,13 @@ public function testReturnOfShipment()
             \Magento\Shipping\Model\Shipment\ReturnShipment::class,
             require __DIR__ . '/_files/return_shipment_request_data.php'
         );
+        $this->httpClient->expects(self::exactly(2))
+            ->method('setParameterGet')
+            ->withConsecutive(
+                ['API', 'SignatureConfirmationCertifyV3'],
+                ['XML', $this->stringContains('<WeightInOunces>80</WeightInOunces>')]
+            );
+
         $this->assertNotEmpty($this->carrier->returnOfShipment($request)->getInfo()[0]['tracking_number']);
     }