MC-19450: Adapt integration tests to elasticsearch

Author: omiroshnichenko

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

@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -76,10 +75,6 @@ protected function setUp()
         );
         $this->indexer->load('catalogsearch_fulltext');
 
-        $this->engine = Bootstrap::getObjectManager()->get(
-            \Magento\CatalogSearch\Model\ResourceModel\Engine::class
-        );
-
         $this->queryFactory = Bootstrap::getObjectManager()->get(
             \Magento\Search\Model\QueryFactory::class
         );
@@ -223,12 +218,8 @@ protected function search(string $text, $visibilityFilter = null): array
         $query->setQueryText($text);
         $query->saveIncrementalPopularity();
         $products = [];
-        $collection = Bootstrap::getObjectManager()->create(
-            Collection::class,
-            [
-                'searchRequestName' => 'quick_search_container'
-            ]
-        );
+        $searchLayer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Layer\Search::class);
+        $collection = $searchLayer->getProductCollection();
         $collection->addSearchFilter($text);
 
         if (null !== $visibilityFilter) {

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php

@@ -18,8 +18,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->advancedCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class);
+        $advanced = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\CatalogSearch\Model\Search\ItemCollectionProvider::class);
+        $this->advancedCollection = $advanced->getCollection();
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php

@@ -14,6 +14,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
     /**
      * @dataProvider filtersDataProviderSearch
      * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     * @magentoConfigFixture default/catalog/search/engine mysql
+     * @magentoAppIsolation enabled
      */
     public function testLoadWithFilterSearch($request, $filters, $expectedCount)
     {
@@ -31,6 +34,42 @@ public function testLoadWithFilterSearch($request, $filters, $expectedCount)
         $this->assertCount($expectedCount, $items);
     }
 
+    /**
+     * @dataProvider filtersDataProviderQuickSearch
+     * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     */
+    public function testLoadWithFilterQuickSearch($filters, $expectedCount)
+    {
+        $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Search::class);
+        /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
+        $fulltextCollection = $searchLayer->getProductCollection();
+        foreach ($filters as $field => $value) {
+            $fulltextCollection->addFieldToFilter($field, $value);
+        }
+        $fulltextCollection->loadWithFilter();
+        $items = $fulltextCollection->getItems();
+        $this->assertCount($expectedCount, $items);
+    }
+
+    /**
+     * @dataProvider filtersDataProviderCatalogView
+     * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     */
+    public function testLoadWithFilterCatalogView($filters, $expectedCount)
+    {
+        $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Category::class);
+        /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
+        $fulltextCollection = $searchLayer->getProductCollection();
+        foreach ($filters as $field => $value) {
+            $fulltextCollection->addFieldToFilter($field, $value);
+        }
+        $fulltextCollection->loadWithFilter();
+        $items = $fulltextCollection->getItems();
+        $this->assertCount($expectedCount, $items);
+    }
+
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/products_with_the_same_search_score.php
      */
@@ -42,11 +81,9 @@ public function testSearchResultsAreTheSameForSameRequests()
         $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         foreach (range(1, $howManySearchRequests) as $i) {
+            $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Search::class);
             /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
-            $fulltextCollection = $objManager->create(
-                \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection::class,
-                ['searchRequestName' => 'quick_search_container']
-            );
+            $fulltextCollection = $searchLayer->getProductCollection();
 
             $fulltextCollection->addFieldToFilter('search_term', 'shorts');
             $fulltextCollection->setOrder('relevance');
@@ -81,4 +118,22 @@ public function filtersDataProviderSearch()
             ['catalog_view_container', [], 0],
         ];
     }
+
+    public function filtersDataProviderQuickSearch()
+    {
+        return [
+            [['search_term' => '  shorts'], 2],
+            [['search_term' => 'nonexistent'], 0],
+        ];
+    }
+
+    public function filtersDataProviderCatalogView()
+    {
+        return [
+            [['category_ids' => 2], 5],
+            [['category_ids' => 100001], 0],
+            [['category_ids' => []], 5],
+            [[], 5],
+        ];
+    }
 }