Merge pull request #6353 from vespa-engine/geirst/fix-assign-null-json-operation-for-position-fields

Use default long field value instead of null when position field is n…

1 files changed, 7 insertions, 3 deletions

diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java
index 2fcc032563c..746fdc36e13 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveTestCase.java
@@ -41,8 +41,12 @@ public class ZCurveTestCase {
     }
 
     @Test
-    public void requireThatMissingFieldEvaluatesToNull() {
-        assertNull(new ZCurveExpression().execute(PositionDataType.valueOf(null, 9)));
-        assertNull(new ZCurveExpression().execute(PositionDataType.valueOf(6, null)));
+    public void requireThatMissingFieldEvaluatesToDefaultValue() {
+        assertEquals(DataType.LONG.createFieldValue(),
+                new ZCurveExpression().execute(PositionDataType.valueOf(null, 9)));
+        assertEquals(DataType.LONG.createFieldValue(),
+                new ZCurveExpression().execute(PositionDataType.valueOf(6, null)));
+        assertEquals(DataType.LONG.createFieldValue(),
+                new ZCurveExpression().execute(PositionDataType.valueOf(null, null)));
     }
 }