diff options
author | Arnstein Ressem <aressem@gmail.com> | 2017-10-02 14:51:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-02 14:51:12 +0200 |
commit | 4a46361afd24f614291a83a3d0cad02e57754040 (patch) | |
tree | f9ef525845c92cc9fe713db2d818a70261b65660 /searchcore/src/tests/proton | |
parent | 745ebb77abd4c51bcf3b9a38f162f3c6258012f7 (diff) |
Revert "Havardpe/avoid reading past json value in slime json parser"
Diffstat (limited to 'searchcore/src/tests/proton')
3 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index aff27959ec9..97a96c4bac6 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -443,12 +443,12 @@ Test::assertSlime(const std::string &exp, const DocsumReply &reply, uint32_t id, vespalib::slime::JsonFormat::encode(slime, buf, false); vespalib::Slime tmpSlime; size_t used = vespalib::slime::JsonFormat::decode(buf.get(), tmpSlime); - EXPECT_TRUE(used > 0); + EXPECT_EQUAL(buf.get().size, used); slime = std::move(tmpSlime); } vespalib::Slime expSlime; size_t used = vespalib::slime::JsonFormat::decode(exp, expSlime); - EXPECT_TRUE(used > 0); + EXPECT_EQUAL(exp.size(), used); return EXPECT_EQUAL(expSlime, slime); } diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp index 2d0ff39efa4..17759e353e7 100644 --- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp +++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp @@ -119,7 +119,7 @@ FieldBlock::FieldBlock(const vespalib::string &jsonInput) : input(jsonInput), slime(), binary(1024), json() { size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime); - EXPECT_TRUE(used > 0); + EXPECT_EQUAL(jsonInput.size(), used); { search::SlimeOutputRawBufAdapter adapter(binary); vespalib::slime::JsonFormat::encode(slime, adapter, true); diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index db707e4aa97..355151dd88c 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -213,12 +213,12 @@ verify(vespalib::stringref exp, const Slime &slime) { Memory expMemory(exp); vespalib::Slime expSlime; size_t used = vespalib::slime::JsonFormat::decode(expMemory, expSlime); - EXPECT_TRUE(used > 0); + EXPECT_EQUAL(used, expMemory.size); vespalib::SimpleBuffer output; vespalib::slime::JsonFormat::encode(slime, output, true); Slime reSlimed; used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed); - EXPECT_TRUE(used > 0); + EXPECT_EQUAL(used, output.get().size); EXPECT_EQUAL(expSlime, reSlimed); } |