MAGETWO-66686: Use Json serializer class instead of direct call

- fixing tests

Author: rganin

app/code/Magento/Backend/Model/Url.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Backend\Model;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Url\HostChecker;
 use Magento\Framework\App\ObjectManager;
 
@@ -101,6 +102,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param array $data
      * @param HostChecker|null $hostChecker
+     * @param Json $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -123,7 +125,8 @@ public function __construct(
         \Magento\Store\Model\StoreFactory $storeFactory,
         \Magento\Framework\Data\Form\FormKey $formKey,
         array $data = [],
-        HostChecker $hostChecker = null
+        HostChecker $hostChecker = null,
+        Json $serializer = null
     ) {
         $this->_encryptor = $encryptor;
         $hostChecker = $hostChecker ?: ObjectManager::getInstance()->get(HostChecker::class);
@@ -140,7 +143,8 @@ public function __construct(
             $routeParamsPreprocessor,
             $scopeType,
             $data,
-            $hostChecker
+            $hostChecker,
+            $serializer
         );
         $this->_backendHelper = $backendHelper;
         $this->_menuConfig = $menuConfig;

app/code/Magento/Backend/Test/Unit/Model/UrlTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Backend\Test\Unit\Model;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Url\HostChecker;
 
 /**
@@ -68,6 +69,11 @@ class UrlTest extends \PHPUnit_Framework_TestCase
      */
     protected $_encryptor;
 
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -151,6 +157,20 @@ protected function setUp()
             ->willReturn($routeParamsResolver);
         /** @var HostChecker|\PHPUnit_Framework_MockObject_MockObject $hostCheckerMock */
         $hostCheckerMock = $this->getMock(HostChecker::class, [], [], '', false);
+        $this->serializerMock = $this->getMockBuilder(Json::class)
+            ->setMethods(['serialize'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->serializerMock->expects($this->any())
+            ->method('serialize')
+            ->will(
+                $this->returnCallback(
+                    function ($value) {
+                        return json_encode($value);
+                    }
+                )
+            );
         $this->_model = $objectManager->getObject(
             \Magento\Backend\Model\Url::class,
             [
@@ -161,7 +181,8 @@ protected function setUp()
                 'authSession' => $this->_authSessionMock,
                 'encryptor' => $this->_encryptor,
                 'routeParamsResolverFactory' => $this->routeParamsResolverFactoryMock,
-                'hostChecker' => $hostCheckerMock
+                'hostChecker' => $hostCheckerMock,
+                'serializer' => $this->serializerMock
             ]
         );
         $this->_requestMock = $this->getMock(\Magento\Framework\App\Request\Http::class, [], [], '', false);

app/code/Magento/Catalog/Test/Unit/Block/Rss/CategoryTest.php

@@ -95,7 +95,7 @@ protected function setUp()
         $this->request->expects($this->at(0))->method('getParam')->with('cid')->will($this->returnValue(1));
         $this->request->expects($this->at(1))->method('getParam')->with('store_id')->will($this->returnValue(null));
 
-        $this->httpContext = $this->getMock(\Magento\Framework\App\Http\Context::class);
+        $this->httpContext = $this->getMock(\Magento\Framework\App\Http\Context::class, [], [], '', false);
         $this->catalogHelper = $this->getMock(\Magento\Catalog\Helper\Data::class, [], [], '', false);
         $this->categoryFactory = $this->getMockBuilder(\Magento\Catalog\Model\CategoryFactory::class)
             ->setMethods(['create'])

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -93,7 +93,7 @@ protected function setUp()
             ->setMethods(['getVisibleInCatalogIds'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->httpContext = $this->getMock(\Magento\Framework\App\Http\Context::class);
+        $this->httpContext = $this->getMock(\Magento\Framework\App\Http\Context::class, [], [], '', false);
         $this->builder = $this->getMock(\Magento\Rule\Model\Condition\Sql\Builder::class, [], [], '', false);
         $this->rule = $this->getMock(\Magento\CatalogWidget\Model\Rule::class, [], [], '', false);
         $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false);

dev/tests/static/framework/bootstrap.php

@@ -19,8 +19,9 @@
 $componentRegistrar = new ComponentRegistrar();
 $dirSearch = new DirSearch($componentRegistrar, new ReadFactory(new DriverPool()));
 $themePackageList = new ThemePackageList($componentRegistrar, new ThemePackageFactory());
+$serializer = new \Magento\Framework\Serialize\Serializer\Json();
 \Magento\Framework\App\Utility\Files::setInstance(
-    new Files($componentRegistrar, $dirSearch, $themePackageList)
+    new Files($componentRegistrar, $dirSearch, $themePackageList, $serializer)
 );
 
 /**