MAGETWO-33814: Change parent class of Model\Exception sub-classes to Localized

Author: Yuri Kovsher

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

@@ -166,16 +166,11 @@ public function execute()
                     $redirectUrl = $refererUrl;
                 }
             }
-        } catch (\Magento\Framework\Model\Exception $e) {
-            if ($e->getCode() == \Magento\Wishlist\Model\Item::EXCEPTION_CODE_NOT_SALABLE) {
-                $this->messageManager->addError(__('This product(s) is out of stock.'));
-            } elseif ($e->getCode() == \Magento\Wishlist\Model\Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS) {
-                $this->messageManager->addNotice($e->getMessage());
-                $redirectUrl = $configureUrl;
-            } else {
-                $this->messageManager->addNotice($e->getMessage());
-                $redirectUrl = $configureUrl;
-            }
+        } catch (\Magento\Framework\Exception\Product\NotSalableException $e) {
+            $this->messageManager->addError(__('This product(s) is out of stock.'));
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->messageManager->addNotice($e->getMessage());
+            $redirectUrl = $configureUrl;
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('Cannot add item to shopping cart'));
         }

app/code/Magento/Wishlist/Model/Item.php

@@ -400,7 +400,7 @@ public function getProduct()
      * @param \Magento\Checkout\Model\Cart $cart
      * @param bool $delete  delete the item after successful add to cart
      * @return bool
-     * @throws \Magento\Framework\Model\Exception
+     * @throws \Magento\Framework\Exception\Product\NotSalableException
      */
     public function addToCart(\Magento\Checkout\Model\Cart $cart, $delete = false)
     {
@@ -428,7 +428,7 @@ public function addToCart(\Magento\Checkout\Model\Cart $cart, $delete = false)
         }
 
         if (!$product->isSalable()) {
-            throw new \Magento\Framework\Model\Exception(null, self::EXCEPTION_CODE_NOT_SALABLE);
+            throw new \Magento\Framework\Exception\Product\NotSalableException(null);
         }
 
         $buyRequest = $this->getBuyRequest();

dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php

@@ -625,9 +625,7 @@ public function testExecuteWithoutQuantityArrayAndOutOfStock()
         $itemMock->expects($this->once())
             ->method('addToCart')
             ->with($this->checkoutCartMock, true)
-            ->willThrowException(
-                new \Magento\Framework\Model\Exception(null, \Magento\Wishlist\Model\Item::EXCEPTION_CODE_NOT_SALABLE)
-            );
+            ->willThrowException(new \Magento\Framework\Exception\Product\NotSalableException(null));
 
         $this->messageManagerMock->expects($this->once())
             ->method('addError')
@@ -788,12 +786,7 @@ public function testExecuteWithoutQuantityArrayAndConfigurable()
         $itemMock->expects($this->once())
             ->method('addToCart')
             ->with($this->checkoutCartMock, true)
-            ->willThrowException(
-                new \Magento\Framework\Model\Exception(
-                    'message',
-                    \Magento\Wishlist\Model\Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS
-                )
-            );
+            ->willThrowException(new \Magento\Framework\Exception\LocalizedException('message'));
 
         $this->messageManagerMock->expects($this->once())
             ->method('addNotice')

lib/internal/Magento/Framework/Exception/Product/NotSalableException.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Exception\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class NotSalableException extends LocalizedException
+{
+}