AC-15048::[CE] PHPUnit 12: Upgrade Search & Navigation related test cases | Review Fixes

Author: cod43156

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

@@ -20,6 +20,8 @@ class AddDefaultSearchFieldTest extends TestCase
     /**
      * Test default search field "_search" should be prepended and overwrite if exist.
      *
+     * @param array $mappingBefore
+     * @param array $mappingAfter
      */
     #[DataProvider('processDataProvider')]
     public function testProcess(array $mappingBefore, array $mappingAfter)

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/AttributeAdapterTest.php

@@ -239,6 +239,10 @@ public function testIsBooleanType($frontendInput, $backendType, $expected)
     }
 
     /**
+     * @param $frontendInput
+     * @param $usesSource
+     * @param $expected
+     * @return void
      */
     #[DataProvider('isComplexTypeProvider')]
     public function testIsComplexType($frontendInput, $usesSource, $expected)
@@ -252,6 +256,8 @@ public function testIsComplexType($frontendInput, $usesSource, $expected)
     }
 
     /**
+     * @param $expected
+     * @return void
      */
     #[DataProvider('isEavAttributeProvider')]
     public function testIsEavAttribute($expected)

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php

@@ -48,6 +48,11 @@ protected function setUp(): void
     }
 
     /**
+     * @param $isSearchable
+     * @param $isAlwaysIndexable
+     * @param $serviceFieldType
+     * @param $expected
+     * @return void
      */
     #[DataProvider('getFieldIndexProvider')]
     public function testGetFieldName(

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolverTest.php

@@ -58,6 +58,13 @@ protected function setUp(): void
     }
 
     /**
+     * @param $fieldType
+     * @param $attributeCode
+     * @param $frontendInput
+     * @param $isSortable
+     * @param $context
+     * @param $expected
+     * @return void
      */
     #[DataProvider('getFieldNameProvider')]
     public function testGetFieldName(

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/NotEavAttributeTest.php

@@ -38,6 +38,11 @@ protected function setUp(): void
     }
 
     /**
+     * @param $attributeCode
+     * @param $isEavAttribute
+     * @param $context
+     * @param $expected
+     * @return void
      */
     #[DataProvider('getFieldNameProvider')]
     public function testGetFieldName($attributeCode, $isEavAttribute, $context, $expected)

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php

@@ -136,7 +136,7 @@ public function testBuild($filterMock, $filterType)
     #[DataProvider('buildDataProvider')]
     public function testBuildNegation($filterMock, $filterType)
     {
-        if ($filterMock == "Magento\Framework\Search\Request\Filter\BoolExpression") {
+        if ($filterMock == "BoolExpression") {
             $childFilter = $this->createPartialMockWithReflection(
                 FilterInterface::class,
                 ['getType', 'getName', 'getMust', 'getShould', 'getMustNot']

app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php

@@ -21,6 +21,8 @@
 use Magento\Framework\Validator\UniversalFactory;
 use Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\AbstractSwatch;
 use Magento\Swatches\Helper\Media;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\View\Element\Html\Select as HtmlSelect;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -81,12 +83,12 @@ protected function setUp(): void
         $objectManager = new ObjectManager($this);
         $objects = [
             [
-                \Magento\Framework\Json\Helper\Data::class,
-                $this->createMock(\Magento\Framework\Json\Helper\Data::class)
+                Data::class,
+                $this->createMock(Data::class)
             ],
             [
-                \Magento\Framework\View\Element\Html\Select::class,
-                $this->createMock(\Magento\Framework\View\Element\Html\Select::class)
+                HtmlSelect::class,
+                $this->createMock(HtmlSelect::class)
             ]
         ];
         $objectManager->prepareObjectManager($objects);