Merge branch '2.3-develop-pr' of https://github.com/magento-arcticfoxes/magento2ce into 2.3-develop-pr

Author: Joan He

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php

@@ -77,6 +77,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
      * Setup
      *
      * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
@@ -93,55 +94,65 @@ protected function setUp()
             ->getMock();
         $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getIndexPrefix',
-                'getEntityType',
-            ])->getMock();
+            ->setMethods(
+                [
+                    'getIndexPrefix',
+                    'getEntityType',
+                ]
+            )->getMock();
         $this->indexBuilder = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
-            ->setMethods([
-                'indices',
-                'ping',
-                'bulk',
-                'search',
-            ])
+            ->setMethods(
+                [
+                    'indices',
+                    'ping',
+                    'bulk',
+                    'search',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class)
-            ->setMethods([
-                'exists',
-                'getSettings',
-                'create',
-                'putMapping',
-                'deleteMapping',
-                'existsAlias',
-                'updateAliases',
-                'stats'
-            ])
+            ->setMethods(
+                [
+                    'exists',
+                    'getSettings',
+                    'create',
+                    'putMapping',
+                    'deleteMapping',
+                    'existsAlias',
+                    'updateAliases',
+                    'stats'
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $elasticsearchClientMock->expects($this->any())
             ->method('indices')
             ->willReturn($indicesMock);
         $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
-            ->setConstructorArgs([
-                'options' => $this->getClientOptions(),
-                'elasticsearchClient' => $elasticsearchClientMock
-            ])
+            ->setConstructorArgs(
+                [
+                    'options' => $this->getClientOptions(),
+                    'elasticsearchClient' => $elasticsearchClientMock
+                ]
+            )
             ->getMock();
         $this->connectionManager->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->client);
         $this->fieldMapper->expects($this->any())
             ->method('getAllAttributesTypes')
-            ->willReturn([
-                'name' => 'string',
-            ]);
+            ->willReturn(
+                [
+                    'name' => 'string',
+                ]
+            );
         $this->clientConfig->expects($this->any())
             ->method('getIndexPrefix')
             ->willReturn('indexName');
@@ -151,12 +162,14 @@ protected function setUp()
         $this->indexNameResolver = $this->getMockBuilder(
             \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class
         )
-            ->setMethods([
-                'getIndexName',
-                'getIndexNamespace',
-                'getIndexFromAlias',
-                'getIndexNameForAlias',
-            ])
+            ->setMethods(
+                [
+                    'getIndexName',
+                    'getIndexNamespace',
+                    'getIndexFromAlias',
+                    'getIndexNameForAlias',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $this->batchDocumentDataMapper = $this->getMockBuilder(
@@ -216,9 +229,11 @@ public function testPrepareDocsPerStore()
     {
         $this->batchDocumentDataMapper->expects($this->once())
             ->method('map')
-            ->willReturn([
-                'name' => 'Product Name',
-            ]);
+            ->willReturn(
+                [
+                    'name' => 'Product Name',
+                ]
+            );
         $this->assertInternalType(
             'array',
             $this->model->prepareDocsPerStore(
@@ -352,9 +367,11 @@ public function testConnectException()
     {
         $connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getConnection',
-            ])
+            ->setMethods(
+                [
+                    'getConnection',
+                ]
+            )
             ->getMock();
 
         $connectionManager->expects($this->any())