fix integration tests

Author: engcom-Charlie

dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php

@@ -11,6 +11,7 @@
 use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\InputException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -53,6 +54,9 @@ class GuestShippingInformationManagementTest extends TestCase
      */
     private $maskFactory;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -73,10 +77,8 @@ protected function setUp()
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
      * @dataProvider getAddressesVariation
-     * @expectedException  \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
      */
-    public function testDifferentAddresses(bool $swapShipping)
+    public function testDifferentAddresses(bool $swapShipping): void
     {
         $carts = $this->cartRepo->getList(
             $this->searchCriteria->addFilter('reserved_order_id', 'test01')->create()
@@ -107,6 +109,14 @@ public function testDifferentAddresses(bool $swapShipping)
         /** @var QuoteIdMask $idMask */
         $idMask = $this->maskFactory->create();
         $idMask->load($cart->getId(), 'quote_id');
+
+        $this->expectExceptionMessage(
+            sprintf(
+                'The shipping information was unable to be saved. Error: "Invalid customer address id %s"',
+                $address->getCustomerAddressId()
+            )
+        );
+        $this->expectException(InputException::class);
         $this->management->saveAddressInformation($idMask->getMaskedId(), $shippingInformation);
     }
 

dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php

@@ -13,6 +13,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Exception\InputException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -40,6 +41,9 @@ class ShippingInformationManagementTest extends TestCase
      */
     private $shippingFactory;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -58,10 +62,8 @@ protected function setUp()
      * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
      * @dataProvider getAddressesVariation
-     * @expectedException  \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
      */
-    public function testDifferentAddresses(bool $swapShipping)
+    public function testDifferentAddresses(bool $swapShipping): void
     {
         $cart = $this->cartRepo->getForCustomer(1);
         $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
@@ -86,6 +88,14 @@ public function testDifferentAddresses(bool $swapShipping)
         $shippingInformation->setBillingAddress($billingAddress);
         $shippingInformation->setShippingAddress($shippingAddress);
         $shippingInformation->setShippingMethodCode('flatrate');
+
+        $this->expectExceptionMessage(
+            sprintf(
+                'The shipping information was unable to be saved. Error: "Invalid customer address id %s"',
+                $address->getCustomerAddressId()
+            )
+        );
+        $this->expectException(InputException::class);
         $this->management->saveAddressInformation($cart->getId(), $shippingInformation);
     }