diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-10-15 09:47:40 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-10-15 09:47:40 +0000 |
commit | 0f268db1367835ac3d748a3494ab152ac5f161b4 (patch) | |
tree | 60e0f8a0f4501158020505937dced4898c0b11b9 /searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp | |
parent | e28a07fab5f83fd06f84bee95f20f457738b7ddb (diff) |
update after review
Diffstat (limited to 'searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp')
-rw-r--r-- | searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp index 23b95f489c6..d0c356bf879 100644 --- a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp +++ b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp @@ -478,20 +478,25 @@ TEST_F(DocsumRequestTest, require_that_global_ids_are_converted) { //----------------------------------------------------------------------------- struct DocsumReplyTest : ::testing::Test { - DocsumReply reply{std::make_unique<vespalib::Slime>()}; + Slime &slime; + DocsumReply reply; Converter::ProtoDocsumReply proto; void convert() { Converter::docsum_reply_to_proto(reply, proto); } + DocsumReplyTest(std::unique_ptr<Slime> slime_in) + : slime(*slime_in), reply(std::move(slime_in)) + {} + DocsumReplyTest() : DocsumReplyTest(std::make_unique<Slime>()) {} }; TEST_F(DocsumReplyTest, require_that_slime_summaries_are_converted) { - auto &list = reply.slime().setArray(); + auto &list = slime.setArray(); auto &doc0 = list.addObject(); doc0.setLong("my_field", 42); convert(); const auto &mem = proto.slime_summaries(); - Slime slime; - EXPECT_EQ(BinaryFormat::decode(Memory(mem.data(), mem.size()), slime), mem.size()); - EXPECT_EQ(slime.get()[0]["my_field"].asLong(), 42); + Slime decoded; + EXPECT_EQ(BinaryFormat::decode(Memory(mem.data(), mem.size()), decoded), mem.size()); + EXPECT_EQ(decoded.get()[0]["my_field"].asLong(), 42); } TEST_F(DocsumReplyTest, require_that_missing_root_slime_gives_empty_payload) { @@ -501,11 +506,13 @@ TEST_F(DocsumReplyTest, require_that_missing_root_slime_gives_empty_payload) { } TEST_F(DocsumReplyTest, require_that_issues_are_converted_to_errors) { - reply.issues().handle(vespalib::Issue("a")); - reply.issues().handle(vespalib::Issue("b")); - reply.issues().handle(vespalib::Issue("c")); - reply.issues().handle(vespalib::Issue("a")); - reply.issues().handle(vespalib::Issue("b")); + auto my_issues = std::make_unique<UniqueIssues>(); + my_issues->handle(vespalib::Issue("a")); + my_issues->handle(vespalib::Issue("b")); + my_issues->handle(vespalib::Issue("c")); + my_issues->handle(vespalib::Issue("a")); + my_issues->handle(vespalib::Issue("b")); + reply.setIssues(std::move(my_issues)); convert(); ASSERT_EQ(proto.errors_size(), 3); EXPECT_EQ(proto.errors(0).message(), "a"); |