MAGETWO-34995: Refactor controllers from the list (Part2)

- Failed static tests fixed;

Author: Dmytro Poperechnyy

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php

@@ -15,6 +15,7 @@
  * Class EmailTest
  *
  * @package Magento\Shipping\Controller\Adminhtml\Order\Shipment
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailTest extends \PHPUnit_Framework_TestCase
 {
@@ -149,30 +150,18 @@ public function setUp()
             false
         );
         $this->resultRedirectFactory->expects($this->once())->method('create')->willReturn($this->resultRedirect);
-        $this->context->expects($this->once())
-            ->method('getMessageManager')
-            ->will($this->returnValue($this->messageManager));
-        $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('getSession')
-            ->will($this->returnValue($this->session));
-        $this->context->expects($this->once())
-            ->method('getActionFlag')
-            ->will($this->returnValue($this->actionFlag));
-        $this->context->expects($this->once())
-            ->method('getHelper')
-            ->will($this->returnValue($this->helper));
+
+        $this->context->expects($this->once())->method('getMessageManager')->willReturn($this->messageManager);
+        $this->context->expects($this->once())->method('getRequest')->willReturn($this->request);
+        $this->context->expects($this->once())->method('getResponse')->willReturn($this->response);
+        $this->context->expects($this->once())->method('getObjectManager')->willReturn($this->objectManager);
+        $this->context->expects($this->once())->method('getSession')->willReturn($this->session);
+        $this->context->expects($this->once())->method('getActionFlag')->willReturn($this->actionFlag);
+        $this->context->expects($this->once())->method('getHelper')->willReturn($this->helper);
         $this->context->expects($this->once())
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactory);
+
         $this->shipmentEmail = $objectManagerHelper->getObject(
             'Magento\Shipping\Controller\Adminhtml\Order\Shipment\Email',
             [

app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php

@@ -50,4 +50,4 @@ public function getDefaultRedirect()
         }
         return $resultRedirect;
     }
-}
+}

app/code/Magento/Wishlist/Controller/Index/Fromcart.php

@@ -35,6 +35,7 @@ public function __construct(
      * @return \Magento\Framework\Controller\Result\Redirect
      * @throws NotFoundException
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function execute()
     {