Merge remote-tracking branch 'tango/MC-30569' into PR-02-03

Author: dhorytskyi

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -256,6 +256,8 @@ private function validateSharedIndex($sharedIndex)
             $indexer = $this->getIndexerRegistry()->get($indexerId);
             /** @var \Magento\Indexer\Model\Indexer\State $state */
             $state = $indexer->getState();
+            $state->setStatus(StateInterface::STATUS_WORKING);
+            $state->save();
             $state->setStatus(StateInterface::STATUS_VALID);
             $state->save();
         }

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

@@ -10,6 +10,9 @@
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Indexer\StateInterface;
 
+/**
+ * Indexer processor
+ */
 class Processor
 {
     /**
@@ -70,6 +73,8 @@ public function reindexAllInvalid()
                 } else {
                     /** @var \Magento\Indexer\Model\Indexer\State $state */
                     $state = $indexer->getState();
+                    $state->setStatus(StateInterface::STATUS_WORKING);
+                    $state->save();
                     $state->setStatus(StateInterface::STATUS_VALID);
                     $state->save();
                 }

dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php

@@ -8,8 +8,9 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Indexer\Model\Indexer\CollectionFactory as IndexerCollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
-use PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -27,12 +28,12 @@ class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var InputInterface|Mock
+     * @var InputInterface|MockObject
      */
     private $inputMock;
 
     /**
-     * @var OutputInterface|Mock
+     * @var OutputInterface|MockObject
      */
     private $outputMock;
 
@@ -41,6 +42,11 @@ class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $command;
 
+    /**
+     * @var IndexerCollectionFactory
+     */
+    private $indexerCollectionFactory;
+
     /**
      * @inheritdoc
      */
@@ -52,6 +58,7 @@ protected function setUp()
         $this->outputMock = $this->getMockBuilder(OutputInterface::class)->getMockForAbstractClass();
 
         $this->command = $this->objectManager->get(IndexerReindexCommand::class);
+        $this->indexerCollectionFactory = $this->objectManager->create(IndexerCollectionFactory::class);
     }
 
     /**
@@ -65,5 +72,19 @@ public function testReindexAll()
             $status,
             'Index wasn\'t success'
         );
+
+        $notValidIndexers = [];
+        $indexers = $this->indexerCollectionFactory->create()->getItems();
+        foreach ($indexers as $indexer) {
+            if ($indexer->isValid()) {
+                continue;
+            }
+
+            $notValidIndexers[] = $indexer->getId();
+        }
+        $this->assertEmpty(
+            $notValidIndexers,
+            'Following indexers are not valid: ' . implode(', ', $notValidIndexers)
+        );
     }
 }

dev/tests/integration/testsuite/Magento/Indexer/Model/ProcessorTest.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model;
+
+use Magento\Framework\Indexer\ConfigInterface as IndexerConfig;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
+use Magento\Indexer\Model\Indexer\CollectionFactory as IndexerCollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Indexer\Model\Processor
+ */
+class ProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Indexer\Config\Converter
+     */
+    private $processor;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->processor = Bootstrap::getObjectManager()->create(Processor::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testReindexAllInvalid()
+    {
+        $indexerConfig = Bootstrap::getObjectManager()->create(IndexerConfig::class);
+        $indexerFactory = Bootstrap::getObjectManager()->create(IndexerInterfaceFactory::class);
+        $indexerIds = array_keys($indexerConfig->getIndexers());
+
+        foreach ($indexerIds as $indexerId) {
+            $indexer = $indexerFactory->create()->load($indexerId);
+            $indexer->invalidate();
+        }
+
+        $this->processor->reindexAllInvalid();
+
+        $notValidIndexers = [];
+        foreach ($indexerIds as $indexerId) {
+            $indexer = $indexerFactory->create()->load($indexerId);
+            if ($indexer->isValid()) {
+                continue;
+            }
+
+            $notValidIndexers[] = $indexer->getId();
+        }
+        $this->assertEmpty(
+            $notValidIndexers,
+            'Following indexers are not valid: ' . implode(', ', $notValidIndexers)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testReindexAll()
+    {
+        $indexerCollectionFactory = Bootstrap::getObjectManager()->create(IndexerCollectionFactory::class);
+        $indexers = $indexerCollectionFactory->create()->getItems();
+        foreach ($indexers as $indexer) {
+            $indexer->invalidate();
+        }
+
+        $this->processor->reindexAll();
+
+        $notValidIndexers = [];
+        $indexers = $indexerCollectionFactory->create()->getItems();
+        foreach ($indexers as $indexer) {
+            if ($indexer->isValid()) {
+                continue;
+            }
+
+            $notValidIndexers[] = $indexer->getId();
+        }
+        $this->assertEmpty(
+            $notValidIndexers,
+            'Following indexers are not valid: ' . implode(', ', $notValidIndexers)
+        );
+    }
+}