aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-11-29 08:54:31 -0800
committerJon Bratseth <bratseth@yahoo-inc.com>2016-11-29 08:54:31 -0800
commit0ac6c004fec12b4350b86f7b28f410a66ed81484 (patch)
tree1bc4330020b98558442004a93582632691e3aae2 /container-search
parent25bc15c214c613bff013de3fee6131547bdf08e6 (diff)
Fix tests
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java4
-rw-r--r--container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
index 346c51c989c..6984af2457f 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
@@ -31,14 +31,14 @@ public class RankFeaturesTestCase {
@Test
public void requireThatSingleTensorIsBinaryEncoded() {
- Tensor tensor = MapTensor.from("{ {x:a, y:b}:2.0, {z:c}:3.0 }");
+ Tensor tensor = MapTensor.from("{ {x:a, y:b, z:c}:2.0, {x:a, y:b, z:c2}:3.0 }");
assertTensorEncodingAndDecoding("query(my_tensor)", "my_tensor", tensor);
assertTensorEncodingAndDecoding("$my_tensor", "my_tensor", tensor);
}
@Test
public void requireThatMultipleTensorsAreBinaryEncoded() {
- Tensor tensor1 = MapTensor.from("{ {x:a, y:b}:2.0, {z:c}:3.0 }");
+ Tensor tensor1 = MapTensor.from("{ {x:a, y:b, z:c}:2.0, {x:a, y:b, z:c2}:3.0 }");
Tensor tensor2 = MapTensor.from("{ {x:a, y:b, z:c}:5.0 }");
assertTensorEncodingAndDecoding(Arrays.asList(
new Entry("query(tensor1)", "tensor1", tensor1),
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 1cb72b4dd65..75363074a00 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -156,8 +156,7 @@ public class JsonRendererTestCase {
+ " \"object\": \"thingie\",\n"
+ " \"string\": \"stuff\",\n"
+ " \"predicate\": \"a in [b]\",\n"
- + " \"tensor\": { \"dimensions\": [\"x\"], \n"
- + " \"cells\": [ { \"address\": {\"x\": \"a\"}, \"value\":2.0 } ] }\n"
+ + " \"tensor\": { \"cells\": [ { \"address\": {\"x\": \"a\"}, \"value\":2.0 } ] }\n"
+ " },\n"
+ " \"id\": \"datatypestuff\",\n"
+ " \"relevance\": 1.0\n"