Merge pull request #29780 from vespa-engine/bratseth/programmatic-test

Bratseth/programmatic test

2 files changed, 26 insertions, 24 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
index feabf7f76f1..16345c98cff 100644
--- a/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/query/parser/ParserFactory.java
@@ -27,30 +27,18 @@ public final class ParserFactory {
      */
     @SuppressWarnings("deprecation")
     public static Parser newInstance(Query.Type type, ParserEnvironment environment) {
-        switch (type) {
-            case ALL:
-                return new AllParser(environment, false);
-            case ANY:
-                return new AnyParser(environment);
-            case PHRASE:
-                return new PhraseParser(environment);
-            case ADVANCED:
-                return new AdvancedParser(environment);
-            case WEB:
-                return new WebParser(environment);
-            case PROGRAMMATIC:
-                return new ProgrammaticParser();
-            case YQL:
-                return new YqlParser(environment);
-            case SELECT:
-                return new SelectParser(environment);
-            case WEAKAND:
-                return new AllParser(environment, true);
-            case TOKENIZE:
-                return new TokenizeParser(environment);
-            default:
-                throw new UnsupportedOperationException(type.toString());
-        }
+        return switch (type) {
+            case ALL -> new AllParser(environment, false);
+            case ANY -> new AnyParser(environment);
+            case PHRASE -> new PhraseParser(environment);
+            case ADVANCED -> new AdvancedParser(environment);
+            case WEB -> new WebParser(environment);
+            case PROGRAMMATIC -> new ProgrammaticParser();
+            case YQL -> new YqlParser(environment);
+            case SELECT -> new SelectParser(environment);
+            case WEAKAND -> new AllParser(environment, true);
+            case TOKENIZE -> new TokenizeParser(environment);
+        };
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
index 783a0ec61de..75e9525f09b 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
@@ -45,8 +45,10 @@ import com.yahoo.search.query.Sorting.LowerCaseSorter;
 import com.yahoo.search.query.Sorting.Order;
 import com.yahoo.search.query.Sorting.UcaSorter;
 import com.yahoo.search.query.parser.Parsable;
+import com.yahoo.search.query.parser.Parser;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
+import com.yahoo.search.query.parser.ParserFactory;
 import com.yahoo.search.searchchain.Execution;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -1210,6 +1212,18 @@ public class YqlParserTestCase {
                         "and string fields. The fieldset mixed has both"));
     }
 
+    // TODO: Put this in the documentation
+    @Test
+    public void testProgrammaticYqlParsing() {
+        Execution execution = new Execution(Execution.Context.createContextStub());
+        Parser parser = ParserFactory.newInstance(Query.Type.YQL,
+                                                  ParserEnvironment.fromExecutionContext(execution.context()));
+        Query query = new Query();
+        query.getModel().setType(Query.Type.YQL);
+        query.getModel().setQueryString("select * from myDoc where foo contains 'bar' and fuz contains '3'");
+        parser.parse(Parsable.fromQueryModel(query.getModel()));
+    }
+
     private static void assertNumericInItem(String field, long[] values, QueryTree query) {
         var exp = buildNumericInItem(field, values);
         assertEquals(exp, query.getRoot());