Merge pull request #4326 from vespa-engine/toregge/switch-to-json-for…

…-expected-result-file

Switch to JSON for expected result file.

tests/search/parent_child/grouping_sorting.rb

@@ -63,12 +63,12 @@ def run_imported_attributes_can_be_used_for_grouping(sub_test_dir)
     deploy_and_start
     feed_baseline
 
-    assert_grouping('all(group(my_campaign_name) each(output(sum(my_budget))))', 'group_on_parent_name.xml')
+    assert_grouping('all(group(my_campaign_name) each(output(sum(my_budget))))', 'group_on_parent_name')
   end
 
   def assert_grouping(grouping_query, file_name)
-    assert_xml_result_with_timeout(2.0, "/search/?hits=0&query=sddocname:ad&select=#{grouping_query}",
-                      get_test_path(file_name))
+    assert_result("/search/?hits=0&query=sddocname:ad&select=#{grouping_query}",
+                  get_test_path("#{file_name}.json"))
   end
 
   def assert_sorting(sort_spec, hits, file_name)

tests/search/parent_child/grouping_sorting/group_on_parent_name.json

@@ -0,0 +1,59 @@
+{
+  "root": {
+    "id": "toplevel",
+    "relevance": 1.0,
+    "fields": {
+      "totalCount": 5
+    },
+    "coverage": {
+      "coverage": 100,
+      "documents": 5,
+      "full": true,
+      "nodes": 1,
+      "results": 1,
+      "resultsFull": 1
+    },
+    "children": [
+      {
+        "id": "group:root:0",
+        "relevance": 1.0,
+        "continuation": {
+          "this": ""
+        },
+        "children": [
+          {
+            "id": "grouplist:my_campaign_name",
+            "relevance": 1.0,
+            "label": "my_campaign_name",
+            "children": [
+              {
+                "id": "group:string:plumbus",
+                "relevance": 21.0,
+                "value": "plumbus",
+                "fields": {
+                  "sum(my_budget)": 20
+                }
+              },
+              {
+                "id": "group:string:gazorpazorpfield",
+                "relevance": 13.0,
+                "value": "gazorpazorpfield",
+                "fields": {
+                  "sum(my_budget)": 20
+                }
+              },
+              {
+                "id": "group:string:morty",
+                "relevance": 10.0,
+                "value": "morty",
+                "fields": {
+                  "sum(my_budget)": 10
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}