Merge remote-tracking branch 'arcticfoxes/MC-6295' into MC-4245

Joan He · Joan He · commit 9302fc93130b · 2019-01-22T09:06:55.000-06:00
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -434,7 +434,7 @@ public function testRequestToShipment(string $origCountryId, string $expectedReg
         $this->assertStringStartsWith('MAGE_SHIP_', $messageReference);
         $this->assertGreaterThanOrEqual(28, strlen($messageReference));
         $this->assertLessThanOrEqual(32, strlen($messageReference));
-        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_CHECKED';
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';
         $expectedRequestElement = new Element($expectedRequestXml);
         $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
     }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -4,7 +4,7 @@
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
-            <MessageReference>MAGE_SHIP_CHECKED</MessageReference>
+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ public function testRequestToShipment(string $origCountryId, string $expectedReg`
`434`	`434`	`$this->assertStringStartsWith('MAGE_SHIP_', $messageReference);`
`435`	`435`	`$this->assertGreaterThanOrEqual(28, strlen($messageReference));`
`436`	`436`	`$this->assertLessThanOrEqual(32, strlen($messageReference));`
`437`		`- $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_CHECKED';`
	`437`	`+ $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';`
`438`	`438`	`$expectedRequestElement = new Element($expectedRequestXml);`
`439`	`439`	`$this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());`
`440`	`440`	`}`