MAGETWO-51791: [Github] Sales Order extension_attributes #3967

fixed static tests

Author: Serhiy Shkolyarenko

app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php

@@ -6,12 +6,10 @@
 
 namespace Magento\GiftMessage\Test\Unit\Model\Plugin;
 
-use Magento\GiftMessage\Model\Plugin\OrderGet;
-
 class OrderGetTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var OrderGet
+     * @var \Magento\GiftMessage\Model\Plugin\OrderGet
      */
     private $plugin;
 
@@ -97,7 +95,7 @@ public function setUp()
         $this->orderRepositoryMock = $this->getMock(
             \Magento\Sales\Api\OrderRepositoryInterface::class
         );
-        $this->plugin = new OrderGet(
+        $this->plugin = new \Magento\GiftMessage\Model\Plugin\OrderGet(
             $this->giftMessageOrderRepositoryMock,
             $this->giftMessageOrderItemRepositoryMock,
             $this->orderExtensionFactoryMock,

app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php

@@ -25,11 +25,6 @@ class OrderSaveTest extends \PHPUnit_Framework_TestCase
      */
     private $giftMessageOrderItemRepositoryMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $orderItemExtensionFactoryMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -72,7 +67,11 @@ public function setUp()
             \Magento\Sales\Api\Data\OrderInterface::class
         );
         $this->orderExtensionMock = $this->getMock(
-            \Magento\Sales\Api\Data\OrderExtension::class, ['getGiftMessage', 'setGiftMessage'], [], '', false
+            \Magento\Sales\Api\Data\OrderExtension::class,
+            ['getGiftMessage', 'setGiftMessage'],
+            [],
+            '',
+            false
         );
         $this->giftMessageMock = $this->getMock(
             \Magento\GiftMessage\Api\Data\MessageInterface::class
@@ -81,7 +80,11 @@ public function setUp()
             \Magento\Sales\Api\Data\OrderItemInterface::class
         );
         $this->orderItemExtensionMock = $this->getMock(
-            \Magento\Sales\Api\Data\OrderItemExtension::class, ['setGiftMessage', 'getGiftMessage'], [], '', false
+            \Magento\Sales\Api\Data\OrderItemExtension::class,
+            ['setGiftMessage', 'getGiftMessage'],
+            [],
+            '',
+            false
         );
         $this->orderRepositoryMock = $this->getMock(
             \Magento\Sales\Api\OrderRepositoryInterface::class
@@ -137,7 +140,6 @@ public function testAfterSaveIfGiftMessagesNotExist()
     {
         // save Gift Message on order level
         $orderId = 1;
-        $orderItemId = 2;
         $this->orderMock->expects($this->once())->method('getEntityId')->willReturn($orderId);
         $this->orderMock
             ->expects($this->once())