Merge remote-tracking branch 'origin/AC-13828' into spartans_pr_30012025

Author: glo60612

app/code/Magento/Quote/Model/CustomerManagement.php

@@ -159,7 +159,7 @@ public function validateAddresses(QuoteEntity $quote)
                 $quote->getShippingAddress()->getCustomerAddressId()
             );
         }
-        if (empty($addresses) && $quote->getCustomerIsGuest()) {
+        if (!empty($addresses) && $quote->getCustomerIsGuest()) {
             $billingAddress = $quote->getBillingAddress();
             $customerAddress = $this->customerAddressFactory->create();
             $customerAddress->setFirstname($billingAddress->getFirstname());

app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php

@@ -269,6 +269,7 @@ public function testValidateAddressesNotSavedInAddressBook()
     {
         $this->expectException(ValidatorException::class);
         $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
+        $this->quoteAddressMock->expects($this->any())->method('getCustomerAddressId')->willReturn(2);
         $this->quoteAddressMock->method('getStreet')->willReturn(['test']);
         $this->quoteAddressMock->method('getCustomAttributes')->willReturn(['test']);
         $this->customerAddressFactoryMock->method('create')
@@ -278,14 +279,13 @@ public function testValidateAddressesNotSavedInAddressBook()
             ->getMock();
         $this->addressFactoryMock->expects($this->exactly(1))->method('create')->willReturn($addressMock);
         $this->quoteMock
-            ->expects($this->atMost(2))
+            ->expects($this->any())
             ->method('getBillingAddress')
             ->willReturn($this->quoteAddressMock);
         $this->quoteMock
-            ->expects($this->once())
+            ->expects($this->any())
             ->method('getShippingAddress')
             ->willReturn($this->quoteAddressMock);
-        $this->quoteAddressMock->expects($this->any())->method('getCustomerAddressId')->willReturn(null);
         $validatorMock = $this->getMockBuilder(Validator::class)
             ->disableOriginalConstructor()
             ->getMock();