MAGETWO-64465: Investigate and fix post-refactoring issues

Author: rganin

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php

@@ -77,6 +77,7 @@ protected function setUp()
 
         $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
             ->disableOriginalConstructor()
+            ->setMethods(['serialize', 'unserialize'])
             ->getMock();
 
         $this->urlBuilder = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\UrlBuilder::class)
@@ -99,6 +100,26 @@ protected function setUp()
             '',
             false
         );
+
+        $this->serializer->expects($this->any())
+            ->method('unserialize')
+            ->will(
+                $this->returnCallback(
+                    function ($value) {
+                        return json_decode($value, true);
+                    }
+                )
+            );
+
+        $this->serializer->expects($this->any())
+            ->method('serialize')
+            ->will(
+                $this->returnCallback(
+                    function ($value) {
+                        return json_encode($value);
+                    }
+                )
+            );
     }
 
     /**
@@ -237,9 +258,6 @@ public function testGetFormattedOptionValue()
     public function testGetFormattedOptionValueInvalid()
     {
         $optionValue = 'invalid json option value...';
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->willThrowException(new SerializationException(__('Invalid JSON value.')));
         $this->assertEquals($optionValue, $this->getFileObject()->getFormattedOptionValue($optionValue));
     }
 
@@ -361,25 +379,14 @@ public function testParseOptionValueInvalid()
             ->method('create')
             ->will($this->returnValue($itemMock));
 
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->with($optionValue)
-            ->willThrowException(new SerializationException(__('Invalid JSON value.')));
-
         $this->assertEquals(null, $fileObject->parseOptionValue($userInput, []));
     }
 
     public function testPrepareOptionValueForRequest()
     {
-        $optionValue = 'string';
         $resultValue = ['result'];
+        $optionValue = json_encode($resultValue);
         $fileObject = $this->getFileObject();
-
-        $this->serializer->expects($this->once())
-            ->method('unserialize')
-            ->with($optionValue)
-            ->willReturn($resultValue);
-
         $this->assertEquals($resultValue, $fileObject->prepareOptionValueForRequest($optionValue));
     }
 }