MC-21807: Implement control over minimum_should_match for elasticsearch queries

- Fix Magento-Health-Index-PR build failures

Author: bubasuma

app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/AddDefaultSearchFieldTest.php

@@ -8,27 +8,14 @@
 namespace Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper;
 
 use Magento\Elasticsearch6\Model\Adapter\FieldMapper\AddDefaultSearchField;
-use Magento\Framework\TestFramework\Unit\BaseTestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test mapping preprocessor AddDefaultSearchField
  */
-class AddDefaultSearchFieldTest extends BaseTestCase
+class AddDefaultSearchFieldTest extends TestCase
 {
-    /**
-     * @var AddDefaultSearchField
-     */
-    private $model;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->model = $this->objectManager->getObject(AddDefaultSearchField::class);
-    }
-
     /**
      * Test default search field "_search" should be prepended and overwrite if exist.
      *
@@ -38,7 +25,9 @@ protected function setUp()
      */
     public function testProcess(array $mappingBefore, array $mappingAfter)
     {
-        $this->assertEquals($mappingAfter, $this->model->process($mappingBefore));
+        $objectManager = new ObjectManager($this);
+        $model = $objectManager->getObject(AddDefaultSearchField::class);
+        $this->assertEquals($mappingAfter, $model->process($mappingBefore));
     }
 
     /**

app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchFieldTest.php

@@ -8,27 +8,14 @@
 namespace Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper;
 
 use Magento\Elasticsearch6\Model\Adapter\FieldMapper\CopySearchableFieldsToSearchField;
-use Magento\Framework\TestFramework\Unit\BaseTestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test mapping preprocessor CopySearchableFieldsToSearchField
  */
-class CopySearchableFieldsToSearchFieldTest extends BaseTestCase
+class CopySearchableFieldsToSearchFieldTest extends TestCase
 {
-    /**
-     * @var CopySearchableFieldsToSearchField
-     */
-    private $model;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->model = $this->objectManager->getObject(CopySearchableFieldsToSearchField::class);
-    }
-
     /**
      * Test "copy_to" parameter should be added to searchable fields.
      *
@@ -38,7 +25,9 @@ protected function setUp()
      */
     public function testProcess(array $mappingBefore, array $mappingAfter)
     {
-        $this->assertEquals($mappingAfter, $this->model->process($mappingBefore));
+        $objectManager = new ObjectManager($this);
+        $model = $objectManager->getObject(CopySearchableFieldsToSearchField::class);
+        $this->assertEquals($mappingAfter, $model->process($mappingBefore));
     }
 
     /**