MAGETWO-66480: [GITHUB] URL key for specified store already exists #6671

- unit tests
- runtime exception instead of not found on message factory

Author: cpartica

app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php

@@ -72,12 +72,12 @@ public function execute()
             $this->messageManager->addExceptionMessage($e);
         } catch (\Exception $e) {
             $error = true;
-            $this->messageManager->addError(__('There was a category move error.'));
+            $this->messageManager->addErrorMessage(__('There was a category move error.'));
             $this->logger->critical($e);
         }
 
         if (!$error) {
-            $this->messageManager->addSuccess(__('You moved the category.'));
+            $this->messageManager->addSuccessMessage(__('You moved the category.'));
         }
 
         $block->setMessages($this->messageManager->getMessages(true));

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -211,13 +211,13 @@ public function execute()
                 $category->unsetData('use_post_data_config');
 
                 $category->save();
-                $this->messageManager->addSuccess(__('You saved the category.'));
+                $this->messageManager->addSuccessMessage(__('You saved the category.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addExceptionMessage($e);
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while saving the category.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while saving the category.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -119,10 +119,10 @@ public function execute()
 
                 $this->copyToStores($data, $productId);
 
-                $this->messageManager->addSuccess(__('You saved the product.'));
+                $this->messageManager->addSuccessMessage(__('You saved the product.'));
                 $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
-                    $this->messageManager->addNotice(
+                    $this->messageManager->addNoticeMessage(
                         __(
                             'SKU for product %1 has been changed to %2.',
                             $this->_objectManager->get(
@@ -141,21 +141,21 @@ public function execute()
 
                 if ($redirectBack === 'duplicate') {
                     $newProduct = $this->productCopier->copy($product);
-                    $this->messageManager->addSuccess(__('You duplicated the product.'));
+                    $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addExceptionMessage($e);
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             }
         } else {
             $resultRedirect->setPath('catalog/*/', ['store' => $storeId]);
-            $this->messageManager->addError('No data to save');
+            $this->messageManager->addErrorMessage('No data to save');
             return $resultRedirect;
         }
 
@@ -201,7 +201,7 @@ private function handleImageRemoveError($postData, $productId)
                 $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
                 $product = $this->productRepository->getById($productId);
                 if ($expectedImagesAmount != count($product->getMediaGallery('images'))) {
-                    $this->messageManager->addNotice(
+                    $this->messageManager->addNoticeMessage(
                         __('The image cannot be removed as it has been assigned to the other image role')
                     );
                 }