MAGETWO-56702: Around plugins refactoring: refactoring and unit test fixing/coverage

Author: Viktor Paladiychuk

app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\GiftMessage\Block\Message\Multishipping\Plugin;
 
-use Magento\Multishipping\Block\Checkout\Shipping;
-use Magento\GiftMessage\Helper\Message as HelperMessage;
+use Magento\Multishipping\Block\Checkout\Shipping as ShippingBlock;
+use Magento\GiftMessage\Helper\Message as MessageHelper;
 use Magento\Framework\DataObject;
 
 /**
@@ -17,31 +17,31 @@ class ItemsBox
     /**
      * Gift message helper
      *
-     * @var HelperMessage
+     * @var MessageHelper
      */
     protected $helper;
 
     /**
      * Construct
      *
-     * @param HelperMessage $helper
+     * @param MessageHelper $helper
      */
-    public function __construct(HelperMessage $helper)
+    public function __construct(MessageHelper $helper)
     {
         $this->helper = $helper;
     }
 
     /**
      * Get items box message text for multishipping
      *
-     * @param Shipping $subject
+     * @param ShippingBlock $subject
      * @param string $itemsBoxText
      * @param DataObject $addressEntity
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterGetItemsBoxTextAfter(Shipping $subject, $itemsBoxText, DataObject $addressEntity)
+    public function afterGetItemsBoxTextAfter(ShippingBlock $subject, $itemsBoxText, DataObject $addressEntity)
     {
         return $itemsBoxText . $this->helper->getInline('multishipping_address', $addressEntity);
     }

app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php

@@ -6,21 +6,21 @@
 namespace Magento\GiftMessage\Model\Plugin;
 
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\GiftMessage\Helper\Message as HelperMessage;
+use Magento\GiftMessage\Helper\Message as MessageHelper;
 use Magento\Quote\Model\Quote\Item\ToOrderItem;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 
 class QuoteItem
 {
     /**
-     * @var HelperMessage
+     * @var MessageHelper
      */
     protected $_helper;
 
     /**
-     * @param HelperMessage $helper
+     * @param MessageHelper $helper
      */
-    public function __construct(HelperMessage $helper)
+    public function __construct(MessageHelper $helper)
     {
         $this->_helper = $helper;
     }

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

@@ -68,7 +68,7 @@ protected function setUp()
         $this->model = new \Magento\GiftMessage\Model\Plugin\QuoteItem($this->helperMock);
     }
 
-    public function testAroundItemToOrderItem()
+    public function testAfterItemToOrderItem()
     {
         $storeId = 1;
         $giftMessageId = 1;