Skip to content

Commit 54b2502

Browse files
committed
[tests] Refactor repeated mocking for daemon RPC
1 parent 420e217 commit 54b2502

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

Diff for: tests/unix/test_daemon_rpc.cpp

+13-18
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@ struct TestDaemonRpc : public mpt::DaemonTestFixture
7979
return mpt::MockDaemon(config_builder.build());
8080
}
8181

82+
void mock_empty_list_reply(mpt::MockDaemon& mock_daemon)
83+
{
84+
EXPECT_CALL(mock_daemon, list(_, _, _)).WillOnce([](auto, auto* server, auto* status_promise) {
85+
mp::ListReply reply;
86+
reply.mutable_instance_list();
87+
server->Write(reply);
88+
status_promise->set_value(grpc::Status::OK);
89+
});
90+
}
91+
8292
std::unique_ptr<mpt::MockCertProvider> mock_cert_provider{std::make_unique<mpt::MockCertProvider>()};
8393
std::unique_ptr<mpt::MockCertStore> mock_cert_store{std::make_unique<mpt::MockCertStore>()};
8494

@@ -202,12 +212,7 @@ TEST_F(TestDaemonRpc, listCertExistsCompletesSuccesfully)
202212
EXPECT_CALL(*mock_cert_store, verify_cert(StrEq(mpt::client_cert))).WillOnce(Return(true));
203213

204214
mpt::MockDaemon daemon{make_secure_server()};
205-
EXPECT_CALL(daemon, list(_, _, _)).WillOnce([](auto, auto* server, auto* status_promise) {
206-
mp::ListReply reply;
207-
reply.mutable_instance_list();
208-
server->Write(reply);
209-
status_promise->set_value(grpc::Status::OK);
210-
});
215+
mock_empty_list_reply(daemon);
211216

212217
send_command({"list"});
213218
}
@@ -221,12 +226,7 @@ TEST_F(TestDaemonRpc, listNoCertsExistWillVerifyAndComplete)
221226
EXPECT_CALL(*mock_cert_store, add_cert(StrEq(mpt::client_cert))).Times(1);
222227

223228
mpt::MockDaemon daemon{make_secure_server()};
224-
EXPECT_CALL(daemon, list(_, _, _)).WillOnce([](auto, auto* server, auto* status_promise) {
225-
mp::ListReply reply;
226-
reply.mutable_instance_list();
227-
server->Write(reply);
228-
status_promise->set_value(grpc::Status::OK);
229-
});
229+
mock_empty_list_reply(daemon);
230230

231231
send_command({"list"});
232232
}
@@ -308,12 +308,7 @@ TEST_F(TestDaemonRpc, listSettingServerPermissionsFailLogsErrorAndExits)
308308
logger_scope.mock_logger->expect_log(mpl::Level::error, error_msg);
309309
logger_scope.mock_logger->expect_log(mpl::Level::error, "Failed to set up autostart prerequisites", AnyNumber());
310310

311-
EXPECT_CALL(daemon, list(_, _, _)).WillOnce([](auto, auto* server, auto* status_promise) {
312-
mp::ListReply reply;
313-
reply.mutable_instance_list();
314-
server->Write(reply);
315-
status_promise->set_value(grpc::Status::OK);
316-
});
311+
mock_empty_list_reply(daemon);
317312

318313
send_command({"list"});
319314
}

0 commit comments

Comments
 (0)