Disallow empty tensors without dimensions

3 files changed, 16 insertions, 22 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
index 01d1e6fc602..e150b1cf24f 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
@@ -1,5 +1,6 @@
 package com.yahoo.tensor;
 
+import junit.framework.TestCase;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -7,6 +8,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -21,6 +23,15 @@ public class IndexedTensorTestCase {
     private final int zSize = 5;
 
     @Test
+    public void testEmpty() {
+        Tensor empty = Tensor.Builder.of(TensorType.empty).build();
+        assertEquals(1, empty.size());
+        assertEquals((double)0.0, (double)empty.valueIterator().next(), 0.00000001);
+        Tensor emptyFromString = Tensor.from(TensorType.empty, "{}");
+        assertEquals(empty, emptyFromString);
+    }
+
+    @Test
     public void testSingleValue() {
         Tensor singleValue = Tensor.Builder.of(TensorType.empty).cell(TensorAddress.empty, 3.5).build();
         assertTrue(singleValue instanceof IndexedTensor);
@@ -32,22 +43,6 @@ public class IndexedTensorTestCase {
     }
     
     @Test
-    public void testSingleValueWithDimensions() {
-        TensorType type = new TensorType.Builder().indexed("x").indexed("y").build();
-        Tensor emptyWithDimensions = Tensor.Builder.of(type).build();
-        assertTrue(emptyWithDimensions instanceof IndexedTensor);
-        assertEquals("tensor(x[],y[]):{}", emptyWithDimensions.toString());
-        Tensor emptyWithDimensionsFromString = Tensor.from("tensor(x[],y[]):{}");
-        assertEquals("tensor(x[],y[]):{}", emptyWithDimensionsFromString.toString());
-        assertTrue(emptyWithDimensionsFromString instanceof IndexedTensor);
-        assertEquals(emptyWithDimensions, emptyWithDimensionsFromString);
-
-        IndexedTensor emptyWithDimensionsIndexed = (IndexedTensor)emptyWithDimensions;
-        assertEquals(0, emptyWithDimensionsIndexed.dimensionSizes().size(0));
-        assertEquals(0, emptyWithDimensionsIndexed.dimensionSizes().size(1));
-    }
-    
-    @Test
     public void testBoundBuilding() {
         TensorType type = new TensorType.Builder().indexed("v", vSize)
                                                   .indexed("w", wSize)
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
index a2df146c8e1..5c2c3b9db32 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
@@ -20,12 +20,13 @@ public class MappedTensorTestCase {
 
     @Test
     public void testEmpty() {
-        Tensor empty = Tensor.Builder.of(TensorType.empty).build();
+        TensorType type = new TensorType.Builder().mapped("x").build();
+        Tensor empty = Tensor.Builder.of(type).build();
         TestCase.assertTrue(empty instanceof MappedTensor);
         TestCase.assertTrue(empty.isEmpty());
-        assertEquals("{}", empty.toString());
-        Tensor emptyFromString = Tensor.from(TensorType.empty, "{}");
-        assertEquals("{}", Tensor.from(TensorType.empty, "{}").toString());
+        assertEquals("tensor(x{}):{}", empty.toString());
+        Tensor emptyFromString = Tensor.from(type, "{}");
+        assertEquals("tensor(x{}):{}", Tensor.from("tensor(x{}):{}").toString());
         TestCase.assertTrue(emptyFromString.isEmpty());
         TestCase.assertTrue(emptyFromString instanceof MappedTensor);
         assertEquals(empty, emptyFromString);
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
index e649d3cde2a..b35220cf013 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
@@ -29,8 +29,6 @@ public class TensorTestCase {
 
     @Test
     public void testStringForm() {
-        assertEquals("{}", Tensor.from("{}").toString());
-        assertTrue(Tensor.from("{}") instanceof MappedTensor);
         assertEquals("{5.7}", Tensor.from("{5.7}").toString());
         assertTrue(Tensor.from("{5.7}") instanceof IndexedTensor);
         assertEquals("{{d1:l1,d2:l1}:5.0,{d1:l1,d2:l2}:6.0}", Tensor.from("{ {d1:l1,d2:l1}: 5,   {d2:l2, d1:l1}:6.0} ").toString());