summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2017-09-28 15:26:40 +0000
committerHåvard Pettersen <havardpe@oath.com>2017-09-29 10:16:46 +0000
commitabefb37a660e395342a1460e233a0933d2e10dc9 (patch)
tree8f7bbea42745102db5269a89e6efdbce117fc603 /searchcore
parent88a6576a3cf7b15b2bf9a4cd3bcc861e3a4f38c0 (diff)
avoid requiring that json parsing consumes all input
(the input could end with \n if human readable)
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp4
-rw-r--r--searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp2
-rw-r--r--searchcore/src/tests/proton/summaryengine/summaryengine.cpp4
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 f492dc44fc6..26b43d272aa 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -461,12 +461,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_EQUAL(buf.get().size, used);
+ EXPECT_TRUE(used);
slime = std::move(tmpSlime);
}
vespalib::Slime expSlime;
size_t used = vespalib::slime::JsonFormat::decode(exp, expSlime);
- EXPECT_EQUAL(exp.size(), used);
+ EXPECT_TRUE(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 17759e353e7..6d646bf3f4b 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_EQUAL(jsonInput.size(), used);
+ EXPECT_TRUE(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 355151dd88c..9c4ce323e1e 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_EQUAL(used, expMemory.size);
+ EXPECT_TRUE(used);
vespalib::SimpleBuffer output;
vespalib::slime::JsonFormat::encode(slime, output, true);
Slime reSlimed;
used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed);
- EXPECT_EQUAL(used, output.get().size);
+ EXPECT_TRUE(used);
EXPECT_EQUAL(expSlime, reSlimed);
}