MAGETWO-36382: Magento\Quote\Api\GuestBillingAddressManagement

- replaced inheritance with composition

Author: arkadiych

app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php

@@ -8,42 +8,36 @@
 
 use Magento\Quote\Api\GuestBillingAddressManagementInterface;
 use Magento\Quote\Model\BillingAddressManagement;
-use Magento\Quote\Model\QuoteAddressValidator;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
-use Magento\Quote\Model\QuoteRepository;
-use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Billing address management service for guest carts.
  */
-class GuestBillingAddressManagement extends BillingAddressManagement implements GuestBillingAddressManagementInterface
+class GuestBillingAddressManagement implements GuestBillingAddressManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
      */
     private $quoteIdMaskFactory;
 
+    /**
+     * @var BillingAddressManagement
+     */
+    private $billingAddressManagement;
+
     /**
      * Constructs a quote billing address service object.
      *
-     * @param QuoteRepository $quoteRepository Quote repository.
-     * @param QuoteAddressValidator $addressValidator Address validator.
-     * @param Logger $logger Logger.
+     * @param BillingAddressManagement $billingAddressManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      */
     public function __construct(
-        QuoteRepository $quoteRepository,
-        QuoteAddressValidator $addressValidator,
-        Logger $logger,
+        BillingAddressManagement $billingAddressManagement,
         QuoteIdMaskFactory $quoteIdMaskFactory
     ) {
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
-        parent::__construct(
-            $quoteRepository,
-            $addressValidator,
-            $logger
-        );
+        $this->billingAddressManagement = $billingAddressManagement;
     }
 
     /**
@@ -53,8 +47,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
     {
         /** @var $quoteIdMask QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
-
-        return parent::assign($quoteIdMask->getId(), $address);
+        return $this->billingAddressManagement->assign($quoteIdMask->getId(), $address);
     }
 
     /**
@@ -64,7 +57,6 @@ public function get($cartId)
     {
         /** @var $quoteIdMask QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
-
-        return parent::get($quoteIdMask->getId());
+        return $this->billingAddressManagement->get($quoteIdMask->getId());
     }
 }

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestBillingAddressManagementTest.php

@@ -6,8 +6,6 @@
  */
 namespace Magento\Quote\Test\Unit\Model\GuestCart;
 
-use Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper;
-
 class GuestBillingAddressManagementTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -18,22 +16,22 @@ class GuestBillingAddressManagementTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteRepositoryMock;
+    protected $quoteIdMaskFactoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $validatorMock;
+    protected $quoteIdMaskMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteIdMaskFactoryMock;
+    protected $billingAddressManagementMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteIdMaskMock;
+    protected $addressMock;
 
     /**
      * @var string
@@ -51,14 +49,17 @@ class GuestBillingAddressManagementTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
-        $this->validatorMock = $this->getMock('\Magento\Quote\Model\QuoteAddressValidator', [], [], '', false);
-        $logger = $this->getMock('\Psr\Log\LoggerInterface');
-        $this->quoteIdMaskFactoryMock = $this->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
-        $this->quoteIdMaskMock = $this->getMock('Magento\Quote\Model\QuoteIdMask', [], [], '', false);
+        $this->addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
+        $this->billingAddressManagementMock = $this->getMock(
+            'Magento\Quote\Model\BillingAddressManagement',
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
-        $this->cartId = 11;
+        $this->cartId = 123;
 
         $guestCartTestHelper = new GuestCartTestHelper($this);
         list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) = $guestCartTestHelper->mockQuoteIdMask(
@@ -69,55 +70,28 @@ protected function setUp()
         $this->model = $objectManager->getObject(
             'Magento\Quote\Model\GuestCart\GuestBillingAddressManagement',
             [
-                'quoteRepository' => $this->quoteRepositoryMock,
-                'addressValidator' => $this->validatorMock,
-                'logger' => $logger,
-                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
+                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
+                'billingAddressManagement' => $this->billingAddressManagementMock
             ]
         );
     }
 
     /**
      * @return void
      */
-    public function testGetAddress()
+    public function testGet()
     {
-        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
-        $this->quoteRepositoryMock->expects($this->once())->method('getActive')
-            ->with($this->cartId )->will($this->returnValue($quoteMock));
-
-        $addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
-        $quoteMock->expects($this->any())->method('getBillingAddress')->will($this->returnValue($addressMock));
-
-        $this->assertEquals($addressMock, $this->model->get($this->maskedCartId ));
+        $this->billingAddressManagementMock->expects($this->once())->method('get')->willReturn($this->addressMock);
+        $this->assertEquals($this->addressMock, $this->model->get($this->maskedCartId));
     }
 
     /**
      * @return void
      */
-    public function testAssingAddress()
+    public function testAssing()
     {
-        $address = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false, false);
-
-        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with($this->cartId )
-            ->will($this->returnValue($quoteMock));
-
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($address)
-            ->will($this->returnValue(true));
-
-        $quoteMock->expects($this->once())->method('setBillingAddress')->with($address);
-        $quoteMock->expects($this->once())->method('setDataChanges')->with(true);
-        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
         $addressId = 1;
-        $billingAddressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
-        $billingAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
-        $quoteMock->expects($this->once())->method('getBillingAddress')
-            ->will($this->returnValue($billingAddressMock));
-
-        $this->assertEquals($addressId, $this->model->assign($this->maskedCartId , $address));
+        $this->billingAddressManagementMock->expects($this->once())->method('assign')->willReturn($addressId);
+        $this->assertEquals($addressId, $this->model->assign($this->maskedCartId, $this->addressMock));
     }
 }