Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
KEP-1424 cleanup mock class naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebruck
ebruck committed May 20, 2019
1 parent 3ed5a4e commit 446ee78
Show file tree
Hide file tree
Showing 29 changed files with 340 additions and 340 deletions.
8 changes: 4 additions & 4 deletions audit/test/audit_test.cpp
View file
Expand Up @@ -24,11 +24,11 @@ using namespace ::testing;
class audit_test : public Test
{
public:
std::shared_ptr<bzn::asio::Mockio_context_base> mock_io_context = std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>();
std::shared_ptr<bzn::Mocknode_base> mock_node = std::make_shared<NiceMock<bzn::Mocknode_base>>();
std::shared_ptr<bzn::asio::mock_io_context_base> mock_io_context = std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>();
std::shared_ptr<bzn::mock_node_base> mock_node = std::make_shared<NiceMock<bzn::mock_node_base>>();

std::unique_ptr<bzn::asio::Mocksteady_timer_base> primary_alive_timer =
std::make_unique<NiceMock<bzn::asio::Mocksteady_timer_base>>();
std::unique_ptr<bzn::asio::mock_steady_timer_base> primary_alive_timer =
std::make_unique<NiceMock<bzn::asio::mock_steady_timer_base>>();

bzn::asio::wait_handler primary_alive_timer_callback;

Expand Down
10 changes: 5 additions & 5 deletions chaos/test/chaos_test.cpp
View file
Expand Up @@ -23,12 +23,12 @@ class chaos_test : public Test
{
public:
std::shared_ptr<bzn::options> options;
std::shared_ptr<bzn::asio::Mockio_context_base> mock_io_context = std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>();
std::shared_ptr<bzn::asio::mock_io_context_base> mock_io_context = std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>();

std::unique_ptr<bzn::asio::Mocksteady_timer_base> node_crash_timer =
std::make_unique<NiceMock<bzn::asio::Mocksteady_timer_base>>();
std::unique_ptr<bzn::asio::Mocksteady_timer_base> second_timer =
std::make_unique<NiceMock<bzn::asio::Mocksteady_timer_base>>();
std::unique_ptr<bzn::asio::mock_steady_timer_base> node_crash_timer =
std::make_unique<NiceMock<bzn::asio::mock_steady_timer_base>>();
std::unique_ptr<bzn::asio::mock_steady_timer_base> second_timer =
std::make_unique<NiceMock<bzn::asio::mock_steady_timer_base>>();

bzn::asio::wait_handler node_crash_handler;
bzn::asio::wait_handler second_timer_handler;
Expand Down
426 changes: 213 additions & 213 deletions crud/test/crud_test.cpp
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions crud/test/subscription_manager_test.cpp
View file
Expand Up @@ -30,15 +30,15 @@ namespace

TEST(subscription_manager, test_that_session_can_subscribe_and_unsubscribe_for_updates)
{
auto mock_session1 = std::make_shared<bzn::Mocksession_base>();
auto mock_session2 = std::make_shared<bzn::Mocksession_base>();
auto mock_session3 = std::make_shared<bzn::Mocksession_base>();
auto mock_session1 = std::make_shared<bzn::mock_session_base>();
auto mock_session2 = std::make_shared<bzn::mock_session_base>();
auto mock_session3 = std::make_shared<bzn::mock_session_base>();

EXPECT_CALL(*mock_session1, get_session_id()).WillRepeatedly(Return(bzn::session_id(1)));
EXPECT_CALL(*mock_session2, get_session_id()).WillRepeatedly(Return(bzn::session_id(2)));
EXPECT_CALL(*mock_session3, get_session_id()).WillRepeatedly(Return(bzn::session_id(3)));

bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>());
bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>());

// two subscribers...
{
Expand Down Expand Up @@ -138,13 +138,13 @@ TEST(subscription_manager, test_that_session_can_subscribe_and_unsubscribe_for_u

TEST(subscription_manager, test_that_session_cannot_unsubscribe_other_sessions)
{
auto mock_session1 = std::make_shared<bzn::Mocksession_base>();
auto mock_session2 = std::make_shared<bzn::Mocksession_base>();
auto mock_session1 = std::make_shared<bzn::mock_session_base>();
auto mock_session2 = std::make_shared<bzn::mock_session_base>();

EXPECT_CALL(*mock_session1, get_session_id()).WillRepeatedly(Return(bzn::session_id(1)));
EXPECT_CALL(*mock_session2, get_session_id()).WillRepeatedly(Return(bzn::session_id(2)));

bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>());
bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>());

// two subscribers...
{
Expand All @@ -165,13 +165,13 @@ TEST(subscription_manager, test_that_session_cannot_unsubscribe_other_sessions)

TEST(subscription_manager, test_that_subscriber_is_notified_for_create_and_updates)
{
auto mock_session1 = std::make_shared<bzn::Mocksession_base>();
auto mock_session2 = std::make_shared<bzn::Mocksession_base>();
auto mock_session1 = std::make_shared<bzn::mock_session_base>();
auto mock_session2 = std::make_shared<bzn::mock_session_base>();

EXPECT_CALL(*mock_session1, get_session_id()).WillRepeatedly(Return(bzn::session_id(1)));
EXPECT_CALL(*mock_session2, get_session_id()).WillRepeatedly(Return(bzn::session_id(2)));

bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>());
bzn::subscription_manager sm(std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>());

database_response response;
sm.subscribe(TEST_UUID, "0", 0, response, mock_session1);
Expand Down Expand Up @@ -303,8 +303,8 @@ TEST(subscription_manager, test_that_subscriber_is_notified_for_create_and_updat

TEST(subscription_manager, test_that_dead_session_is_removed_from_subscriber_list)
{
auto mock_io_context = std::make_shared<bzn::asio::Mockio_context_base>();
auto mock_steady_timer = std::make_unique<bzn::asio::Mocksteady_timer_base>();
auto mock_io_context = std::make_shared<bzn::asio::mock_io_context_base>();
auto mock_steady_timer = std::make_unique<bzn::asio::mock_steady_timer_base>();

EXPECT_CALL(*mock_steady_timer, expires_from_now(_)).Times(2);

Expand All @@ -325,8 +325,8 @@ TEST(subscription_manager, test_that_dead_session_is_removed_from_subscriber_lis

sm->start();

auto mock_session1 = std::make_shared<bzn::Mocksession_base>();
auto mock_session2 = std::make_shared<bzn::Mocksession_base>();
auto mock_session1 = std::make_shared<bzn::mock_session_base>();
auto mock_session2 = std::make_shared<bzn::mock_session_base>();

EXPECT_CALL(*mock_session1, get_session_id()).WillRepeatedly(Return(bzn::session_id(1)));
EXPECT_CALL(*mock_session2, get_session_id()).WillRepeatedly(Return(bzn::session_id(2)));
Expand Down
18 changes: 9 additions & 9 deletions mocks/mock_boost_asio_beast.hpp
View file
Expand Up @@ -22,7 +22,7 @@

namespace bzn::asio {

class Mocktcp_socket_base : public tcp_socket_base {
class mock_tcp_socket_base : public tcp_socket_base {
public:
MOCK_METHOD0(get_tcp_socket,
boost::asio::ip::tcp::socket&());
Expand All @@ -37,7 +37,7 @@ namespace bzn::asio {

namespace bzn::asio {

class Mockudp_socket_base : public udp_socket_base {
class mock_udp_socket_base : public udp_socket_base {
public:
MOCK_METHOD3(async_send_to, void(const boost::asio::const_buffer& msg,
boost::asio::ip::udp::endpoint ep,
Expand All @@ -49,7 +49,7 @@ namespace bzn::asio {

namespace bzn::asio {

class Mocktcp_acceptor_base : public tcp_acceptor_base {
class mock_tcp_acceptor_base : public tcp_acceptor_base {
public:
MOCK_METHOD2(async_accept,
void(bzn::asio::tcp_socket_base& socket, bzn::asio::accept_handler handler));
Expand All @@ -62,7 +62,7 @@ namespace bzn::asio {

namespace bzn::asio {

class Mocksteady_timer_base : public steady_timer_base {
class mock_steady_timer_base : public steady_timer_base {
public:
MOCK_METHOD1(async_wait,
void(wait_handler handler));
Expand All @@ -79,7 +79,7 @@ namespace bzn::asio {

namespace bzn::asio {

class Mockstrand_base : public strand_base {
class mock_strand_base : public strand_base {
public:
MOCK_METHOD1(wrap,
bzn::asio::write_handler(write_handler handler));
Expand All @@ -98,7 +98,7 @@ namespace bzn::asio {

namespace bzn::asio {

class Mockio_context_base : public io_context_base {
class mock_io_context_base : public io_context_base {
public:
MOCK_METHOD1(make_unique_tcp_acceptor,
std::unique_ptr<bzn::asio::tcp_acceptor_base>(const boost::asio::ip::tcp::endpoint& ep));
Expand Down Expand Up @@ -127,7 +127,7 @@ namespace bzn::asio {

namespace bzn::beast {

class Mockhttp_socket_base : public http_socket_base {
class mock_http_socket_base : public http_socket_base {
public:
MOCK_METHOD0(get_socket,
boost::asio::ip::tcp::socket&());
Expand All @@ -144,7 +144,7 @@ namespace bzn::beast {

namespace bzn::beast {

class Mockwebsocket_stream_base : public websocket_stream_base {
class mock_websocket_stream_base : public websocket_stream_base {
public:
MOCK_METHOD0(get_websocket,
boost::beast::websocket::stream<boost::asio::ip::tcp::socket>&());
Expand All @@ -171,7 +171,7 @@ namespace bzn::beast {

namespace bzn::beast {

class Mockwebsocket_base : public websocket_base {
class mock_websocket_base : public websocket_base {
public:
MOCK_METHOD1(make_unique_websocket_stream,
std::unique_ptr<bzn::beast::websocket_stream_base>(boost::asio::ip::tcp::socket& socket));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_crud_base.hpp
View file
Expand Up @@ -19,7 +19,7 @@

namespace bzn {

class Mockcrud_base : public crud_base {
class mock_crud_base : public crud_base {
public:
MOCK_METHOD3(handle_request,
void(const bzn::caller_id_t& caller_id, const database_msg& request, std::shared_ptr<bzn::session_base> session));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_crypto_base.hpp
View file
Expand Up @@ -19,7 +19,7 @@

namespace bzn
{
class Mockcrypto_base : public crypto_base
class mock_crypto_base : public crypto_base
{
public:
MOCK_METHOD1(sign, bool(bzn_envelope& msg));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_node_base.hpp
View file
Expand Up @@ -22,7 +22,7 @@

namespace bzn {

class Mocknode_base : public node_base {
class mock_node_base : public node_base {
public:
MOCK_METHOD2(register_for_message,
bool(const bzn_envelope::PayloadCase msg_type, bzn::protobuf_handler message_handler));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_pbft_base.hpp
View file
Expand Up @@ -22,7 +22,7 @@

namespace bzn {

class Mockpbft_base : public pbft_base {
class mock_pbft_base : public pbft_base {
public:
MOCK_METHOD0(start,
void());
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_pbft_failure_detector.hpp
View file
Expand Up @@ -20,7 +20,7 @@

namespace bzn
{
class Mockpbft_failure_detector_base : public pbft_failure_detector_base
class mock_pbft_failure_detector_base : public pbft_failure_detector_base
{
public:
MOCK_METHOD1(request_seen, void(const bzn::hash_t& req));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_session_base.hpp
View file
Expand Up @@ -21,7 +21,7 @@
// gmock_gen.py generated...

namespace bzn {
class Mocksession_base : public session_base {
class mock_session_base : public session_base {
public:
MOCK_METHOD1(send_message,
void(std::shared_ptr<bzn::encoded_message> msg));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_status_provider_base.hpp
View file
Expand Up @@ -22,7 +22,7 @@

namespace bzn {

class Mockstatus_provider_base : public status_provider_base {
class mock_status_provider_base : public status_provider_base {
public:
MOCK_METHOD0(get_name,
std::string());
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_storage_base.hpp
View file
Expand Up @@ -19,7 +19,7 @@

namespace bzn {

class Mockstorage_base : public storage_base {
class mock_storage_base : public storage_base {
public:
MOCK_METHOD3(create,
bzn::storage_result(const bzn::uuid_t& uuid, const std::string& key, const std::string& value));
Expand Down
2 changes: 1 addition & 1 deletion mocks/mock_subscription_manager_base.hpp
View file
Expand Up @@ -19,7 +19,7 @@

namespace bzn {

class Mocksubscription_manager_base : public subscription_manager_base {
class mock_subscription_manager_base : public subscription_manager_base {
public:
MOCK_METHOD0(start,
void());
Expand Down
10 changes: 5 additions & 5 deletions mocks/smart_mock_io.cpp
View file
Expand Up @@ -23,7 +23,7 @@ bzn::asio::smart_mock_io::smart_mock_io()
EXPECT_CALL(*this, make_unique_strand()).WillRepeatedly(Invoke(
[&]()
{
auto strand = std::make_unique<bzn::asio::Mockstrand_base>();
auto strand = std::make_unique<bzn::asio::mock_strand_base>();
EXPECT_CALL(*strand, wrap(A<bzn::asio::close_handler>())).WillRepeatedly(ReturnArg<0>());
EXPECT_CALL(*strand, wrap(A<bzn::asio::read_handler>())).WillRepeatedly(ReturnArg<0>());
EXPECT_CALL(*strand, wrap(A<bzn::asio::task>())).WillRepeatedly(ReturnArg<0>());
Expand All @@ -47,7 +47,7 @@ bzn::asio::smart_mock_io::smart_mock_io()
{
auto id = timer_count++;

auto timer = std::make_unique<bzn::asio::Mocksteady_timer_base>();
auto timer = std::make_unique<bzn::asio::mock_steady_timer_base>();
EXPECT_CALL(*timer, async_wait(_)).WillRepeatedly(Invoke(
[&, id](auto wh)
{
Expand All @@ -68,7 +68,7 @@ bzn::asio::smart_mock_io::smart_mock_io()
{
auto id = socket_count++;

auto mock_socket = std::make_unique<bzn::asio::Mocktcp_socket_base>();
auto mock_socket = std::make_unique<bzn::asio::mock_tcp_socket_base>();

static boost::asio::io_context io;
static boost::asio::ip::tcp::socket socket(io);
Expand All @@ -90,7 +90,7 @@ bzn::asio::smart_mock_io::smart_mock_io()
EXPECT_CALL(*this, make_unique_tcp_acceptor(_)).Times(AtMost(1)).WillOnce(Invoke(
[&](auto& /*ep*/)
{
auto mock_acceptor = std::make_unique<bzn::asio::Mocktcp_acceptor_base>();
auto mock_acceptor = std::make_unique<bzn::asio::mock_tcp_acceptor_base>();

EXPECT_CALL(*mock_acceptor, async_accept(_, _)).WillRepeatedly(Invoke(
[&](auto& socket, auto handler)
Expand All @@ -107,7 +107,7 @@ bzn::asio::smart_mock_io::smart_mock_io()
{
auto id = this->socket_id_map.at(socket.native_handle());
this->socket_is_open.insert_or_assign(id, true);
auto wss = std::make_unique<bzn::beast::Mockwebsocket_stream_base>();
auto wss = std::make_unique<bzn::beast::mock_websocket_stream_base>();

EXPECT_CALL(*wss, async_accept(_)).Times(AtMost(1)).WillOnce(Invoke(
[&, id](auto handler)
Expand Down
4 changes: 2 additions & 2 deletions mocks/smart_mock_io.hpp
View file
Expand Up @@ -17,7 +17,7 @@

namespace bzn::asio
{
class smart_mock_io : public Mockio_context_base
class smart_mock_io : public mock_io_context_base
{
public:

Expand All @@ -28,7 +28,7 @@ namespace bzn::asio
void yield_until_clear();

std::shared_ptr<bzn::asio::io_context_base> real_io_context = std::make_shared<bzn::asio::io_context>();
std::shared_ptr<bzn::beast::Mockwebsocket_base> websocket = std::make_shared<bzn::beast::Mockwebsocket_base>();
std::shared_ptr<bzn::beast::mock_websocket_base> websocket = std::make_shared<bzn::beast::mock_websocket_base>();

size_t timer_count = 0;
std::map<size_t, bzn::asio::wait_handler> timer_callbacks;
Expand Down
2 changes: 1 addition & 1 deletion mocks/smart_mock_node.hpp
View file
Expand Up @@ -19,7 +19,7 @@

namespace bzn
{
class smart_mock_node : public Mocknode_base
class smart_mock_node : public mock_node_base
{
public:
smart_mock_node();
Expand Down
6 changes: 3 additions & 3 deletions monitor/test/monitor_test.cpp
View file
Expand Up @@ -29,7 +29,7 @@ using namespace ::testing;
class monitor_test : public Test
{
public:
std::shared_ptr<bzn::asio::Mockio_context_base> io_context = std::make_shared<bzn::asio::Mockio_context_base>();
std::shared_ptr<bzn::asio::mock_io_context_base> io_context = std::make_shared<bzn::asio::mock_io_context_base>();
std::shared_ptr<bzn::mock_system_clock> clock = std::make_shared<bzn::mock_system_clock>();
std::shared_ptr<bzn::mock_options_base> options = std::make_shared<bzn::mock_options_base>();
std::shared_ptr<bzn::monitor> monitor;
Expand Down Expand Up @@ -65,7 +65,7 @@ class monitor_test : public Test
EXPECT_CALL(*(this->io_context), make_unique_udp_socket()).WillRepeatedly(Invoke(
[&]()
{
auto socket = std::make_unique<bzn::asio::Mockudp_socket_base>();
auto socket = std::make_unique<bzn::asio::mock_udp_socket_base>();
EXPECT_CALL(*socket, async_send_to(_, _, _)).WillRepeatedly(Invoke(
[&](auto buffer, auto /*endpoint*/, auto handler)
{
Expand Down Expand Up @@ -245,4 +245,4 @@ TEST_F(monitor_test, test_collate_all_messages_sent)
EXPECT_NE(result.find(4000), result.end());
EXPECT_NE(result.at(4000).find("hash"), std::string::npos);

}
}
6 changes: 3 additions & 3 deletions node/test/node_test.cpp
View file
Expand Up @@ -161,7 +161,7 @@ namespace bzn
TEST(node, test_that_registering_message_handler_can_only_be_done_once)
{
auto mock_chaos = std::make_shared<NiceMock<bzn::mock_chaos_base>>();
auto mock_io_context = std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>();
auto mock_io_context = std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>();
auto options = std::shared_ptr<bzn::options>();
auto crypto = std::shared_ptr<bzn::crypto>();
auto monitor = std::make_shared<NiceMock<bzn::mock_monitor>>();
Expand All @@ -180,12 +180,12 @@ namespace bzn
TEST(node, test_that_wrongly_signed_messages_are_dropped)
{
auto mock_chaos = std::make_shared<NiceMock<bzn::mock_chaos_base>>();
auto mock_io_context = std::make_shared<NiceMock<bzn::asio::Mockio_context_base>>();
auto mock_io_context = std::make_shared<NiceMock<bzn::asio::mock_io_context_base>>();
auto options = std::make_shared<bzn::options>();
options->get_mutable_simple_options().set(bzn::option_names::CRYPTO_ENABLED_INCOMING, "true");
auto monitor = std::make_shared<NiceMock<bzn::mock_monitor>>();
auto crypto = std::make_shared<bzn::crypto>(options, monitor);
auto mock_session = std::make_shared<bzn::Mocksession_base>();
auto mock_session = std::make_shared<bzn::mock_session_base>();
auto node = std::make_shared<bzn::node>(mock_io_context, nullptr, mock_chaos, TEST_ENDPOINT, crypto, options, monitor);

// Add our test callback...
Expand Down

0 comments on commit 446ee78

Please sign in to comment.