MAGETWO-35824: [MX] [Dragons] Code coverage - Sprint 67

 - MAGETWO-36987: Coverage or refactoring method - Magento\Search\Controller\Adminhtml\Term\Save::execute

Author: Maksym Aposov

app/code/Magento/Search/Controller/Adminhtml/Term/Save.php

@@ -6,8 +6,31 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Search\Model\QueryFactory;
+
 class Save extends \Magento\Search\Controller\Adminhtml\Term
 {
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @param Context $context
+     * @param PageFactory $resultPageFactory
+     * @param QueryFactory $queryFactory
+     */
+    public function __construct(
+        Context $context,
+        PageFactory $resultPageFactory,
+        QueryFactory $queryFactory
+    ) {
+        parent::__construct($context, $resultPageFactory);
+        $this->queryFactory = $queryFactory;
+    }
+
     /**
      * Save search query
      *
@@ -51,7 +74,7 @@ private function loadQuery()
         $queryId = $this->getRequest()->getPost('query_id', null);
 
         /* @var $model \Magento\Search\Model\Query */
-        $model = $this->_objectManager->create('Magento\Search\Model\Query');
+        $model = $this->queryFactory->create();
         if ($queryText) {
             $storeId = $this->getRequest()->getPost('store_id', false);
             $model->setStoreId($storeId);
@@ -71,7 +94,7 @@ private function loadQuery()
     /**
      * Redirect to Edit page
      *
-     * @param $data
+     * @param array $data
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     private function proceedToEdit($data)

app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php

@@ -16,9 +16,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject */
     private $redirect;
 
-    /** @var  \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $objectManager;
-
     /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $messageManager;
 
@@ -65,17 +62,17 @@ protected function setUp()
             ->method('getRequest')
             ->willReturn($this->request);
 
-        $this->objectManager = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface')
+        $objectManager = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMockForAbstractClass();
         $this->context->expects($this->any())
             ->method('getObjectManager')
-            ->willReturn($this->objectManager);
+            ->willReturn($objectManager);
 
         $this->messageManager = $this->getMockBuilder('\Magento\Framework\Message\ManagerInterface')
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess', 'addError' ,'addException'])
+            ->setMethods(['addSuccess', 'addError', 'addException'])
             ->getMockForAbstractClass();
         $this->context->expects($this->any())
             ->method('getMessageManager')
@@ -98,12 +95,20 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getId', 'load', 'addData', 'setIsProcessed', 'save', 'loadByQueryText', 'setStoreId'])
             ->getMock();
+        $queryFactory = $this->getMockBuilder('Magento\Search\Model\QueryFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $queryFactory->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($this->query));
 
         $this->controller = $objectManagerHelper->getObject(
             'Magento\Search\Controller\Adminhtml\Term\Save',
             [
                 'context' => $this->context,
                 'resultPageFactory' => $pageFactory,
+                'queryFactory' => $queryFactory,
             ]
         );
     }
@@ -138,7 +143,6 @@ public function testExecuteLoadQueryQueryId()
         $queryText = '';
         $this->mockGetRequestData($queryText, $queryId);
 
-        $this->objectManager->expects($this->once())->method('create')->willReturn($this->query);
         $this->query->expects($this->once())->method('getId')->willReturn(false);
         $this->query->expects($this->once())->method('load')->with($queryId);
 
@@ -154,7 +158,6 @@ public function testExecuteLoadQueryQueryIdQueryText()
         $queryText = 'search';
         $this->mockGetRequestData($queryText, $queryId);
 
-        $this->objectManager->expects($this->once())->method('create')->willReturn($this->query);
         $this->request->expects($this->at(4))->method('getPost')->with('store_id', false)->willReturn(1);
 
         $this->query->expects($this->once())->method('setStoreId');
@@ -173,7 +176,6 @@ public function testExecuteLoadQueryQueryIdQueryText2()
         $queryText = 'search';
         $this->mockGetRequestData($queryText, $queryId);
 
-        $this->objectManager->expects($this->once())->method('create')->willReturn($this->query);
         $this->request->expects($this->at(4))->method('getPost')->with('store_id', false)->willReturn(1);
 
         $this->query->expects($this->once())->method('setStoreId');
@@ -194,7 +196,6 @@ public function testExecuteLoadQueryQueryIdQueryTextException()
         $queryText = 'search';
         $this->mockGetRequestData($queryText, $queryId);
 
-        $this->objectManager->expects($this->once())->method('create')->willReturn($this->query);
         $this->request->expects($this->at(4))->method('getPost')->with('store_id', false)->willReturn(1);
 
         $this->query->expects($this->once())->method('setStoreId');
@@ -213,7 +214,6 @@ public function testExecuteException()
         $queryText = 'search';
         $this->mockGetRequestData($queryText, $queryId);
 
-        $this->objectManager->expects($this->once())->method('create')->willReturn($this->query);
         $this->request->expects($this->at(4))->method('getPost')->with('store_id', false)->willReturn(1);
 
         $this->query->expects($this->once())->method('setStoreId');