Refactored Unit-tests, Integration tests

Author: Winfle

app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php

@@ -27,20 +27,20 @@ class AssignOrderToCustomerObserver implements ObserverInterface
     /**
      * @var CustomerAssignment
      */
-    private $customerAssignmentService;
+    private $assignmentService;
 
     /**
      * AssignOrderToCustomerObserver constructor.
      *
      * @param OrderRepositoryInterface $orderRepository
-     * @param CustomerAssignment $customerAssignmentService
+     * @param CustomerAssignment $assignmentService
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
-        CustomerAssignment $customerAssignmentService
+        CustomerAssignment $assignmentService
     ) {
         $this->orderRepository = $orderRepository;
-        $this->customerAssignmentService = $customerAssignmentService;
+        $this->assignmentService = $assignmentService;
     }
 
     /**
@@ -57,7 +57,7 @@ public function execute(Observer $observer)
             $orderId = $delegateData['__sales_assign_order_id'];
             $order = $this->orderRepository->get($orderId);
             if (!$order->getCustomerId() && $customer->getId()) {
-                $this->customerAssignmentService->execute($order, $customer);
+                $this->assignmentService->execute($order, $customer);
             }
         }
     }

app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\CustomerAssignment;
 use Magento\Sales\Observer\AssignOrderToCustomerObserver;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -27,6 +28,9 @@ class AssignOrderToCustomerObserverTest extends TestCase
     /** @var OrderRepositoryInterface|PHPUnit_Framework_MockObject_MockObject */
     protected $orderRepositoryMock;
 
+    /** @var CustomerAssignment | PHPUnit_Framework_MockObject_MockObject */
+    protected $customerAssignmentMock;
+
     /**
      * Set Up
      */
@@ -35,7 +39,12 @@ protected function setUp()
         $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock);
+
+        $this->customerAssignmentMock =  $this->getMockBuilder(CustomerAssignment::class)
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock, $this->customerAssignmentMock);
     }
 
     /**
@@ -69,13 +78,12 @@ public function testAssignOrderToCustomerAfterGuestOrder($customerId)
         $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
         $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId)
             ->willReturn($orderMock);
-        if (!$customerId) {
-            $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock);
-            $this->sut->execute($observerMock);
-            return ;
+        if ($customerId) {
+            $this->customerAssignmentMock->expects($this->once())->method('execute')->with($orderMock, $customerMock);
+        } else {
+            $this->customerAssignmentMock->expects($this->never())->method('execute');
         }
 
-        $this->orderRepositoryMock->expects($this->never())->method('save')->with($orderMock);
         $this->sut->execute($observerMock);
     }
 

dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php

@@ -8,10 +8,20 @@
 use Magento\SalesRule\Model\Rule;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Data\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
 
-
+/**
+ * Class AssignCouponDataAfterOrderCustomerAssignTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @var \Magento\Quote\Api\GuestCartManagementInterface
      */
@@ -22,11 +32,6 @@ class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\Te
      */
     private $orderRepository;
 
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    private $objectManager;
-
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
@@ -48,11 +53,32 @@ class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\Te
     private $ruleCustomerFactory;
 
     /**
-     * @inheritdoc
+     * @var Rule
      */
-    protected function setUp()
+    private $salesRule;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var Customer
+     */
+    private $customer;
+
+    /**
+     * AssignCouponDataAfterOrderCustomerAssignTest constructor.
+     */
+    public function __construct($name = null, array $data = [], $dataName = '')
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        parent::__construct($name, $data, $dataName);
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
         $this->orderRepository = $this->objectManager->get(Magento\Sales\Model\OrderRepository::class);
         $this->delegateCustomerService = $this->objectManager->get(Order\OrderCustomerDelegate::class);
@@ -63,25 +89,44 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->salesRule = $this->prepareSalesRule();
+        $this->coupon = $this->attachSalesruleCoupon($this->salesRule);
+        $this->order  = $this->makeOrderWithCouponAsGuest($this->coupon);
+        $this->delegateOrderToBeAssigned($this->order);
+        $this->customer = $this->registerNewCustomer();
+        $this->order->setCustomerId($this->customer->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        unset(
+            $this->order,
+            $this->coupon,
+            $this->customer,
+            $this->salesRule
+        );
+    }
+
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testCouponDataHasBeenAssignedTest()
     {
-        $rule = $this->prepareSalesRule();
-        $coupon = $this->attachSalesruleCoupon($rule);
-
-        $order  = $this->makeOrderWithCouponAsGuest($coupon);
-        $this->delegateOrderToBeAssigned($order);
-
-        $customer = $this->registerNewCustomer();
-        $ruleCustomer = $this->getSalesruleCustomerUsage($customer, $rule);
+        $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
 
         // Assert, that rule customer model has been created for specific customer
         $this->assertEquals(
             $ruleCustomer->getCustomerId(),
-            $customer->getId()
+            $this->customer->getId()
         );
 
         // Assert, that customer has increased coupon usage of specific rule
@@ -97,33 +142,23 @@ public function testCouponDataHasBeenAssignedTest()
      */
     public function testOrderCancelingDecreasesCouponUsages()
     {
-        $rule = $this->prepareSalesRule();
-        $coupon = $this->attachSalesruleCoupon($rule);
-
-        $order  = $this->makeOrderWithCouponAsGuest($coupon);
-        $this->delegateOrderToBeAssigned($order);
-
-        $customer = $this->registerNewCustomer();
-
-        $order->setCustomerId($customer->getId());
-        $this->processOrder($order);
+        $this->processOrder($this->order);
 
         // Should not throw exception as bux is fixed now
-        $this->cancelOrder($order);
-        $ruleCustomer = $this->getSalesruleCustomerUsage($customer, $rule);
+        $this->cancelOrder($this->order);
+        $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
 
         // Assert, that rule customer model has been created for specific customer
         $this->assertEquals(
             $ruleCustomer->getCustomerId(),
-            $customer->getId()
+            $this->customer->getId()
         );
 
         // Assert, that customer has increased coupon usage of specific rule
         $this->assertEquals(
             0,
             $ruleCustomer->getTimesUsed()
         );
-
     }
 
     /**
@@ -186,7 +221,7 @@ private function prepareSalesRule() : Rule
                 ],
             ]
         );
-        $this->objectManager->get(
+        Bootstrap::getObjectManager()->get(
             \Magento\SalesRule\Model\ResourceModel\Rule::class
         )->save($salesRule);
 
@@ -204,7 +239,7 @@ private function attachSalesruleCoupon(Rule $salesRule) : Coupon
             ->setCode('CART_FIXED_DISCOUNT_15')
             ->setType(0);
 
-        $this->objectManager->get(CouponRepositoryInterface::class)->save($coupon);
+        Bootstrap::getObjectManager()->get(CouponRepositoryInterface::class)->save($coupon);
 
         return $coupon;
     }
@@ -215,7 +250,7 @@ private function attachSalesruleCoupon(Rule $salesRule) : Coupon
      */
     private function makeOrderWithCouponAsGuest(Coupon $coupon) : Order
     {
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
         $order->loadByIncrementId('100000001')
             ->setCustomerIsGuest(true)
             ->setCouponCode($coupon->getCode())
@@ -242,7 +277,7 @@ private function delegateOrderToBeAssigned(Order $order)
      */
     private function registerNewCustomer() : Customer
     {
-        $customer = $this->objectManager->create(
+        $customer = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Api\Data\CustomerInterface::class
         );