Unit test features() accessor

2 files changed, 4 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index ca9b8380049..338add37213 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -194,7 +194,8 @@ public class FastHit extends Hit {
      * in the rank profile specified in the query producing this.
      */
     public FeatureData features() {
-        return (FeatureData)getField("summaryfeatures");
+        FeatureData data = (FeatureData)getField("summaryfeatures");
+        return data == null ? super.features() : data;
     }
 
     /**
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 d8924e16ff9..d888ddabdc1 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
@@ -67,6 +67,7 @@ public class SlimeSummaryTestCase {
         assertNull(hit.getField("tensor_field1"));
         assertNull(hit.getField("tensor_field2"));
         assertNull(hit.getField("summaryfeatures"));
+        assertTrue(hit.features().featureNames().isEmpty());
     }
 
     @Test
@@ -116,7 +117,7 @@ public class SlimeSummaryTestCase {
         }
         assertEquals(tensor1, hit.getField("tensor_field1"));
         assertEquals(tensor2, hit.getField("tensor_field2"));
-        FeatureData featureData = (FeatureData)hit.getField("summaryfeatures");
+        FeatureData featureData = hit.features();
         assertEquals("double_feature,tensor1_feature,tensor2_feature",
                      featureData.featureNames().stream().sorted().collect(Collectors.joining(",")));
         assertEquals(0.5, featureData.getDouble("double_feature"), 0.00000001);