MC-18332: Remove MySQL Search Engine

- fix tests
- fix constructors

Author: cpartica

app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

@@ -27,7 +27,6 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Search\Model\EngineResolver;
 
 /**
  * Advanced search collection
@@ -41,11 +40,6 @@
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
-    /**
-     * Config search engine path.
-     */
-    private const SEARCH_ENGINE_VALUE_PATH = 'catalog/search/engine';
-
     /**
      * List Of filters
      * @var array

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -20,14 +20,12 @@
 use Magento\CatalogSearch\Model\Search\RequestGenerator;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Search\Response\QueryResponse;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
 use Magento\Framework\Api\Search\SearchResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\Search\Model\EngineResolver;
 
 /**
  * Fulltext Collection
@@ -42,37 +40,6 @@
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
-    /**
-     * Config search engine path.
-     */
-    private const SEARCH_ENGINE_VALUE_PATH = 'catalog/search/engine';
-
-    /**
-     * @var  QueryResponse
-     * @deprecated 100.1.0
-     */
-    protected $queryResponse;
-
-    /**
-     * Catalog search data
-     *
-     * @var \Magento\Search\Model\QueryFactory
-     * @deprecated 100.1.0
-     */
-    protected $queryFactory = null;
-
-    /**
-     * @var \Magento\Framework\Search\Request\Builder
-     * @deprecated 100.1.0
-     */
-    private $requestBuilder;
-
-    /**
-     * @var \Magento\Search\Model\SearchEngine
-     * @deprecated 100.1.0
-     */
-    private $searchEngine;
-
     /**
      * @var string
      */
@@ -134,8 +101,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
     private $defaultFilterStrategyApplyChecker;
 
     /**
-     * Collection constructor
-     *
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -155,9 +120,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
-     * @param \Magento\Search\Model\QueryFactory $catalogSearchData
-     * @param \Magento\Framework\Search\Request\Builder $requestBuilder
-     * @param \Magento\Search\Model\SearchEngine $searchEngine
      * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
      * @param string $searchRequestName
      * @param SearchResultFactory|null $searchResultFactory
@@ -193,9 +155,6 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Customer\Api\GroupManagementInterface $groupManagement,
-        \Magento\Search\Model\QueryFactory $catalogSearchData,
-        \Magento\Framework\Search\Request\Builder $requestBuilder,
-        \Magento\Search\Model\SearchEngine $searchEngine,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         $searchRequestName = 'catalog_view_container',
         SearchResultFactory $searchResultFactory = null,
@@ -209,7 +168,6 @@ public function __construct(
         TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
         DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
     ) {
-        $this->queryFactory = $catalogSearchData;
         $this->searchResultFactory = $searchResultFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
         parent::__construct(
@@ -236,8 +194,6 @@ public function __construct(
             $productLimitationFactory,
             $metadataPool
         );
-        $this->requestBuilder = $requestBuilder;
-        $this->searchEngine = $searchEngine;
         $this->searchRequestName = $searchRequestName;
         $this->search = $search ?: ObjectManager::getInstance()->get(\Magento\Search\Api\SearchInterface::class);
         $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()

app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php

@@ -18,16 +18,21 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
-use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Validator\UniversalFactory;
 use Magento\Search\Api\SearchInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection
@@ -36,7 +41,7 @@
  * @deprecated Implementation class was replaced
  * @see \Magento\ElasticSearch
  */
-class CollectionTest extends BaseCollection
+class CollectionTest extends TestCase
 {
     /**
      * @var ObjectManager
@@ -58,11 +63,6 @@ class CollectionTest extends BaseCollection
      */
     private $criteriaBuilder;
 
-    /**
-     * @var TemporaryStorageFactory|MockObject
-     */
-    private $temporaryStorageFactory;
-
     /**
      * @var SearchInterface|MockObject
      */
@@ -89,9 +89,6 @@ protected function setUp(): void
         $universalFactory = $this->getUniversalFactory();
         $this->criteriaBuilder = $this->getCriteriaBuilder();
         $this->filterBuilder = $this->createMock(FilterBuilder::class);
-        $this->temporaryStorageFactory = $this->createMock(
-            TemporaryStorageFactory::class
-        );
         $this->search = $this->getMockForAbstractClass(SearchInterface::class);
 
         $productLimitationMock = $this->createMock(
@@ -141,7 +138,6 @@ protected function setUp(): void
                 'universalFactory' => $universalFactory,
                 'searchCriteriaBuilder' => $this->criteriaBuilder,
                 'filterBuilder' => $this->filterBuilder,
-                'temporaryStorageFactory' => $this->temporaryStorageFactory,
                 'search' => $this->search,
                 'productLimitationFactory' => $productLimitationFactoryMock,
                 'collectionProvider' => null,
@@ -221,4 +217,74 @@ protected function getCriteriaBuilder()
 
         return $criteriaBuilder;
     }
+
+    /**
+     * Get Mocks for StoreManager so Collection can be used.
+     *
+     * @return MockObject
+     */
+    protected function getStoreManager()
+    {
+        $store = $this->getMockBuilder(Store::class)
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $store->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($store);
+
+        return $storeManager;
+    }
+
+    /**
+     * Get mock for UniversalFactory so Collection can be used.
+     *
+     * @return MockObject
+     */
+    protected function getUniversalFactory()
+    {
+        $connection = $this->getMockBuilder(Mysql::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['select'])
+            ->getMockForAbstractClass();
+        $select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $connection->expects($this->any())->method('select')->willReturn($select);
+
+        $entity = $this->getMockBuilder(AbstractEntity::class)
+            ->setMethods(['getConnection', 'getTable', 'getDefaultAttributes', 'getEntityTable'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $entity->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $entity->expects($this->exactly(2))
+            ->method('getTable')
+            ->willReturnArgument(0);
+        $entity->expects($this->once())
+            ->method('getDefaultAttributes')
+            ->willReturn(['attr1', 'attr2']);
+        $entity->expects($this->once())
+            ->method('getEntityTable')
+            ->willReturn('table');
+
+        $universalFactory = $this->getMockBuilder(UniversalFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $universalFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($entity);
+
+        return $universalFactory;
+    }
 }

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Aggregation/AggregationResolverTest.php

@@ -3,22 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Search\Test\Unit\Adapter\Aggregation;
 
 use Magento\Framework\Search\Adapter\Aggregation\AggregationResolver;
 use Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface;
 use Magento\Framework\Search\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class AggregationResolverTest extends \PHPUnit\Framework\TestCase
+class AggregationResolverTest extends TestCase
 {
     /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|MockObject
      */
     private $request;
 
     /**
-     * @var AggregationResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AggregationResolverInterface|MockObject
      */
     private $specificAggregationResolver;
 
@@ -27,10 +31,10 @@ class AggregationResolverTest extends \PHPUnit\Framework\TestCase
      */
     private $aggregationResolver;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->request = $this->createMock(RequestInterface::class);
-        $this->specificAggregationResolver = $this->createMock(AggregationResolverInterface::class);
+        $this->request = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->specificAggregationResolver = $this->getMockForAbstractClass(AggregationResolverInterface::class);
 
         $this->aggregationResolver = (new ObjectManager($this))->getObject(
             AggregationResolver::class,