MC-19827: Escape translation strings.

Use object manager instead of mock object.
Refactor localized exception message.

Author: admanesachin

app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Block\Catalog\Product\View\Type\Bundle as BundleBlock;
 use Magento\Catalog\Block\Product\Context;
+use \Magento\Framework\Escaper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -89,10 +90,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->escaper = $this->createPartialMock(
-            \Magento\Framework\Escaper::class,
-            ['escapeHtml']
-        );
+        $this->escaper = $objectHelper->getObject(Escaper::class);
+
         $this->context->expects($this->once())->method('getRegistry')->willReturn($registry);
         $this->context->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
         $this->context->expects($this->once())->method('getEventManager')->willReturn($this->eventManager);
@@ -127,10 +126,8 @@ public function testGetOptionHtmlNoRenderer()
             ->disableOriginalConstructor()
             ->getMock();
         $option->expects($this->any())->method('getType')->willReturn('checkbox');
+        $expected='There is no defined renderer for "checkbox" option type.';
 
-        $data='There is no defined renderer for "checkbox" option type.';
-        $expected='There is no defined renderer for "checkbox" option type.';
-        $this->escaper->expects($this->once())->method('escapeHtml')->with($data)->willReturn($expected);
         $layout = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
             ->setMethods(['getChildName', 'getBlock'])
             ->disableOriginalConstructor()

app/code/Magento/Checkout/Block/Cart.php

@@ -6,6 +6,8 @@
 namespace Magento\Checkout\Block;
 
 use Magento\Customer\Model\Context;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
 
 /**
  * Shopping cart block
@@ -219,7 +221,7 @@ public function getMethodHtml($name)
     {
         $block = $this->getLayout()->getBlock($name);
         if (!$block) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid method: %1', $this->escapeHtml($name)));
+            throw new LocalizedException(new Phrase($this->escapeHtml(__('Invalid method: %1', $name))));
         }
         return $block->toHtml();
     }

app/code/Magento/Checkout/Test/Unit/Block/CartTest.php

@@ -38,7 +38,7 @@ protected function setUp()
         $quoteMock = $this->createMock(Quote::class);
         $checkoutSession = $this->createMock(Session::class);
         $this->layoutMock = $this->createMock(LayoutInterface::class);
-        $this->escaper = $this->createMock(Escaper::class);
+        $this->escaper = $objectManager->getObject(Escaper::class);
         $quoteMock->expects($this->once())->method('getAllVisibleItems')->willReturn([]);
         $checkoutSession->expects($this->any())->method('getQuote')->willReturn($quoteMock);
         $this->context->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
@@ -59,8 +59,6 @@ public function testGetMethodHtmlWithException()
     {
         $this->layoutMock->expects($this->any())->method('getBlock')->willReturn(false);
         $name='blockMethod';
-        $expected='blockMethod';
-        $this->escaper->expects($this->once())->method('escapeHtml')->with($name)->willReturn($expected);
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $this->expectExceptionMessage(
             (string)__('Invalid method: %1', $name)

app/code/Magento/Directory/Test/Unit/Block/DataTest.php

@@ -17,6 +17,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Escaper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -57,13 +58,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
     private $serializerMock;
 
     /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Escaper
      */
-    private $escaperMock;
+    private $escaper;
 
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaper= $objectManagerHelper->getObject(Escaper::class);
         $this->prepareContext();
 
         $this->helperDataMock = $this->getMockBuilder(\Magento\Directory\Helper\Data::class)
@@ -129,12 +131,7 @@ protected function prepareContext()
             ->method('getLayout')
             ->willReturn($this->layoutMock);
 
-        $this->escaperMock = $this->createPartialMock(
-            \Magento\Framework\Escaper::class,
-            ['escapeHtml']
-        );
-
-        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
     }
 
     protected function prepareCountryCollection()
@@ -312,8 +309,6 @@ protected function mockElementHtmlSelect($defaultCountry, $options, $resultHtml)
             )
             ->getMock();
 
-        $this->escaperMock->expects($this->once())->method('escapeHtml')->with(__($title))->willReturn($title);
-
         $elementHtmlSelect->expects($this->once())
             ->method('setName')
             ->with($name)