MAGETWO-34991: Eliminate exceptions from the list Part2

Author: Yurii Torbyk

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php

@@ -264,7 +264,7 @@ public function testExecute()
      */
     public function testExecuteModelException()
     {
-        $message = 'Cannot update item quantity.';
+        $message = 'The order no longer exists.';
         $response = ['error' => true, 'message' => $message];
 
         $orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
@@ -307,7 +307,7 @@ public function testExecuteModelException()
      */
     public function testExecuteException()
     {
-        $message = 'Cannot update item quantity.';
+        $message = 'The order no longer exists.';
         $response = ['error' => true, 'message' => $message];
 
         $orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/SettingsTest.php

@@ -199,7 +199,7 @@ public function getAsConfigFileDataProvider()
      */
     public function testGetAsConfigFileException($settingName, $expectedExceptionMsg)
     {
-        $this->setExpectedException('Magento\Framework\Exception', $expectedExceptionMsg);
+        $this->setExpectedException('Magento\Framework\Exception\LocalizedException', $expectedExceptionMsg);
         $this->_object->getAsConfigFile($settingName);
     }
 

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/EntityTest.php

@@ -66,7 +66,7 @@ public function crudDataProvider()
     {
         return [
             'successful CRUD' => ['saveModelSuccessfully'],
-            'cleanup on update error' => ['saveModelAndFailOnUpdate', 'Magento\Framework\Exception']
+            'cleanup on update error' => ['saveModelAndFailOnUpdate', 'Magento\Framework\Exception\LocalizedException']
         ];
     }
 

dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php

@@ -274,7 +274,7 @@ public function testAddContainerInvalidHtmlTag()
         $msg = 'Html tag "span" is forbidden for usage in containers. ' .
             'Consider to use one of the allowed: dd, div, dl, fieldset, main, header, ' .
             'footer, ol, p, section, table, tfoot, ul.';
-        $this->setExpectedException('Magento\Framework\Exception', $msg);
+        $this->setExpectedException('Magento\Framework\Exception\LocalizedException', $msg);
         $this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']);
     }
 

dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php

@@ -70,7 +70,7 @@ public function constructorExceptionDataProvider()
             'non-existing base dir' => [
                 require __DIR__ . '/_files/config_data.php',
                 'non_existing_dir',
-                'Magento\Framework\Exception',
+                'Magento\Framework\Exception\LocalizedException',
                 "Base directory 'non_existing_dir' does not exist",
             ],
             'invalid scenarios format' => [

dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/Scenario/Handler/JmeterTest.php

@@ -132,7 +132,7 @@ public function runExceptionDataProvider()
             'no report created' => [
                 "{$fixtureDir}/scenario_without_report.jmx",
                 "{$fixtureDir}/scenario_without_report.jtl",
-                'Magento\Framework\Exception',
+                'Magento\Framework\Exception\LocalizedException',
                 "Report file '{$fixtureDir}/scenario_without_report.jtl' for 'Scenario' has not been created.",
             ],
             'scenario failure in report' => [

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -2424,7 +2424,8 @@
     ['Magento\Archive', 'Magento\Framework\Archive'],
     ['Magento\Event', 'Magento\Framework\Event'],
     ['Magento\EventFactory', 'Magento\Framework\EventFactory'],
-    ['Magento\Exception', 'Magento\Framework\Exception'],
+    ['Magento\Exception', 'Magento\Framework\Exception\LocalizedException'],
+    ['Magento\Framework\Exception', 'Magento\Framework\Exception\LocalizedException'],
     ['Magento\Filesystem', 'Magento\Framework\Filesystem'],
     ['Magento\ObjectManager', 'Magento\Framework\ObjectManagerInterface'],
     ['Magento\Translate', 'Magento\Framework\Translate'],

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php

@@ -20,7 +20,8 @@
     ['Magento\Session', 'Magento\Framework\Session'],
     ['Magento\Cache', 'Magento\Framework\Cache'],
     ['Magento\ObjectManager', 'Magento\Framework\ObjectManager'],
-    ['Magento\Exception', 'Magento\Framework\Exception'],
+    ['Magento\Exception', 'Magento\Framework\Exception\LocalizedException'],
+    ['Magento\Framework\Exception', 'Magento\Framework\Exception\LocalizedException'],
     ['Magento\Autoload', 'Magento\Framework\Autoload'],
     ['Magento\Translate', 'Magento\Framework\Translate'],
     ['Magento\Code', 'Magento\Framework\Code'],

lib/internal/Magento/Framework/App/Test/Unit/StateTest.php

@@ -43,14 +43,14 @@ public function testSetAreaCode()
         $areaCode = 'some code';
         $this->scopeMock->expects($this->once())->method('setCurrentScope')->with($areaCode);
         $this->model->setAreaCode($areaCode);
-        $this->setExpectedException('Magento\Framework\Exception');
+        $this->setExpectedException('Magento\Framework\Exception\LocalizedException');
         $this->model->setAreaCode('any code');
     }
 
     public function testGetAreaCodeException()
     {
         $this->scopeMock->expects($this->never())->method('setCurrentScope');
-        $this->setExpectedException('Magento\Framework\Exception');
+        $this->setExpectedException('Magento\Framework\Exception\LocalizedException');
         $this->model->getAreaCode();
     }
 

lib/internal/Magento/Framework/Convert/ConvertArray.php

@@ -24,7 +24,7 @@ class ConvertArray
     public function assocToXml(array $array, $rootName = '_')
     {
         if (empty($rootName) || is_numeric($rootName)) {
-            throw new LocalizedException('Root element must not be empty or numeric');
+            throw new LocalizedException(new \Magento\Framework\Phrase('Root element must not be empty or numeric'));
         }
 
         $xmlStr = <<<XML
@@ -34,7 +34,7 @@ public function assocToXml(array $array, $rootName = '_')
         $xml = new \SimpleXMLElement($xmlStr);
         foreach (array_keys($array) as $key) {
             if (is_numeric($key)) {
-                throw new LocalizedException('Array root keys must not be numeric.');
+                throw new LocalizedException(new \Magento\Framework\Phrase('Array root keys must not be numeric.'));
             }
         }
         return self::_assocToXml($array, $rootName, $xml);