MAGETWO-85060: Move code from 2.2.2 to develop

- fix unit test failure

Author: Joan He

app/code/Magento/Analytics/Model/Connector/ResponseHandler/SignUp.php

@@ -6,7 +6,6 @@
 namespace Magento\Analytics\Model\Connector\ResponseHandler;
 
 use Magento\Analytics\Model\AnalyticsToken;
-use Magento\Analytics\Model\Connector\Http\ConverterInterface;
 use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
 
 /**
@@ -19,21 +18,13 @@ class SignUp implements ResponseHandlerInterface
      */
     private $analyticsToken;
 
-    /**
-     * @var ConverterInterface
-     */
-    private $converter;
-
     /**
      * @param AnalyticsToken $analyticsToken
-     * @param ConverterInterface $converter
      */
     public function __construct(
-        AnalyticsToken $analyticsToken,
-        ConverterInterface $converter
+        AnalyticsToken $analyticsToken
     ) {
         $this->analyticsToken = $analyticsToken;
-        $this->converter = $converter;
     }
 
     /**

app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/ResponseResolverTest.php

@@ -8,6 +8,8 @@
 use Magento\Analytics\Model\Connector\Http\JsonConverter;
 use Magento\Analytics\Model\Connector\Http\ResponseHandlerInterface;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ResponseResolverTest extends \PHPUnit\Framework\TestCase
 {
@@ -24,11 +26,24 @@ public function testGetResultHandleResponseSuccess()
         $notFoundResponseHandlerMock = $this->getMockBuilder(ResponseHandlerInterface::class)
             ->getMockForAbstractClass();
         $notFoundResponseHandlerMock->expects($this->never())->method('handleResponse');
-        $responseResolver = new ResponseResolver(
-            new JsonConverter(),
+        $serializerMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn($expectedBody);
+        $objectManager = new ObjectManager($this);
+        $responseResolver = $objectManager->getObject(
+            ResponseResolver::class,
             [
-                201 => $responseHandlerMock,
-                404 => $notFoundResponseHandlerMock,
+                'converter' => $objectManager->getObject(
+                    JsonConverter::class,
+                    ['serializer' => $serializerMock]
+                ),
+                'responseHandlers' => [
+                    201 => $responseHandlerMock,
+                    404 => $notFoundResponseHandlerMock,
+                ]
             ]
         );
         $this->assertTrue($responseResolver->getResult($response));

app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php

@@ -10,6 +10,8 @@
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Psr\Log\LoggerInterface;
 use Magento\Analytics\Model\Connector\NotifyDataChangedCommand;
 use Magento\Analytics\Model\Connector\Http\ClientInterface;
@@ -62,13 +64,31 @@ protected function setUp()
             ->getMockForAbstractClass();
         $successHandler->method('handleResponse')
             ->willReturn(true);
-
-        $this->notifyDataChangedCommand = new NotifyDataChangedCommand(
-            $this->analyticsTokenMock,
-            $this->httpClientMock,
-            $this->configMock,
-            new ResponseResolver(new JsonConverter(), [201 => $successHandler]),
-            $this->loggerMock
+        $serializerMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $serializerMock->expects($this->any())
+            ->method('unserialize')
+            ->willReturn(['unserialized data']);
+        $objectManager = new ObjectManager($this);
+        $this->notifyDataChangedCommand = $objectManager->getObject(
+            NotifyDataChangedCommand::class,
+            [
+                'analyticsToken' => $this->analyticsTokenMock,
+                'httpClient' => $this->httpClientMock,
+                'config' => $this->configMock,
+                'responseResolver' => $objectManager->getObject(
+                    ResponseResolver::class,
+                    [
+                        'converter' => $objectManager->getObject(
+                            JsonConverter::class,
+                            ['serializer' => $serializerMock]
+                        ),
+                        'responseHandlers' => [201 => $successHandler]
+                    ]
+                ),
+                'logger' => $this->loggerMock
+            ]
         );
     }
 

app/code/Magento/Analytics/Test/Unit/Model/Connector/ResponseHandler/SignUpTest.php

@@ -6,8 +6,8 @@
 namespace Magento\Analytics\Test\Unit\Model\Connector\ResponseHandler;
 
 use Magento\Analytics\Model\AnalyticsToken;
-use Magento\Analytics\Model\Connector\Http\JsonConverter;
 use Magento\Analytics\Model\Connector\ResponseHandler\SignUp;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class SignUpTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,7 +20,11 @@ public function testHandleResult()
         $analyticsToken->expects($this->once())
             ->method('storeToken')
             ->with($accessToken);
-        $signUpHandler = new SignUp($analyticsToken, new JsonConverter());
+        $objectManager = new ObjectManager($this);
+        $signUpHandler = $objectManager->getObject(
+            SignUp::class,
+            ['analyticsToken' => $analyticsToken]
+        );
         $this->assertFalse($signUpHandler->handleResponse([]));
         $this->assertEquals($accessToken, $signUpHandler->handleResponse(['access-token' => $accessToken]));
     }