MAGETWO-33813: Replace Magento\Framework\Model\Exception to LocalizedException

Author: Yurii Torbyk

dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php

@@ -341,7 +341,7 @@ public function testResetPasswordActionCoreException()
         // Verify error message is set
         $this->messageManager->expects($this->once())
             ->method('addMessage')
-            ->with($this->equalTo($error));
+            ->with($error);
 
         $this->_testedObject->execute();
     }
@@ -353,8 +353,8 @@ public function testResetPasswordActionCoreExceptionWarn()
 
         $this->_request->expects($this->once())
             ->method('getParam')
-            ->with($this->equalTo('customer_id'), $this->equalTo(0))
-            ->will($this->returnValue($customerId));
+            ->with('customer_id', 0)
+            ->willReturn($customerId);
 
         // Setup a core exception to return
         $exception = new \Magento\Framework\Validator\ValidatorException($warningText);
@@ -365,13 +365,12 @@ public function testResetPasswordActionCoreExceptionWarn()
         $this->_customerRepositoryMock->expects($this->once())
             ->method('getById')
             ->with($customerId)
-            ->will($this->throwException($exception));
+            ->willThrowException($exception);
 
         // Verify Warning is converted to an Error and message text is set to exception text
         $this->messageManager->expects($this->once())
             ->method('addMessage')
-            ->with($this->equalTo(new \Magento\Framework\Message\Error($warningText))
-        );
+            ->with(new \Magento\Framework\Message\Error($warningText));
 
         $this->_testedObject->execute();
     }

dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php

@@ -113,7 +113,7 @@ public function testAddProductsExceptions($exception)
         $this->productRepository->expects($this->once())->method('getById')->will($this->returnValue($product));
         $this->itemFactory->expects($this->once())
             ->method('create')
-            ->will($this->throwException(new $exception('message')));
+            ->willThrowException(new $exception('message'));
         $this->massOperations->setFlag($this->flag);
         $this->massOperations->addProducts($products, 1);
     }