Fix static and unit tests.

nmalevanec · nmalevanec · commit 24f4d9ad2e04 · 2019-03-20T14:11:18.000+02:00
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
@@ -8,18 +8,20 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
-use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
-class AddTrack extends \Magento\Backend\App\Action
+/**
+ * Add new tracking number to shipment controller.
+ */
+class AddTrack extends Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -39,7 +41,7 @@ class AddTrack extends \Magento\Backend\App\Action
     private $shipmentRepository;
 
     /**
-     * @var TrackFactory
+     * @var ShipmentTrackInterfaceFactory
      */
     private $trackFactory;
 
@@ -52,14 +54,14 @@ class AddTrack extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param ShipmentLoader $shipmentLoader
      * @param ShipmentRepositoryInterface|null $shipmentRepository
-     * @param TrackFactory|null $trackFactory
+     * @param ShipmentTrackInterfaceFactory|null $trackFactory
      * @param SerializerInterface|null $serializer
      */
     public function __construct(
         Action\Context $context,
         ShipmentLoader $shipmentLoader,
         ShipmentRepositoryInterface $shipmentRepository = null,
-        TrackFactory $trackFactory = null,
+        ShipmentTrackInterfaceFactory $trackFactory = null,
         SerializerInterface $serializer = null
     ) {
         parent::__construct($context);
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
@@ -6,127 +6,162 @@
 
 namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\ViewInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Title;
+use Magento\Framework\View\Result\Page;
+use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order\Shipment\Track;
+use Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack;
+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
 /**
- * Class AddTrackTest
+ * Class AddTrackTest covers AddTrack controller.
  *
- * @package Magento\Shipping\Controller\Adminhtml\Order\Shipment
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddTrackTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $shipmentLoader;
+    private $shipmentLoader;
 
     /**
-     * @var \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack
+     * @var AddTrack
      */
-    protected $controller;
+    private $controller;
 
     /**
-     * @var Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $context;
+    private $context;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $request;
+    private $request;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $response;
+    private $response;
 
     /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var  ViewInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $objectManager;
+    private $view;
 
     /**
-     * @var  \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Page|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $view;
+    private $resultPageMock;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $resultPageMock;
+    private $pageConfigMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Title|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $pageConfigMock;
+    private $pageTitleMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentTrackInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $pageTitleMock;
+    private $trackFactory;
 
+    /**
+     * @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $rawResult;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->shipmentLoader = $this->getMockBuilder(
-            \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader::class
+            ShipmentLoader::class
         )
             ->disableOriginalConstructor()
             ->setMethods(['setShipmentId', 'setOrderId', 'setShipment', 'setTracking', 'load'])
             ->getMock();
         $this->context = $this->createPartialMock(
-            \Magento\Backend\App\Action\Context::class,
+            Context::class,
             [
                 'getRequest',
                 'getResponse',
                 'getRedirect',
                 'getObjectManager',
                 'getTitle',
-                'getView'
+                'getView',
+                'getResultFactory'
             ]
         );
         $this->response = $this->createPartialMock(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             ['setRedirect', 'sendResponse', 'setBody']
         );
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->request = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()->getMock();
-        $this->objectManager = $this->createPartialMock(
-            \Magento\Framework\ObjectManager\ObjectManager::class,
-            ['create', 'get']
-        );
-        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-        $this->resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
+        $this->view = $this->createMock(ViewInterface::class);
+        $this->resultPageMock = $this->getMockBuilder(Page::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->pageConfigMock = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
+        $this->pageConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->pageTitleMock = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
+        $this->pageTitleMock = $this->getMockBuilder(Title::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->trackFactory = $this->getMockBuilder(ShipmentTrackInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->rawResult = $this->getMockBuilder(ResultInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setContents'])
+            ->getMockForAbstractClass();
+        $resultFactory = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
         $this->context->expects($this->once())
             ->method('getRequest')
             ->will($this->returnValue($this->request));
         $this->context->expects($this->once())
             ->method('getResponse')
             ->will($this->returnValue($this->response));
-        $this->context->expects($this->once())
-            ->method('getObjectManager')
-            ->will($this->returnValue($this->objectManager));
         $this->context->expects($this->once())
             ->method('getView')
             ->will($this->returnValue($this->view));
+        $resultFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->rawResult);
+        $this->context->expects($this->once())
+            ->method('getResultFactory')
+            ->willReturn($resultFactory);
         $this->controller = $objectManagerHelper->getObject(
-            \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack::class,
+            AddTrack::class,
             [
                 'context' => $this->context,
                 'shipmentLoader' => $this->shipmentLoader,
                 'request' => $this->request,
                 'response' => $this->response,
-                'view' => $this->view
+                'view' => $this->view,
+                'trackFactory' => $this->trackFactory,
             ]
         );
     }
@@ -144,16 +179,18 @@ public function testExecute()
         $tracking = [];
         $shipmentData = ['items' => [], 'send_email' => ''];
         $shipment = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Shipment::class,
+            Shipment::class,
             ['addTrack', '__wakeup', 'save']
         );
         $this->request->expects($this->any())
             ->method('getParam')
             ->will(
                 $this->returnValueMap(
                     [
-                        ['order_id', null, $orderId], ['shipment_id', null, $shipmentId],
-                        ['shipment', null, $shipmentData], ['tracking', null, $tracking],
+                        ['order_id', null, $orderId],
+                        ['shipment_id', null, $shipmentId],
+                        ['shipment', null, $shipmentData],
+                        ['tracking', null, $tracking],
                     ]
                 )
             );
@@ -183,14 +220,13 @@ public function testExecute()
         $this->shipmentLoader->expects($this->once())
             ->method('load')
             ->will($this->returnValue($shipment));
-        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+        $track = $this->getMockBuilder(Track::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup', 'setNumber', 'setCarrierCode', 'setTitle'])
             ->getMock();
-        $this->objectManager->expects($this->atLeastOnce())
+        $this->trackFactory->expects($this->once())
             ->method('create')
-            ->with(\Magento\Sales\Model\Order\Shipment\Track::class)
-            ->will($this->returnValue($track));
+            ->willReturn($track);
         $track->expects($this->once())
             ->method('setNumber')
             ->with($number)
@@ -206,8 +242,8 @@ public function testExecute()
         $this->view->expects($this->once())
             ->method('loadLayout')
             ->will($this->returnSelf());
-        $layout = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
-        $menuBlock = $this->createPartialMock(\Magento\Framework\View\Element\BlockInterface::class, ['toHtml']);
+        $layout = $this->createMock(LayoutInterface::class);
+        $menuBlock = $this->createPartialMock(BlockInterface::class, ['toHtml']);
         $html = 'html string';
         $this->view->expects($this->once())
             ->method('getLayout')
@@ -235,9 +271,10 @@ public function testExecute()
         $this->pageConfigMock->expects($this->any())
             ->method('getTitle')
             ->willReturn($this->pageTitleMock);
-        $this->response->expects($this->once())
-            ->method('setBody')
-            ->with($html);
-        $this->assertNull($this->controller->execute());
+        $this->rawResult->expects($this->once())
+            ->method('setContents')
+            ->with($html)
+            ->willReturnSelf();
+        $this->assertInstanceOf(ResultInterface::class, $this->controller->execute());
     }
 }
