Merge remote-tracking branch 'act4/ACP2E-3538' into pr_january_doleksandr

Author: o-dubovyk

app/code/Magento/Indexer/Model/ProcessManager.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function execute($userFunctions)
     {
-        if ($this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli') {
+        if ($this->isMultiThreadsExecute()) {
             $this->multiThreadsExecute($userFunctions);
         } else {
             $this->simpleThreadExecute($userFunctions);
@@ -196,4 +196,14 @@ private function executeParentProcess(int &$threadNumber)
             $threadNumber--;
         }
     }
+
+    /**
+     * Check if the current process is multithreaded
+     *
+     * @return bool
+     */
+    public function isMultiThreadsExecute(): bool
+    {
+        return $this->threadsCount > 1 && $this->isCanBeParalleled() && !$this->isSetupMode() && PHP_SAPI == 'cli';
+    }
 }

app/code/Magento/Indexer/Test/Unit/Model/ProcessManagerTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -206,4 +206,37 @@ function () {
             ],
         ];
     }
+
+    /**
+     * @dataProvider testIsMultiThreadsExecuteDataProvider
+     * @param $threadsCount
+     * @param $expectedResult
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testIsMultiThreadsExecute($threadsCount, $expectedResult): void
+    {
+        $connectionMock = $this->createMock(ResourceConnection::class);
+        $registryMock = $this->createMock(Registry::class);
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $amqpConfigPoolMock = $this->createMock(AmqpConfigPool::class);
+        $processManager = new ProcessManager(
+            $connectionMock,
+            $registryMock,
+            $threadsCount,
+            $loggerMock,
+            $amqpConfigPoolMock
+        );
+        $this->assertEquals($expectedResult, $processManager->isMultiThreadsExecute());
+    }
+
+    public static function testIsMultiThreadsExecuteDataProvider(): array
+    {
+        return [
+            'threadsCount is null' => [null, false],
+            'threadsCount is 0' => [0, false],
+            'threadsCount is 1' => [1, false],
+            'threadsCount is 2' => [2, true],
+        ];
+    }
 }