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

Author: Yurii Torbyk

app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php

@@ -35,7 +35,7 @@ public function execute()
             $resultRedirect->setPath('customer/index');
             return $resultRedirect;
         } catch (\Magento\Framework\Validator\ValidatorException $exception) {
-            $messages = $exception->getMessages();
+            $messages = $exception->getMessages(\Magento\Framework\Message\MessageInterface::TYPE_ERROR);
             if (!count($messages)) {
                 $messages = $exception->getMessage();
             }

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

@@ -324,9 +324,9 @@ public function testResetPasswordActionCoreException()
         );
 
         // Setup a core exception to return
-        $error = 'Something Bad happened';
-        $exception = new \Magento\Framework\Validator\ValidatorException($error);
-        $exception->addError('Something Bad happened');
+        $exception = new \Magento\Framework\Validator\ValidatorException();
+        $error = new \Magento\Framework\Message\Error('Something Bad happened');
+        $exception->addMessage($error);
 
         $this->_customerRepositoryMock->expects(
             $this->once()
@@ -341,7 +341,7 @@ public function testResetPasswordActionCoreException()
         // Verify error message is set
         $this->messageManager->expects($this->once())
             ->method('addMessage')
-            ->with($this->equalTo(new \Magento\Framework\Message\Error($error)));
+            ->with($this->equalTo($error));
 
         $this->_testedObject->execute();
     }
@@ -351,34 +351,26 @@ public function testResetPasswordActionCoreExceptionWarn()
         $warningText = 'Warning';
         $customerId = 1;
 
-        $this->_request->expects(
-            $this->once()
-        )->method(
-            'getParam'
-        )->with(
-            $this->equalTo('customer_id'),
-            $this->equalTo(0)
-        )->will(
-            $this->returnValue($customerId)
-        );
+        $this->_request->expects($this->once())
+            ->method('getParam')
+            ->with($this->equalTo('customer_id'), $this->equalTo(0))
+            ->will($this->returnValue($customerId));
 
         // Setup a core exception to return
         $exception = new \Magento\Framework\Validator\ValidatorException($warningText);
-        $error = 'Something Not So Bad happened';
-        $exception->addError($error);
+
+        $error = new \Magento\Framework\Message\Warning('Something Not So Bad happened');
+        $exception->addMessage($error);
 
         $this->_customerRepositoryMock->expects($this->once())
             ->method('getById')
             ->with($customerId)
             ->will($this->throwException($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))
+        $this->messageManager->expects($this->once())
+            ->method('addMessage')
+            ->with($this->equalTo(new \Magento\Framework\Message\Error($warningText))
         );
 
         $this->_testedObject->execute();