add summaries at start of list instead

2 files changed, 36 insertions, 3 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
index 421f70c8d07..81f16f7f261 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
@@ -35,9 +35,11 @@ import static org.junit.Assert.fail;
 
 public class SlimeSummaryTestCase {
 
-    private static final String summary_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/summary.cfg";
-    private static final String partial_summary1_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/partial-summary1.cfg";
-    private static final String partial_summary2_cf = "file:src/test/java/com/yahoo/prelude/fastsearch/partial-summary2.cfg";
+    private static final String cf_pre = "file:src/test/java/com/yahoo/prelude/fastsearch/";
+    private static final String summary_cf = cf_pre + "summary.cfg";
+    private static final String partial_summary1_cf = cf_pre + "partial-summary1.cfg";
+    private static final String partial_summary2_cf = cf_pre + "partial-summary2.cfg";
+    private static final String partial_summary3_cf = cf_pre + "partial-summary3.cfg";
 
     @Test
     public void testDecodingEmpty() {
@@ -143,6 +145,7 @@ public class SlimeSummaryTestCase {
     public void testFieldAccessAPI() {
         DocsumDefinitionSet partialDocsum1 = createDocsumDefinitionSet(partial_summary1_cf);
         DocsumDefinitionSet partialDocsum2 = createDocsumDefinitionSet(partial_summary2_cf);
+        DocsumDefinitionSet partialDocsum3 = createDocsumDefinitionSet(partial_summary3_cf);
         DocsumDefinitionSet fullDocsum = createDocsumDefinitionSet(summary_cf);
         FastHit hit = new FastHit();
         Map<String, Object> expected = new HashMap<>();
@@ -273,6 +276,18 @@ public class SlimeSummaryTestCase {
         expected.put("string_field", "string_value");
         expected.put("longstring_field", "longstring_value");
         assertFields(expected, hit);
+
+        hit.removeField("string_field");
+        hit.removeField("integer_field");
+        partialDocsum3.lazyDecode("partial3", partialSummary3(), hit);
+        expected.put("string_field", "new str val");
+        expected.put("integer_field", 5);
+        assertFields(expected, hit);
+
+        hit.removeField("integer_field");
+        partialDocsum2.lazyDecode("partial2", partialSummary2(), hit);
+        expected.put("integer_field", 4);
+        assertFields(expected, hit);
     }
 
 
@@ -344,6 +359,14 @@ public class SlimeSummaryTestCase {
         return encode((slime));
     }
 
+    private byte[] partialSummary3() {
+        Slime slime = new Slime();
+        Cursor docsum = slime.setObject();
+        docsum.setString("string_field", "new str val");
+        docsum.setLong("integer_field", 5);
+        return encode((slime));
+    }
+
     private byte[] fullishSummary() {
         Slime slime = new Slime();
         Cursor docsum = slime.setObject();
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/partial-summary3.cfg b/container-search/src/test/java/com/yahoo/prelude/fastsearch/partial-summary3.cfg
new file mode 100644
index 00000000000..5d7319fd393
--- /dev/null
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/partial-summary3.cfg
@@ -0,0 +1,10 @@
+documentdb[1]
+documentdb[0].name test
+documentdb[0].summaryclass[1]
+documentdb[0].summaryclass[0].name partial3
+documentdb[0].summaryclass[0].id 3
+documentdb[0].summaryclass[0].fields[3]
+documentdb[0].summaryclass[0].fields[0].name integer_field
+documentdb[0].summaryclass[0].fields[0].type integer
+documentdb[0].summaryclass[0].fields[1].name string_field
+documentdb[0].summaryclass[0].fields[1].type string