allow short-form JSON for 1-d constants

1 files changed, 19 insertions, 1 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
index 80643917a58..42be1592eca 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
@@ -281,7 +281,25 @@ public class ConstantTensorJsonValidatorTest {
                             "   }",
                             "}"));
         });
-        assertTrue(exception.getMessage().contains("Expected field name 'cells', got 'stats'"));
+        System.err.println("msg: " + exception.getMessage());
+        assertTrue(exception.getMessage().contains("Expected 'cells' or 'values', got 'stats'"));
+    }
+
+    @Test
+    void ensure_that_values_array_for_vector_works() {
+        validateTensorJson(
+                TensorType.fromSpec("tensor(x[5])"),
+                inputJsonToReader("[5,4.0,3.1,-2,-1.0]"));
+        validateTensorJson(
+                TensorType.fromSpec("tensor(x[5])"),
+                inputJsonToReader("{'values':[5,4.0,3.1,-2,-1.0]}"));
+    }
+
+    @Test
+    void ensure_that_simple_object_for_map_works() {
+        validateTensorJson(
+                TensorType.fromSpec("tensor(x{})"),
+                inputJsonToReader("{'cells':{'a':5,'b':4.0,'c':3.1,'d':-2,'e':-1.0}}"));
     }
 
 }