Merge pull request #36395 from vespa-engine/johsol/select-language-parity-wand-weakand

Add parity tests for wand and weakAnd with annotations

Author: hmusum

container-search/src/test/java/com/yahoo/search/query/YqlJsonQueryFeatureParityTest.java

@@ -179,12 +179,24 @@ void testWeakAnd() {
                 "{ 'weakAnd' : [ { 'contains' : ['a', 'A'] }, { 'contains' : ['b', 'B'] } ] }");
     }
 
+    @Test
+    void testWeakAndWithAnnotations() {
+        assertWhereParity("{scoreThreshold: 41, totalTargetHits: 7}weakAnd(a contains 'A', b contains 'B')",
+                "{ 'weakAnd' : { 'children' : [ { 'contains' : ['a', 'A'] }, { 'contains' : ['b', 'B'] } ], 'attributes' : { 'scoreThreshold': 41, 'totalTargetHits': 7 } } }");
+    }
+
     @Test
     void testWand() {
         assertWhereParity("wand(description, {'a': 1, 'b': 2})",
                 "{ 'wand' : ['description', { 'a': 1, 'b': 2 }] }");
     }
 
+    @Test
+    void testWandWithAnnotations() {
+        assertWhereParity("[{'scoreThreshold': 13, 'totalTargetHits': 7}]wand(description, {'a': 1, 'b': 2})",
+                "{ 'wand' : { 'children' : ['description', { 'a': 1, 'b': 2 }], 'attributes' : { 'scoreThreshold': 13, 'totalTargetHits': 7 } } }");
+    }
+
     @Test
     void testWeightedSet() {
         assertWhereParity("weightedSet(description, {'a': 1, 'b': 2})",