aboutsummaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-10-02 14:51:12 +0200
committerGitHub <noreply@github.com>2017-10-02 14:51:12 +0200
commit4a46361afd24f614291a83a3d0cad02e57754040 (patch)
treef9ef525845c92cc9fe713db2d818a70261b65660 /eval
parent745ebb77abd4c51bcf3b9a38f162f3c6258012f7 (diff)
Revert "Havardpe/avoid reading past json value in slime json parser"
Diffstat (limited to 'eval')
-rw-r--r--eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp4
-rw-r--r--eval/src/vespa/eval/eval/test/tensor_conformance.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
index e6e6c7de686..916b6ad4462 100644
--- a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
+++ b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
@@ -35,7 +35,7 @@ struct Fixture
vespalib::Memory memory_exp(exp);
vespalib::Slime expSlime;
size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime);
- EXPECT_TRUE(used > 0);
+ EXPECT_EQUAL(used, memory_exp.size);
EXPECT_EQUAL(expSlime, *slime);
}
};
@@ -135,7 +135,7 @@ struct DenseFixture
vespalib::Memory memory_exp(exp);
vespalib::Slime expSlime;
size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime);
- EXPECT_TRUE(used > 0);
+ EXPECT_EQUAL(used, memory_exp.size);
EXPECT_EQUAL(expSlime, *slime);
}
};
diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
index bd8bdf8cd11..4e321083252 100644
--- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
+++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
@@ -1267,7 +1267,7 @@ struct TestContext {
MappedFileInput file(path);
Slime slime;
EXPECT_TRUE(file.valid());
- EXPECT_TRUE(JsonFormat::decode(file, slime) > 0);
+ EXPECT_EQUAL(JsonFormat::decode(file, slime), file.get().size);
int64_t num_tests = slime.get()["num_tests"].asLong();
Cursor &tests = slime.get()["tests"];
EXPECT_GREATER(num_tests, 0u);