Fix test

Author: svilen-mihaylov-elastic

docs/reference/esql/functions/kibana/definition/qstr.json

@@ -31,7 +31,7 @@ public final void testFold() {
         assertFalse("expected resolved", expression.typeResolved().unresolved());
     }
 
-    protected static Iterable<Object[]> generateParameters() {
+    protected static List<TestCaseSupplier> getStringTestSupplier() {
         List<TestCaseSupplier> suppliers = new LinkedList<>();
         for (DataType strType : DataType.stringTypes()) {
             suppliers.add(
@@ -42,7 +42,11 @@ protected static Iterable<Object[]> generateParameters() {
                 )
             );
         }
-        return parameterSuppliersFromTypedData(suppliers);
+        return suppliers;
+    }
+
+    protected static Iterable<Object[]> generateParameters() {
+        return parameterSuppliersFromTypedData(getStringTestSupplier());
     }
 
     private static TestCaseSupplier.TestCase testCase(DataType strType, String str, Matcher<Boolean> matcher) {

docs/reference/esql/functions/types/qstr.asciidoc

@@ -10,14 +10,25 @@
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
+import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.Literal;
+import org.elasticsearch.xpack.esql.core.expression.MapExpression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.function.FunctionName;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.elasticsearch.xpack.esql.core.type.DataType.BOOLEAN;
+import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
+import static org.elasticsearch.xpack.esql.core.type.DataType.UNSUPPORTED;
+import static org.elasticsearch.xpack.esql.planner.TranslatorHandler.TRANSLATOR_HANDLER;
+import static org.hamcrest.Matchers.equalTo;
+
 @FunctionName("qstr")
 public class QueryStringTests extends NoneFieldFullTextFunctionTestCase {
 
@@ -27,11 +38,48 @@ public QueryStringTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> te
 
     @ParametersFactory
     public static Iterable<Object[]> parameters() {
-        return generateParameters();
+        return parameterSuppliersFromTypedData(addFunctionNamedParams(getStringTestSupplier()));
+    }
+
+    /**
+     * Adds function named parameters to all the test case suppliers provided
+     */
+    private static List<TestCaseSupplier> addFunctionNamedParams(List<TestCaseSupplier> suppliers) {
+        List<TestCaseSupplier> result = new ArrayList<>();
+        for (TestCaseSupplier supplier : suppliers) {
+            List<DataType> dataTypes = new ArrayList<>(supplier.types());
+            dataTypes.add(UNSUPPORTED);
+            result.add(new TestCaseSupplier(supplier.name() + ", options", dataTypes, () -> {
+                List<TestCaseSupplier.TypedData> values = new ArrayList<>(supplier.get().getData());
+                values.add(
+                    new TestCaseSupplier.TypedData(
+                        new MapExpression(
+                            Source.EMPTY,
+                            List.of(
+                                new Literal(Source.EMPTY, "default_field", KEYWORD),
+                                new Literal(Source.EMPTY, randomAlphaOfLength(10), KEYWORD)
+                            )
+                        ),
+                        UNSUPPORTED,
+                        "options"
+                    ).forceLiteral()
+                );
+
+                return new TestCaseSupplier.TestCase(values, equalTo("MatchEvaluator"), BOOLEAN, equalTo(true));
+            }));
+        }
+        return result;
     }
 
     @Override
     protected Expression build(Source source, List<Expression> args) {
-        return new QueryString(source, args.getFirst(), null);
+        var qstr = new QueryString(source, args.get(0), args.size() > 1 ? args.get(1) : null);
+        // We need to add the QueryBuilder to the match expression, as it is used to implement equals() and hashCode() and
+        // thus test the serialization methods. But we can only do this if the parameters make sense .
+        if (args.get(0).foldable()) {
+            QueryBuilder queryBuilder = TRANSLATOR_HANDLER.asQuery(qstr).asBuilder();
+            qstr.replaceQueryBuilder(queryBuilder);
+        }
+        return qstr;
     }
 }