MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run

  - Add integration tests to ensure that Index Switcher was actually used in one type of indexation and not used in others

Author: igrybkov

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/IndexSwitcherMock.php

@@ -9,6 +9,9 @@
 
 use Magento\CatalogSearch\Model\Indexer\IndexSwitcherInterface;
 
+/**
+ * The proxy class around index switcher which allows to ensure that the IndexSwitcher was actually used
+ */
 class IndexSwitcherMock extends \PHPUnit_Framework_Assert implements IndexSwitcherInterface
 {
     private $isSwitched = false;
@@ -27,7 +30,6 @@ public function __construct(
         $this->indexSwitcher = $indexSwitcher;
     }
 
-
     /**
      * Switch current index with temporary index
      *
@@ -38,7 +40,7 @@ public function __construct(
      */
     public function switchIndex(array $dimensions)
     {
-        $this->isSwitched = true;
+        $this->isSwitched |= true;
         $this->indexSwitcher->switchIndex($dimensions);
     }
 
@@ -47,6 +49,6 @@ public function switchIndex(array $dimensions)
      */
     public function isSwitched()
     {
-        return $this->isSwitched;
+        return (bool) $this->isSwitched;
     }
 }

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/SwitcherUsedInFulltextTest.php

@@ -15,6 +15,11 @@
  */
 class SwitcherUsedInFulltextTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var IndexSwitcherInterface
+     */
+    private $indexSwitcher;
+
     /**
      * @var \Magento\Framework\Indexer\IndexerInterface
      */
@@ -72,54 +77,96 @@ class SwitcherUsedInFulltextTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $objectManager->configure(
+            [
+                'Magento\CatalogSearch\Model\Indexer\Fulltext' => [
+                    'arguments' => [
+                        'indexSwitcher' => [
+                            'instance' => 'Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock',
+                        ],
+                    ],
+                ],
+            ]
+        );
+
         /** @var \Magento\Framework\Indexer\IndexerInterface indexer */
-        $this->indexer = Bootstrap::getObjectManager()->create(
+        $this->indexer = $objectManager->create(
             \Magento\Indexer\Model\Indexer::class
         );
         $this->indexer->load('catalogsearch_fulltext');
 
-        $objectManager = Bootstrap::getObjectManager();
         $this->engine = $objectManager->get(
             \Magento\CatalogSearch\Model\ResourceModel\Engine::class
         );
 
-        $this->resourceFulltext = Bootstrap::getObjectManager()->get(
+        $this->resourceFulltext = $objectManager->get(
             \Magento\CatalogSearch\Model\ResourceModel\Fulltext::class
         );
 
-        $this->queryFactory = Bootstrap::getObjectManager()->get(
+        $this->queryFactory = $objectManager->get(
             \Magento\Search\Model\QueryFactory::class
         );
 
-        $this->dimension = Bootstrap::getObjectManager()->create(
+        $this->dimension = $objectManager->create(
             \Magento\Framework\Search\Request\Dimension::class,
             ['name' => 'scope', 'value' => '1']
         );
 
+        $this->indexSwitcher = Bootstrap::getObjectManager()->get(
+            \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock::class
+        );
+
         $this->productApple = $this->getProductBySku('fulltext-1');
         $this->productBanana = $this->getProductBySku('fulltext-2');
         $this->productOrange = $this->getProductBySku('fulltext-3');
         $this->productPapaya = $this->getProductBySku('fulltext-4');
         $this->productCherry = $this->getProductBySku('fulltext-5');
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testReindexAll()
     {
         $this->indexer->reindexAll();
 
-        $products = $this->search('Apple');
-        $this->assertCount(1, $products);
-        $this->assertEquals($this->productApple->getId(), $products[0]->getId());
-
-        $products = $this->search('Simple Product');
-        $this->assertCount(5, $products);
         /** @var \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock $indexSwitcher */
         $indexSwitcher = Bootstrap::getObjectManager()->get(
             \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock::class
         );
         $this->assertTrue($indexSwitcher->isSwitched());
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testReindexList()
+    {
+        $this->indexer->reindexList([$this->productApple->getId(), $this->productBanana->getId()]);
+
+        /** @var \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock $indexSwitcher */
+        $indexSwitcher = Bootstrap::getObjectManager()->get(
+            \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock::class
+        );
+        $this->assertFalse($indexSwitcher->isSwitched());
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testReindexRow()
+    {
+        $this->indexer->reindexRow($this->productPapaya->getId());
+
+        /** @var \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock $indexSwitcher */
+        $indexSwitcher = Bootstrap::getObjectManager()->get(
+            \Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock::class
+        );
+        $this->assertFalse($indexSwitcher->isSwitched());
+    }
+
     /**
      * Search the text and return result collection
      *