Fix merge

Author: carlosdelest

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -1364,7 +1364,7 @@ public void testFullTextFunctionsOnlyAllowedInWhere() throws Exception {
             checkFullTextFunctionsOnlyAllowedInWhere("MultiMatch", "multi_match(\"Meditation\", title, body)", "function");
         }
         if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
-            checkFullTextFunctionsOnlyAllowedInWhere("KNN", "multi_match(\"Meditation\", title, body)", "function");
+            checkFullTextFunctionsOnlyAllowedInWhere("KNN", "knn(vector, [0, 1, 2])", "function");
         }
     }
 
@@ -2148,7 +2148,7 @@ public void testFullTextFunctionsNullArgs() throws Exception {
             checkFullTextFunctionNullArgs("term(title, null)", "second");
         }
         if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
-            checkFullTextFunctionNullArgs("knn(null, [0, 1, 2]])", "first");
+            checkFullTextFunctionNullArgs("knn(null, [0, 1, 2])", "first");
             checkFullTextFunctionNullArgs("knn(vector, null)", "second");
         }
     }
@@ -2160,29 +2160,6 @@ private void checkFullTextFunctionNullArgs(String functionInvocation, String arg
         );
     }
 
-    public void testFullTextFunctionsConstantQuery() throws Exception {
-        testFullTextFunctionsConstantQuery("match(title, category)", "second");
-        testFullTextFunctionsConstantQuery("qstr(title)", "");
-        testFullTextFunctionsConstantQuery("kql(title)", "");
-        if (EsqlCapabilities.Cap.MULTI_MATCH_FUNCTION.isEnabled()) {
-            testFullTextFunctionsConstantQuery("multi_match(category, body)", "first");
-            testFullTextFunctionsConstantQuery("multi_match(concat(title, \"world\"), title)", "first");
-        }
-        if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
-            testFullTextFunctionsConstantQuery("term(title, tags)", "second");
-        }
-        if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
-            testFullTextFunctionsConstantQuery("knn(vector, vector)", "second");
-        }
-    }
-
-    private void testFullTextFunctionsConstantQuery(String functionInvocation, String argOrdinal) throws Exception {
-        assertThat(
-            error("from test | where " + functionInvocation, fullTextAnalyzer),
-            containsString(argOrdinal + " argument of [" + functionInvocation + "] must be a constant")
-        );
-    }
-
     public void testFullTextFunctionsConstantQuery() throws Exception {
         checkFullTextFunctionsConstantQuery("match(title, category)", "second");
         checkFullTextFunctionsConstantQuery("qstr(title)", "");
@@ -2194,6 +2171,9 @@ public void testFullTextFunctionsConstantQuery() throws Exception {
         if (EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled()) {
             checkFullTextFunctionsConstantQuery("term(title, tags)", "second");
         }
+        if (EsqlCapabilities.Cap.KNN_FUNCTION.isEnabled()) {
+            checkFullTextFunctionsConstantQuery("knn(vector, vector)", "second");
+        }
     }
 
     private void checkFullTextFunctionsConstantQuery(String functionInvocation, String argOrdinal) throws Exception {