MAGETWO-54109: Unskip Tests which Refer to Already Closed Tickets

Author: Stanislav Idolov

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

@@ -40,6 +40,11 @@ class BillingAddressManagementTest extends \PHPUnit_Framework_TestCase
      */
     protected $addressRepository;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shippingAssignmentMock;
+
     /**
      * @return void
      */
@@ -59,6 +64,19 @@ protected function setUp()
                 'addressRepository' => $this->addressRepository
             ]
         );
+
+        $this->shippingAssignmentMock = $this->getMock(
+            \Magento\Quote\Model\ShippingAddressAssignment::class,
+            ['setAddress'],
+            [],
+            '',
+            false
+        );
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'shippingAddressAssignment',
+            $this->shippingAssignmentMock
+        );
     }
 
     /**
@@ -111,6 +129,10 @@ public function testSetAddress()
         $quoteMock->expects($this->once())->method('setBillingAddress')->with($address)->willReturnSelf();
         $quoteMock->expects($this->once())->method('setDataChanges')->with(1)->willReturnSelf();
 
+        $this->shippingAssignmentMock->expects($this->once())
+            ->method('setAddress')
+            ->with($quoteMock, $address, $useForShipping);
+
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
         $this->assertEquals($addressId, $this->model->assign($cartId, $address, $useForShipping));
     }
@@ -151,6 +173,10 @@ public function testSetAddressWithInabilityToSaveQuote()
         $quoteMock->expects($this->once())->method('setBillingAddress')->with($address)->willReturnSelf();
         $quoteMock->expects($this->once())->method('setDataChanges')->with(1)->willReturnSelf();
 
+        $this->shippingAssignmentMock->expects($this->once())
+            ->method('setAddress')
+            ->with($quoteMock, $address, false);
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('save')
             ->with($quoteMock)