Don't render field in search result if it is empty after matched elements filtering.

3 files changed, 13 insertions, 13 deletions

diff --git a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
index a00592400b5..8bf3db4d112 100644
--- a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
+++ b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
@@ -131,7 +131,7 @@ TEST_F(AttributeCombinerTest, require_that_attribute_combiner_dfw_generates_corr
 {
     set_field("array", true);
     assertWritten("[ { name: 'n1.2', val: 11}]", 1);
-    assertWritten("[ ]", 2);
+    assertWritten("null", 2);
     assertWritten("[ { fval: 130.0, name: 'n3.1', val: 30} ]", 3);
     assertWritten("[ { fval: 141.0, name: 'n4.2', val:  41} ]", 4);
     assertWritten("null", 5);
@@ -141,7 +141,7 @@ TEST_F(AttributeCombinerTest, require_that_attribute_combiner_dfw_generates_corr
 {
     set_field("smap", true);
     assertWritten("[ { key: 'k1.2', value: { name: 'n1.2', val: 11} }]", 1);
-    assertWritten("[ ]", 2);
+    assertWritten("null", 2);
     assertWritten("[ { key: 'k3.1', value: { fval: 130.0, name: 'n3.1', val: 30} } ]", 3);
     assertWritten("[ { key: 'k4.2', value: { fval: 141.0, name: 'n4.2', val:  41} } ]", 4);
     assertWritten("null", 5);
@@ -151,7 +151,7 @@ TEST_F(AttributeCombinerTest, require_that_attribute_combiner_dfw_generates_corr
 {
     set_field("map", true);
     assertWritten("[ { key: 'k1.2', value: 'n1.2'}]", 1);
-    assertWritten("[ ]", 2);
+    assertWritten("null", 2);
     assertWritten("[ { key: 'k3.1', value: 'n3.1' } ]", 3);
     assertWritten("[ { key: 'k4.2', value: 'n4.2' } ]", 4);
     assertWritten("null", 5);
diff --git a/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp b/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp
index 42443cf1058..e9d00629d6f 100644
--- a/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp
@@ -135,19 +135,19 @@ TEST_F(AttributeDFWTest, matched_elements_fields_is_populated)
 TEST_F(AttributeDFWTest, filteres_matched_elements_in_array_attribute)
 {
     setup("array_str", true);
-    expect_filtered({}, "[]");
+    expect_filtered({}, "null");
     expect_filtered({0}, "[ 'a' ]");
     expect_filtered({1, 2}, "[ 'b', 'c' ]");
-    expect_filtered({3}, "[]");
+    expect_filtered({3}, "null");
 }
 
 TEST_F(AttributeDFWTest, filteres_matched_elements_in_wset_attribute)
 {
     setup("wset_str", true);
-    expect_filtered({}, "[]");
+    expect_filtered({}, "null");
     expect_filtered({0}, "[ {'item':'a', 'weight':1} ]");
     expect_filtered({1, 2}, "[ {'item':'b', 'weight':1}, {'item':'c', 'weight':1} ]");
-    expect_filtered({3}, "[]");
+    expect_filtered({3}, "null");
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
index d002a9a2748..519961dedb6 100644
--- a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
+++ b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
@@ -247,14 +247,14 @@ MatchedElementsFilterTest::~MatchedElementsFilterTest() = default;
 
 TEST_F(MatchedElementsFilterTest, filters_elements_in_array_field_value)
 {
-    expect_filtered("array", {}, "[]");
+    expect_filtered("array", {}, "null");
     expect_filtered("array", {0}, "[{'name':'a','weight':3}]");
     expect_filtered("array", {1}, "[{'name':'b','weight':5}]");
     expect_filtered("array", {2}, "[{'name':'c','weight':7}]");
     expect_filtered("array", {0, 1, 2}, "[{'name':'a','weight':3},"
                                         "{'name':'b','weight':5},"
                                         "{'name':'c','weight':7}]");
-    expect_filtered("array", {0, 1, 100}, "[]");
+    expect_filtered("array", {0, 1, 100}, "null");
     set_empty_values();
     expect_filtered("array", {}, "null");
     set_skip_set_values();
@@ -271,14 +271,14 @@ TEST_F(MatchedElementsFilterTest, matching_elements_fields_is_setup_for_array_fi
 
 TEST_F(MatchedElementsFilterTest, filters_elements_in_map_field_value)
 {
-    expect_filtered("map", {}, "[]");
+    expect_filtered("map", {}, "null");
     expect_filtered("map", {0}, "[{'key':'a','value':{'name':'a','weight':3}}]");
     expect_filtered("map", {1}, "[{'key':'b','value':{'name':'b','weight':5}}]");
     expect_filtered("map", {2}, "[{'key':'c','value':{'name':'c','weight':7}}]");
     expect_filtered("map", {0, 1, 2}, "[{'key':'a','value':{'name':'a','weight':3}},"
                                       "{'key':'b','value':{'name':'b','weight':5}},"
                                       "{'key':'c','value':{'name':'c','weight':7}}]");
-    expect_filtered("map", {0, 1, 100}, "[]");
+    expect_filtered("map", {0, 1, 100}, "null");
     set_empty_values();
     expect_filtered("map", {}, "null");
     set_skip_set_values();
@@ -287,12 +287,12 @@ TEST_F(MatchedElementsFilterTest, filters_elements_in_map_field_value)
 
 TEST_F(MatchedElementsFilterTest, filter_elements_in_weighed_set_field_value)
 {
-    expect_filtered("wset", {}, "[]");
+    expect_filtered("wset", {}, "null");
     expect_filtered("wset", {0}, "[{'item':'a','weight':13}]");
     expect_filtered("wset", {1}, "[{'item':'b','weight':15}]");
     expect_filtered("wset", {2}, "[{'item':'c','weight':17}]");
     expect_filtered("wset", {0, 1, 2}, "[{'item':'a','weight':13},{'item':'b','weight':15},{'item':'c','weight':17}]");
-    expect_filtered("wset", {0, 1, 100}, "[]");
+    expect_filtered("wset", {0, 1, 100}, "null");
     set_empty_values();
     expect_filtered("wset", {}, "null");
     set_skip_set_values();