MAGETWO-85060: Move code from 2.2.2 to develop

- fix static test failure

Author: Joan He

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

@@ -8,6 +8,7 @@
 use Magento\Analytics\Model\Connector\Http\ConverterInterface;
 use Magento\Analytics\Model\Connector\Http\JsonConverter;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
+use Magento\Framework\HTTP\ResponseFactory;
 
 /**
  * A unit test for testing of the CURL HTTP client.
@@ -17,25 +18,20 @@ class CurlTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Analytics\Model\Connector\Http\Client\Curl
      */
-    private $subject;
+    private $curl;
 
     /**
      * @var \Magento\Framework\HTTP\Adapter\Curl|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $curlMock;
+    private $curlAdapterMock;
 
     /**
      * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $loggerMock;
 
     /**
-     * @var CurlFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $curlFactoryMock;
-
-    /**
-     * @var \Magento\Analytics\Model\Connector\Http\ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $responseFactoryMock;
 
@@ -44,17 +40,12 @@ class CurlTest extends \PHPUnit\Framework\TestCase
      */
     private $converterMock;
 
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    private $objectManagerHelper;
-
     /**
      * @return void
      */
     protected function setUp()
     {
-        $this->curlMock = $this->getMockBuilder(
+        $this->curlAdapterMock = $this->getMockBuilder(
             \Magento\Framework\HTTP\Adapter\Curl::class
         )
         ->disableOriginalConstructor()
@@ -65,28 +56,27 @@ protected function setUp()
         )
         ->disableOriginalConstructor()
         ->getMock();
-        $this->curlFactoryMock = $this->getMockBuilder(CurlFactory::class)
+        $curlFactoryMock = $this->getMockBuilder(CurlFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->curlFactoryMock->expects($this->any())
+        $curlFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturn($this->curlMock);
+            ->willReturn($this->curlAdapterMock);
 
         $this->responseFactoryMock = $this->getMockBuilder(
-            \Magento\Framework\HTTP\ResponseFactory::class
+            ResponseFactory::class
         )
         ->disableOriginalConstructor()
         ->getMock();
         $this->converterMock = $this->createJsonConverter();
 
-        $this->objectManagerHelper =
-            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->subject = $this->objectManagerHelper->getObject(
+        $this->curl = $objectManagerHelper->getObject(
             \Magento\Analytics\Model\Connector\Http\Client\Curl::class,
             [
-                'curlFactory' => $this->curlFactoryMock,
+                'curlFactory' => $curlFactoryMock,
                 'responseFactory' => $this->responseFactoryMock,
                 'converter' => $this->converterMock,
                 'logger' => $this->loggerMock,
@@ -122,7 +112,7 @@ public function testRequestSuccess(array $data)
     {
         $responseString = 'This is response.';
         $response = new  \Zend_Http_Response(201, [], $responseString);
-        $this->curlMock->expects($this->once())
+        $this->curlAdapterMock->expects($this->once())
             ->method('write')
             ->with(
                 $data['method'],
@@ -131,10 +121,10 @@ public function testRequestSuccess(array $data)
                 $data['headers'],
                 json_encode($data['body'])
             );
-        $this->curlMock->expects($this->once())
+        $this->curlAdapterMock->expects($this->once())
             ->method('read')
             ->willReturn($responseString);
-        $this->curlMock->expects($this->any())
+        $this->curlAdapterMock->expects($this->any())
             ->method('getErrno')
             ->willReturn(0);
 
@@ -145,7 +135,7 @@ public function testRequestSuccess(array $data)
 
         $this->assertEquals(
             $response,
-            $this->subject->request(
+            $this->curl->request(
                 $data['method'],
                 $data['url'],
                 $data['body'],
@@ -162,7 +152,7 @@ public function testRequestSuccess(array $data)
     public function testRequestError(array $data)
     {
         $response = new  \Zend_Http_Response(0, []);
-        $this->curlMock->expects($this->once())
+        $this->curlAdapterMock->expects($this->once())
             ->method('write')
             ->with(
                 $data['method'],
@@ -171,12 +161,12 @@ public function testRequestError(array $data)
                 $data['headers'],
                 json_encode($data['body'])
             );
-        $this->curlMock->expects($this->once())
+        $this->curlAdapterMock->expects($this->once())
             ->method('read');
-        $this->curlMock->expects($this->atLeastOnce())
+        $this->curlAdapterMock->expects($this->atLeastOnce())
             ->method('getErrno')
             ->willReturn(1);
-        $this->curlMock->expects($this->atLeastOnce())
+        $this->curlAdapterMock->expects($this->atLeastOnce())
             ->method('getError')
             ->willReturn('CURL error.');
 
@@ -190,7 +180,7 @@ public function testRequestError(array $data)
 
         $this->assertEquals(
             $response,
-            $this->subject->request(
+            $this->curl->request(
                 $data['method'],
                 $data['url'],
                 $data['body'],

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

@@ -65,7 +65,6 @@ public function convertBodyDataProvider()
 
     public function testConvertData()
     {
-        $data = ["token" => "secret-token"];
         $this->serializerMock->expects($this->once())
             ->method('serialize')
             ->willReturn('serializedResult');