MAGETWO-71007: Remove zend json from the test suite #10320

magento · Jul 25, 2017 · 7371346 · 7371346
2 parents c955c32 + 24d6028
commit 7371346
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -25,12 +25,12 @@ abstract class AbstractController extends \PHPUnit_Framework_TestCase
     protected $_runOptions = [];
 
     /**
-     * @var \Magento\TestFramework\Request
+     * @var \Magento\Framework\App\RequestInterface
      */
     protected $_request;
 
     /**
-     * @var \Magento\TestFramework\Response
+     * @var \Magento\Framework\App\ResponseInterface
      */
     protected $_response;
 
@@ -102,7 +102,7 @@ public function dispatch($uri)
     /**
      * Request getter
      *
-     * @return \Magento\TestFramework\Request
+     * @return \Magento\Framework\App\RequestInterface
      */
     public function getRequest()
     {
@@ -115,7 +115,7 @@ public function getRequest()
     /**
      * Response getter
      *
-     * @return \Magento\TestFramework\Response
+     * @return \Magento\Framework\App\ResponseInterface
      */
     public function getResponse()
     {
@@ -268,14 +268,21 @@ protected function getCookieMessages($messageType = null)
     {
         /** @var $cookieManager CookieManagerInterface */
         $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
+
+        /** @var $jsonSerializer \Magento\Framework\Serialize\Serializer\Json */
+        $jsonSerializer = $this->_objectManager->get(\Magento\Framework\Serialize\Serializer\Json::class);
         try {
-            $messages = \Zend_Json::decode(
-                $cookieManager->getCookie(MessagePlugin::MESSAGES_COOKIES_NAME, \Zend_Json::encode([]))
+            $messages = $jsonSerializer->unserialize(
+                $cookieManager->getCookie(
+                    MessagePlugin::MESSAGES_COOKIES_NAME,
+                    $jsonSerializer->serialize([])
+                )
             );
+
             if (!is_array($messages)) {
                 $messages = [];
             }
-        } catch (\Zend_Json_Exception $e) {
+        } catch (\InvalidArgumentException $e) {
             $messages = [];
         }
 

diff --git a/...tegration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php b/...tegration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
@@ -25,12 +25,25 @@ class ControllerAbstractTest extends \Magento\TestFramework\TestCase\AbstractCon
     /** @var \PHPUnit_Framework_MockObject_MockObject | CookieManagerInterface */
     private $cookieManagerMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializerMock;
+
     protected function setUp()
     {
         $testObjectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->messageManager = $this->getMock(\Magento\Framework\Message\Manager::class, [], [], '', false);
         $this->cookieManagerMock = $this->getMock(CookieManagerInterface::class, [], [], '', false);
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->serializerMock->expects($this->any())->method('unserialize')->willReturnCallback(
+            function ($serializedData) {
+                return json_decode($serializedData, true);
+            }
+        );
         $this->interpretationStrategyMock = $this->getMock(InterpretationStrategyInterface::class, [], [], '', false);
         $this->interpretationStrategyMock->expects($this->any())
             ->method('interpret')
@@ -58,6 +71,7 @@ function (MessageInterface $message) {
                         [\Magento\Framework\App\ResponseInterface::class, $response],
                         [\Magento\Framework\Message\Manager::class, $this->messageManager],
                         [CookieManagerInterface::class, $this->cookieManagerMock],
+                        [\Magento\Framework\Serialize\Serializer\Json::class, $this->serializerMock],
                         [InterpretationStrategyInterface::class, $this->interpretationStrategyMock],
                     ]
                 )
@@ -244,6 +258,6 @@ private function addSessionMessages()
 
         $this->cookieManagerMock->expects($this->any())
             ->method('getCookie')
-            ->willReturn(\Zend_Json::encode($cookieMessages));
+            ->willReturn(json_encode($cookieMessages));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -108,7 +108,7 @@ public function testLoadDefault()
         $this->assertNotEmpty($this->model->getTemplateText());
         $this->assertNotEmpty($this->model->getTemplateSubject());
         $this->assertNotEmpty($this->model->getOrigTemplateVariables());
-        $this->assertInternalType('array', \Zend_Json::decode($this->model->getOrigTemplateVariables()));
+        $this->assertInternalType('array', json_decode($this->model->getOrigTemplateVariables(), true));
     }
 
     /**

diff --git a/...sts/integration/testsuite/Magento/ImportExport/Block/Adminhtml/Import/Edit/BeforeTest.php b/...sts/integration/testsuite/Magento/ImportExport/Block/Adminhtml/Import/Edit/BeforeTest.php
@@ -93,7 +93,7 @@ protected function setUp()
     public function testGetEntityBehaviors()
     {
         $actualEntities = $this->_model->getEntityBehaviors();
-        $expectedEntities = \Zend_Json::encode($this->_expectedEntities);
+        $expectedEntities = json_encode($this->_expectedEntities);
         $this->assertEquals($expectedEntities, $actualEntities);
     }
 
@@ -105,7 +105,7 @@ public function testGetEntityBehaviors()
     public function testGetUniqueBehaviors()
     {
         $actualBehaviors = $this->_model->getUniqueBehaviors();
-        $expectedBehaviors = \Zend_Json::encode($this->_expectedBehaviors);
+        $expectedBehaviors = json_encode($this->_expectedBehaviors);
         $this->assertEquals($expectedBehaviors, $actualBehaviors);
     }
 }