From 6e23b120c80ba1c981fe448d5772c45ba04b58ee Mon Sep 17 00:00:00 2001 From: Bjoern Metzdorf Date: Fri, 20 Apr 2018 15:05:36 -0700 Subject: [PATCH 1/2] rename socket_option_test_harness to socket_option_test Signed-off-by: Bjoern Metzdorf --- test/common/network/BUILD | 6 +++--- test/common/network/socket_option_impl_test.cc | 4 ++-- ...{socket_option_test_harness.h => socket_option_test.h} | 4 ++-- test/server/BUILD | 2 +- test/server/listener_socket_option_impl_test.cc | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename test/common/network/{socket_option_test_harness.h => socket_option_test.h} (95%) diff --git a/test/common/network/BUILD b/test/common/network/BUILD index 322239689e3b4..c37f34ab9d36b 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -154,8 +154,8 @@ envoy_cc_test( ) envoy_cc_test_library( - name = "socket_option_test_harness", - srcs = ["socket_option_test_harness.h"], + name = "socket_option_test", + srcs = ["socket_option_test.h"], deps = [ "//source/common/network:address_lib", "//source/common/network:socket_option_lib", @@ -171,7 +171,7 @@ envoy_cc_test( name = "socket_option_impl_test", srcs = ["socket_option_impl_test.cc"], deps = [ - ":socket_option_test_harness", + ":socket_option_test", ], ) diff --git a/test/common/network/socket_option_impl_test.cc b/test/common/network/socket_option_impl_test.cc index 0abaf177ce188..214979c386bd5 100644 --- a/test/common/network/socket_option_impl_test.cc +++ b/test/common/network/socket_option_impl_test.cc @@ -1,10 +1,10 @@ -#include "test/common/network/socket_option_test_harness.h" +#include "test/common/network/socket_option_test.h" namespace Envoy { namespace Network { namespace { -class SocketOptionImplTest : public SocketOptionTestHarness {}; +class SocketOptionImplTest : public SocketOptionTest {}; // We fail to set the option if the socket FD is bad. TEST_F(SocketOptionImplTest, BadFd) { diff --git a/test/common/network/socket_option_test_harness.h b/test/common/network/socket_option_test.h similarity index 95% rename from test/common/network/socket_option_test_harness.h rename to test/common/network/socket_option_test.h index d1a724cb09960..405febb4d415c 100644 --- a/test/common/network/socket_option_test_harness.h +++ b/test/common/network/socket_option_test.h @@ -17,9 +17,9 @@ namespace Envoy { namespace Network { namespace { -class SocketOptionTestHarness : public testing::Test { +class SocketOptionTest : public testing::Test { public: - SocketOptionTestHarness() { socket_.local_address_.reset(); } + SocketOptionTest() { socket_.local_address_.reset(); } NiceMock socket_; Api::MockOsSysCalls os_sys_calls_; diff --git a/test/server/BUILD b/test/server/BUILD index 1dc049b477b06..978866ad946b6 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -152,7 +152,7 @@ envoy_cc_test( srcs = ["listener_socket_option_impl_test.cc"], deps = [ "//source/server:listener_socket_option_lib", - "//test/common/network:socket_option_test_harness", + "//test/common/network:socket_option_test", ], ) diff --git a/test/server/listener_socket_option_impl_test.cc b/test/server/listener_socket_option_impl_test.cc index df55838274d0b..322adaa924d38 100644 --- a/test/server/listener_socket_option_impl_test.cc +++ b/test/server/listener_socket_option_impl_test.cc @@ -1,17 +1,17 @@ #include "server/listener_socket_option_impl.h" -#include "test/common/network/socket_option_test_harness.h" +#include "test/common/network/socket_option_test.h" namespace Envoy { namespace Server { -class ListenerSocketOptionImplTest : public Network::SocketOptionTestHarness { +class ListenerSocketOptionImplTest : public Network::SocketOptionTest { public: void testSetSocketOptionSuccess(ListenerSocketOptionImpl& socket_option, int socket_level, Network::SocketOptionName option_name, int option_val, const std::set& when) { - Network::SocketOptionTestHarness::testSetSocketOptionSuccess(socket_option, socket_level, - option_name, option_val, when); + Network::SocketOptionTest::testSetSocketOptionSuccess(socket_option, socket_level, option_name, + option_val, when); } }; From b30e9061b75022f993111c4335f095d0367afca1 Mon Sep 17 00:00:00 2001 From: Bjoern Metzdorf Date: Fri, 20 Apr 2018 15:53:05 -0700 Subject: [PATCH 2/2] use EXPECT_THROW_WITH_MESSAGE in SetListeningSocketOptionsError test Signed-off-by: Bjoern Metzdorf --- test/common/network/listener_impl_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index e82f71d2fdcaf..13f8328cacfee 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -111,8 +111,10 @@ TEST_P(ListenerImplTest, SetListeningSocketOptionsError) { std::shared_ptr option = std::make_shared(); socket.addOption(option); EXPECT_CALL(*option, setOption(_, Socket::SocketState::Listening)).WillOnce(Return(false)); - EXPECT_THROW(TestListenerImpl(dispatcher, socket, listener_callbacks, true, false), - CreateListenerException); + EXPECT_THROW_WITH_MESSAGE(TestListenerImpl(dispatcher, socket, listener_callbacks, true, false), + CreateListenerException, + fmt::format("cannot set post-listen socket option on socket: {}", + socket.localAddress()->asString())); } TEST_P(ListenerImplTest, UseActualDst) {