Merge branch 'MAGETWO-66190-unserialize-in-tests' into pr

Author: Joan He

app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php

@@ -88,7 +88,7 @@ public function testGet($isCached)
     {
         $path = 'default/dev/unsecure/url';
         $url = 'http://magento.test/';
-        $data = [
+        $unserializedData = [
             'default' => [
                 'dev' => [
                     'unsecure' => [
@@ -97,41 +97,42 @@ public function testGet($isCached)
                 ]
             ]
         ];
+        $serializedDataString = '{"serialized-data"}';
 
         $this->cache->expects($this->once())
             ->method('load')
             ->with(System::CONFIG_TYPE)
-            ->willReturn($isCached ? $data : null);
+            ->willReturn($isCached ? $unserializedData : null);
 
         if ($isCached) {
             $this->serializer->expects($this->once())
                 ->method('unserialize')
-                ->willReturn($data);
+                ->willReturn($unserializedData);
         }
 
         if (!$isCached) {
             $this->serializer->expects($this->once())
                 ->method('serialize')
-                ->willReturn(serialize($data));
+                ->willReturn($serializedDataString);
             $this->source->expects($this->once())
                 ->method('get')
-                ->willReturn($data);
+                ->willReturn($unserializedData);
             $this->fallback->expects($this->once())
                 ->method('process')
-                ->with($data)
+                ->with($unserializedData)
                 ->willReturnArgument(0);
             $this->preProcessor->expects($this->once())
                 ->method('process')
-                ->with($data)
+                ->with($unserializedData)
                 ->willReturnArgument(0);
             $this->postProcessor->expects($this->once())
                 ->method('process')
-                ->with($data)
+                ->with($unserializedData)
                 ->willReturnArgument(0);
             $this->cache->expects($this->once())
                 ->method('save')
                 ->with(
-                    serialize($data),
+                    $serializedDataString,
                     System::CONFIG_TYPE,
                     [System::CACHE_TAG]
                 );

lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php

@@ -84,9 +84,8 @@ protected function tearDown()
 
     public function testSendVary()
     {
-        $data = ['some-vary-key' => 'some-vary-value'];
         $expectedCookieName = Http::COOKIE_VARY_STRING;
-        $expectedCookieValue = sha1(serialize($data));
+        $expectedCookieValue = 'SHA1 Serialized String';
         $sensitiveCookieMetadataMock = $this->getMockBuilder(
             \Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata::class)
             ->disableOriginalConstructor()

lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php

@@ -149,9 +149,7 @@ public function varDirectiveDataProvider()
 
         $stub->expects($this->once())
             ->method('bar')
-            ->will($this->returnCallback(function ($arg) {
-                return serialize($arg);
-            }));
+            ->willReturn('Mocked Method Return');
 
         return [
             'no variables' => [
@@ -177,14 +175,7 @@ public function varDirectiveDataProvider()
                     'b' => 'bee',
                     'd' => 'dee',
                 ],
-                serialize([
-                    'param_1' => 'value_1',
-                    'param_2' => 'lorem',
-                    'param_3' => [
-                        'a' => 'bee',
-                        'c' => 'dee',
-                    ],
-                ]),
+                'Mocked Method Return'
             ],
         ];
     }