diff options
Diffstat (limited to 'searchcore/src/tests')
-rw-r--r-- | searchcore/src/tests/proton/docsummary/docsummary.cpp | 4 | ||||
-rw-r--r-- | searchcore/src/tests/proton/summaryengine/summaryengine.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 1450ef5fc37..9b8e7240376 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -434,13 +434,13 @@ Test::assertSlime(const std::string &exp, const DocsumReply &reply, uint32_t id, memcpy(&classId, docsum.data.c_str(), sizeof(classId)); ASSERT_EQUAL(::search::fs4transport::SLIME_MAGIC_ID, classId); vespalib::Slime slime; - vespalib::slime::Memory serialized(docsum.data.c_str() + sizeof(classId), + vespalib::Memory serialized(docsum.data.c_str() + sizeof(classId), docsum.data.size() - sizeof(classId)); size_t decodeRes = vespalib::slime::BinaryFormat::decode(serialized, slime); ASSERT_EQUAL(decodeRes, serialized.size); if (relaxed) { - vespalib::slime::SimpleBuffer buf; + vespalib::SimpleBuffer buf; vespalib::slime::JsonFormat::encode(slime, buf, false); vespalib::Slime tmpSlime; size_t used = vespalib::slime::JsonFormat::decode(buf.get(), tmpSlime); diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index c2ece54ff1a..8cd98da51eb 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -21,6 +21,7 @@ using namespace vespalib::slime; using vespalib::stringref; using vespalib::ConstBufferRef; using vespalib::DataBuffer; +using vespalib::Memory; namespace proton { @@ -226,7 +227,7 @@ verify(vespalib::stringref exp, const Slime & slime) vespalib::Slime expSlime; size_t used = vespalib::slime::JsonFormat::decode(expMemory, expSlime); EXPECT_EQUAL(used, expMemory.size); - SimpleBuffer output; + vespalib::SimpleBuffer output; vespalib::slime::JsonFormat::encode(slime, output, true); Slime reSlimed; used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed); @@ -386,7 +387,7 @@ verifyRPC(size_t count, { Server server; vespalib::Slime slimeRequest = createSlimeRequestLarger(count); - SimpleBuffer buf; + vespalib::SimpleBuffer buf; BinaryFormat::encode(slimeRequest, buf); EXPECT_EQUAL(requestSize, buf.get().size); |