Static test improvement.

Author: Winfle

app/code/Magento/Sales/Model/Order/CustomerAssignment.php

@@ -49,7 +49,8 @@ public function execute(OrderInterface $order, CustomerInterface $customer)/*: v
         $this->orderRepository->save($order);
 
         $this->eventManager->dispatch(
-            'sales_order_customer_assign_after', [
+            'sales_order_customer_assign_after',
+            [
                 'order'     => $order,
                 'customer'  => $customer
             ]

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

@@ -29,7 +29,7 @@ class AssignOrderToCustomerObserverTest extends TestCase
     protected $orderRepositoryMock;
 
     /** @var CustomerAssignment | PHPUnit_Framework_MockObject_MockObject */
-    protected $customerAssignmentMock;
+    protected $assignmentMock;
 
     /**
      * Set Up
@@ -40,11 +40,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->customerAssignmentMock =  $this->getMockBuilder(CustomerAssignment::class)
+        $this->assignmentMock =  $this->getMockBuilder(CustomerAssignment::class)
         ->disableOriginalConstructor()
         ->getMock();
 
-        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock, $this->customerAssignmentMock);
+        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock, $this->assignmentMock);
     }
 
     /**
@@ -78,12 +78,14 @@ 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->customerAssignmentMock->expects($this->once())->method('execute')->with($orderMock, $customerMock);
-        } else {
-            $this->customerAssignmentMock->expects($this->never())->method('execute');
+            $this->assignmentMock->expects($this->once())->method('execute')->with($orderMock, $customerMock);
+            $this->sut->execute($observerMock);
+            return;
         }
 
+        $this->assignmentMock->expects($this->never())->method('execute');
         $this->sut->execute($observerMock);
     }
 

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

@@ -1,7 +1,8 @@
 <?php
 
-use Magento\Sales\Model\Order;
+namespace Magento\SalesRule\Model\Observer;
 
+use Magento\Sales\Model\Order;
 use Magento\Customer\Model\GroupManagement;
 use Magento\SalesRule\Api\CouponRepositoryInterface;
 use Magento\SalesRule\Model\Coupon;
@@ -13,6 +14,8 @@
 /**
  * Class AssignCouponDataAfterOrderCustomerAssignTest
  *
+ * @magentoAppIsolation enabled
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\TestCase
@@ -80,12 +83,12 @@ public function __construct($name = null, array $data = [], $dataName = '')
         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->orderRepository = $this->objectManager->get(\Magento\Sales\Model\OrderRepository::class);
         $this->delegateCustomerService = $this->objectManager->get(Order\OrderCustomerDelegate::class);
         $this->customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $this->ruleCustomerFactory =  $this->objectManager->get(Magento\SalesRule\Model\Rule\CustomerFactory::class);;
+        $this->ruleCustomerFactory =  $this->objectManager->get(\Magento\SalesRule\Model\Rule\CustomerFactory::class);
         $this->assignCouponToCustomerObserver = $this->objectManager->get(
-            Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver::class
+            \Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver::class
         );
     }
 
@@ -116,7 +119,6 @@ protected function tearDown()
     }
 
     /**
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testCouponDataHasBeenAssignedTest()
@@ -137,15 +139,14 @@ public function testCouponDataHasBeenAssignedTest()
     }
 
     /**
-     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testOrderCancelingDecreasesCouponUsages()
     {
         $this->processOrder($this->order);
 
         // Should not throw exception as bux is fixed now
-        $this->cancelOrder($this->order);
+        $this->order->cancel();
         $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
 
         // Assert, that rule customer model has been created for specific customer
@@ -172,20 +173,12 @@ private function processOrder(Order $order)
         return $this->orderRepository->save($order);
     }
 
-    /**
-     * @param Order $order
-     */
-    private function cancelOrder(Order $order)
-    {
-        $order->cancel();
-    }
-
     /**
      * @param Customer $customer
      * @param Rule $rule
      * @return Rule\Customer
      */
-    private function getSalesruleCustomerUsage(Customer $customer, Rule $rule) : Magento\SalesRule\Model\Rule\Customer
+    private function getSalesruleCustomerUsage(Customer $customer, Rule $rule) : \Magento\SalesRule\Model\Rule\Customer
     {
         $ruleCustomer = $this->ruleCustomerFactory->create();
         return $ruleCustomer->loadByCustomerRule($customer->getId(), $rule->getRuleId());
@@ -301,4 +294,3 @@ private function registerNewCustomer() : Customer
         return $customer;
     }
 }
-