MAGETWO-36381: Magento\Quote\Api\GuestShippingAddressManagement

- replaced inheritance with composition

Author: arkadiych

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

@@ -6,41 +6,36 @@
 namespace Magento\Quote\Model\GuestCart;
 
 use Magento\Quote\Api\GuestShippingAddressManagementInterface;
-use Magento\Quote\Model\QuoteAddressValidator;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
-use Magento\Quote\Model\QuoteRepository;
 use Magento\Quote\Model\ShippingAddressManagement;
-use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Shipping address management class for guest carts.
  */
-class GuestShippingAddressManagement extends ShippingAddressManagement implements
-    GuestShippingAddressManagementInterface
+class GuestShippingAddressManagement implements GuestShippingAddressManagementInterface
 {
     /**
      * @var QuoteIdMaskFactory
      */
     protected $quoteIdMaskFactory;
 
+    /**
+     * @var ShippingAddressManagement
+     */
+    protected $shippingAddressManagement;
+
     /**
      * Constructs a quote shipping address write service object.
      *
-     * @param QuoteRepository $quoteRepository
-     * @param QuoteAddressValidator $addressValidator
-     * @param Logger $logger
+     * @param ShippingAddressManagement $shippingAddressManagement
      * @param QuoteIdMaskFactory $quoteIdMaskFactory
      */
     public function __construct(
-        \Magento\Quote\Model\QuoteRepository $quoteRepository,
-        QuoteAddressValidator $addressValidator,
-        Logger $logger,
+        ShippingAddressManagement $shippingAddressManagement,
         QuoteIdMaskFactory $quoteIdMaskFactory
     ) {
-        $this->quoteRepository = $quoteRepository;
-        $this->addressValidator = $addressValidator;
-        $this->logger = $logger;
+        $this->shippingAddressManagement = $shippingAddressManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
     }
 
@@ -51,7 +46,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->shippingAddressManagement->assign($quoteIdMask->getId(), $address);
     }
 
     /**
@@ -61,6 +56,6 @@ public function get($cartId)
     {
         /** @var $quoteIdMask QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
-        return parent::get($quoteIdMask->getId());
+        return $this->shippingAddressManagement->get($quoteIdMask->getId());
     }
 }

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

@@ -17,109 +17,76 @@ class GuestShippingAddressManagementTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteRepositoryMock;
+    protected $quoteAddressMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteAddressMock;
+    protected $quoteIdMaskFactoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $validatorMock;
+    protected $quoteIdMaskMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteIdMaskFactoryMock;
+    protected $shippingAddressManagementMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var string
      */
-    protected $quoteIdMaskMock;
+    protected $maskedCartId;
+
+    /**
+     * @var int
+     */
+    protected $cartId;
 
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->quoteRepositoryMock = $this->getMock('\Magento\Quote\Model\QuoteRepository', [], [], '', false);
-        $this->quoteAddressMock = $this->getMock( '\Magento\Quote\Model\Quote\Address', [], [], '', false);
-        $this->validatorMock = $this->getMock( 'Magento\Quote\Model\QuoteAddressValidator', [], [], '', false);
-        $this->quoteIdMaskFactoryMock = $this->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
-        $this->quoteIdMaskMock = $this->getMock('Magento\Quote\Model\QuoteIdMask', [], [], '', false);
+        $this->shippingAddressManagementMock = $this->getMock(
+            'Magento\Quote\Model\ShippingAddressManagement',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->quoteAddressMock = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
+
+        $this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
+        $this->cartId = 123;
+
+        $guestCartTestHelper = new GuestCartTestHelper($this);
+        list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) = $guestCartTestHelper->mockQuoteIdMask(
+            $this->maskedCartId,
+            $this->cartId
+        );
+
         $this->model = $objectManager->getObject(
             'Magento\Quote\Model\GuestCart\GuestShippingAddressManagement',
             [
-                'quoteRepository' => $this->quoteRepositoryMock,
-                'addressValidator' => $this->validatorMock,
-                'logger' => $this->getMock('\Psr\Log\LoggerInterface'),
+                'shippingAddressManagement' => $this->shippingAddressManagementMock,
                 'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
             ]
         );
     }
 
-    public function testAssignAddress()
+    public function testAssign()
     {
-        $maskedCartId = 'f216207248d65c789b17be8545e0aa73';
-        $cartId = 867;
-
-        $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
-        $this->quoteIdMaskMock->expects($this->once())
-            ->method('load')
-            ->with($maskedCartId, 'masked_id')
-            ->willReturn($this->quoteIdMaskMock);
-        $this->quoteIdMaskMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($cartId);
-
-        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with($cartId)
-            ->will($this->returnValue($quoteMock));
-        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
-
-
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($this->quoteAddressMock)
-            ->will($this->returnValue(true));
-
-        $quoteMock->expects($this->once())->method('setShippingAddress')->with($this->quoteAddressMock);
-        $quoteMock->expects($this->once())->method('setDataChanges')->with(true);
-        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
-
         $addressId = 1;
-        $shippingAddressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
-        $shippingAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
-        $quoteMock->expects($this->once())->method('getShippingAddress')
-            ->will($this->returnValue($shippingAddressMock));
-
-        $this->assertEquals($addressId, $this->model->assign($maskedCartId, $this->quoteAddressMock));
+        $this->shippingAddressManagementMock->expects($this->once())->method('assign')->willReturn($addressId);
+        $this->assertEquals($addressId, $this->model->assign($this->maskedCartId, $this->quoteAddressMock));
     }
 
-    public function testGetAddress()
+    public function testGet()
     {
-        $maskedCartId = 'f216207248d65c789b17be8545e0aa73';
-        $cartId = 867;
-
-        $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
-        $this->quoteIdMaskMock->expects($this->once())
-            ->method('load')
-            ->with($maskedCartId, 'masked_id')
-            ->willReturn($this->quoteIdMaskMock);
-        $this->quoteIdMaskMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($cartId);
-
-        $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false);
-        $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with($cartId)->will(
-            $this->returnValue($quoteMock)
+        $this->shippingAddressManagementMock->expects($this->once())->method('get')->willReturn(
+            $this->quoteAddressMock
         );
-
-        $addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
-        $quoteMock->expects($this->any())->method('getShippingAddress')->will($this->returnValue($addressMock));
-        $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(false));
-        $this->assertEquals($addressMock, $this->model->get($maskedCartId));
+        $this->assertEquals($this->quoteAddressMock, $this->model->get($this->maskedCartId));
     }
 }