Revert "Revert "Simplify and correct isFilled""

1 files changed, 37 insertions, 0 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
index 01383ba29f2..8a068b7cb3b 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java
@@ -5,6 +5,9 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import org.junit.Test;
 
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -50,6 +53,40 @@ public class FillingTestCase {
         assertTrue(group.isFilled("otherSummary"));
     }
 
+    @Test
+    public void testPartiallyFilledWith2Hits() {
+        Hit hit1 = new Hit("id1");
+        Hit hit2 = new Hit("id2");
+
+        hit1.setFilled("summary");
+        hit2.setFillable();
+
+        HitGroup hits = new HitGroup();
+        hits.add(hit1);
+        hits.add(hit2);
+
+        assertEquals(Collections.emptySet(), hits.getFilled());
+    }
+
+    @Test
+    public void testPartiallyFilledDiverse() {
+        Hit hit1 = new Hit("id1");
+        Hit hit2 = new Hit("id2");
+        Hit hit3 = new Hit("id3");
+
+        hit1.setFilled("summary1");
+        hit1.setFilled("summary2");
+        hit2.setFilled("summary1");
+        hit3.setFilled("summary1");
+
+        HitGroup hits = new HitGroup();
+        hits.add(hit1);
+        hits.add(hit2);
+        hits.add(hit3);
+
+        assertEquals(Collections.singleton("summary1"), hits.getFilled());
+    }
+
     private Hit createNonFilled(String id) {
         Hit hit=new Hit(id);
         hit.setFillable();