update after review

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");