MAGETWO-99624: [Magento Cloud] Checkout not possible with zero sum checkout for virtual products

Author: rostyslav-hymon

app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php

@@ -163,6 +163,31 @@ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
     }
 
+    /**
+     * Test for save payment and place order with new billing address
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationAndPlaceOrderWithNewBillingAddress(): void
+    {
+        $cartId = 100;
+        $quoteBillingAddressId = 1;
+        $customerId = 1;
+        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteBillingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
+        $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
+
+        $quoteBillingAddress->method('getCustomerId')->willReturn($customerId);
+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
+        $quoteBillingAddress->method('getId')->willReturn($quoteBillingAddressId);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+        
+        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+        $billingAddressMock->expects($this->once())->method('setCustomerId')->with($customerId);
+        $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock));
+    }
+
     /**
      * @param int $cartId
      * @param \PHPUnit_Framework_MockObject_MockObject $billingAddressMock
@@ -182,6 +207,7 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
         $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
         $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteShippingAddress);
         $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
+        $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
         $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);
         $quoteMock->expects($this->once())->method('setBillingAddress')->with($billingAddressMock);
         $quoteMock->expects($this->once())->method('setDataChanges')->willReturnSelf();