1 files changed, 6 insertions, 24 deletions
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
index 3f7f02c6c00..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;
 
 /**
@@ -23,16 +25,12 @@ public class IndexedTensorTestCase {
     @Test
     public void testEmpty() {
         Tensor empty = Tensor.Builder.of(TensorType.empty).build();
-        assertTrue(empty instanceof IndexedTensor);
-        assertTrue(empty.isEmpty());
-        assertEquals("{}", empty.toString());
+        assertEquals(1, empty.size());
+        assertEquals((double)0.0, (double)empty.valueIterator().next(), 0.00000001);
         Tensor emptyFromString = Tensor.from(TensorType.empty, "{}");
-        assertEquals("{}", Tensor.from(TensorType.empty, "{}").toString());
-        assertTrue(emptyFromString.isEmpty());
-        assertTrue(emptyFromString instanceof IndexedTensor);
         assertEquals(empty, emptyFromString);
     }
-    
+
     @Test
     public void testSingleValue() {
         Tensor singleValue = Tensor.Builder.of(TensorType.empty).cell(TensorAddress.empty, 3.5).build();
@@ -45,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)
@@ -91,7 +73,7 @@ public class IndexedTensorTestCase {
                         for (int z = 0; z < zSize; z++)
                             builder.cell(value(v, w, x, y, z), v, w, x, y, z);
 
-        IndexedTensor tensor = builder.build();
+        IndexedTensor tensor = (IndexedTensor)builder.build();
 
         // Lookup by index arguments
         for (int v = 0; v < vSize; v++)