diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2016-11-25 18:21:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 18:21:25 +0100 |
| commit | 11b208db7d2422828c90aafa638f059306acbc24 (patch) | |
| tree | 63d3f766b7a046b13b2b4fdc8e633fe71134847c /document | |
| parent | 5400980ea6bbac6ef385d089b5e9f9b100ecae71 (diff) | |
Revert "Bratseth/tensor functions 3"
Diffstat (limited to 'document')
| -rw-r--r-- | document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index 64bb538eab5..206ab8e30f0 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -1049,7 +1049,7 @@ public class JsonReaderTestCase { @Test public void testParsingOfTensorWithDimensions() { - assertTensorField("tensor(x{},y{}):{}", + assertTensorField("( {{x:-,y:-}:1.0} * {} )", createPutWithTensor("{ " + " \"dimensions\": [\"x\",\"y\"] " + "}")); @@ -1101,7 +1101,7 @@ public class JsonReaderTestCase { @Test public void testParsingOfTensorWithDimensionsAndCells() { - assertTensorField("tensor(x{},y{},z{}):{{x:a,y:b}:2.0,{x:c}:3.0}", + assertTensorField("( {{z:-}:1.0} * {{x:a,y:b}:2.0,{x:c}:3.0} )", createPutWithTensor("{ " + " \"dimensions\": [\"x\",\"y\",\"z\"], " + " \"cells\": [ " @@ -1115,7 +1115,7 @@ public class JsonReaderTestCase { @Test public void testParsingOfTensorWithDimensionsAndCellsInDifferentJsonOrder() { - assertTensorField("tensor(x{},y{},z{}):{{x:a,y:b}:2.0,{x:c}:3.0}", + assertTensorField("( {{z:-}:1.0} * {{x:a,y:b}:2.0,{x:c}:3.0} )", createPutWithTensor("{ " + " \"cells\": [ " + " { \"address\": { \"x\": \"a\", \"y\": \"b\" }, " |