MAGETWO-95294: Mysql search slow on the catalog page

- changes after merge

Author: vgoncharenko

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

@@ -66,6 +66,7 @@ protected function setUp()
      * @param $fieldType
      * @param $attributeCode
      * @param $frontendInput
+     * @param $isSortable
      * @param $context
      * @param $expected
      * @return void
@@ -74,6 +75,7 @@ public function testGetFieldName(
         $fieldType,
         $attributeCode,
         $frontendInput,
+        $isSortable,
         $context,
         $expected
     ) {
@@ -82,14 +84,17 @@ public function testGetFieldName(
             ->willReturn('string');
         $attributeMock = $this->getMockBuilder(AttributeAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getAttributeCode', 'getFrontendInput'])
+            ->setMethods(['getAttributeCode', 'getFrontendInput', 'isSortable'])
             ->getMock();
         $attributeMock->expects($this->any())
             ->method('getAttributeCode')
             ->willReturn($attributeCode);
         $attributeMock->expects($this->any())
             ->method('getFrontendInput')
             ->willReturn($frontendInput);
+        $attributeMock->expects($this->any())
+            ->method('isSortable')
+            ->willReturn($isSortable);
         $this->fieldTypeResolver->expects($this->any())
             ->method('getFieldType')
             ->willReturn($fieldType);
@@ -106,13 +111,13 @@ public function testGetFieldName(
     public function getFieldNameProvider()
     {
         return [
-            ['', 'code', '', [], 'code'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['string', '*', '', ['type' => 'default'], '_search'],
-            ['', 'code', '', ['type' => 'default'], 'code'],
-            ['', 'code', 'select', ['type' => 'default'], 'code'],
-            ['', 'code', 'boolean', ['type' => 'default'], 'code'],
-            ['', 'code', '', ['type' => 'type'], 'sort_code'],
+            ['', 'code', '', false, [], 'code'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['string', '*', '', false, ['type' => 'default'], '_search'],
+            ['', 'code', '', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'select', false, ['type' => 'default'], 'code'],
+            ['', 'code', 'boolean', false, ['type' => 'default'], 'code'],
+            ['', 'code', '', true, ['type' => 'sort'], 'sort_code'],
         ];
     }
 }