diff options
-rw-r--r-- | cast/common/mdns/mdns_receiver_unittest.cc | 12 | ||||
-rw-r--r-- | cast/common/mdns/mdns_sender_unittest.cc | 28 | ||||
-rw-r--r-- | osp/impl/quic/testing/quic_test_support.cc | 4 | ||||
-rw-r--r-- | osp/impl/quic/testing/quic_test_support.h | 6 | ||||
-rw-r--r-- | platform/BUILD.gn | 4 | ||||
-rw-r--r-- | platform/api/socket_integration_unittest.cc | 6 | ||||
-rw-r--r-- | platform/api/udp_socket_unittest.cc | 10 | ||||
-rw-r--r-- | platform/impl/network_reader_unittest.cc | 10 | ||||
-rw-r--r-- | platform/test/fake_udp_socket.cc (renamed from platform/test/mock_udp_socket.cc) | 34 | ||||
-rw-r--r-- | platform/test/fake_udp_socket.h (renamed from platform/test/mock_udp_socket.h) | 19 |
10 files changed, 66 insertions, 67 deletions
diff --git a/cast/common/mdns/mdns_receiver_unittest.cc b/cast/common/mdns/mdns_receiver_unittest.cc index f3201a3b..498ef82e 100644 --- a/cast/common/mdns/mdns_receiver_unittest.cc +++ b/cast/common/mdns/mdns_receiver_unittest.cc @@ -7,14 +7,14 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "platform/api/time.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace cast { namespace mdns { using ::testing::_; using ::testing::Return; -using MockUdpSocket = openscreen::platform::MockUdpSocket; +using FakeUdpSocket = openscreen::platform::FakeUdpSocket; class MockMdnsReceiverDelegate : public MdnsReceiver::Delegate { public: @@ -40,8 +40,8 @@ TEST(MdnsReceiverTest, ReceiveQuery) { }; // clang-format on - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); MockMdnsReceiverDelegate delegate; MdnsReceiver receiver(socket_info.get(), &delegate); receiver.Start(); @@ -92,8 +92,8 @@ TEST(MdnsReceiverTest, ReceiveResponse) { }; // clang-format on - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); MockMdnsReceiverDelegate delegate; MdnsReceiver receiver(socket_info.get(), &delegate); receiver.Start(); diff --git a/cast/common/mdns/mdns_sender_unittest.cc b/cast/common/mdns/mdns_sender_unittest.cc index 548d1155..acdb657d 100644 --- a/cast/common/mdns/mdns_sender_unittest.cc +++ b/cast/common/mdns/mdns_sender_unittest.cc @@ -6,7 +6,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace cast { namespace mdns { @@ -14,7 +14,7 @@ namespace mdns { using ::testing::_; using ::testing::Args; using ::testing::Return; -using MockUdpSocket = openscreen::platform::MockUdpSocket; +using FakeUdpSocket = openscreen::platform::FakeUdpSocket; namespace { @@ -103,8 +103,8 @@ class MdnsSenderTest : public ::testing::Test { }; TEST_F(MdnsSenderTest, SendMulticastIPv4) { - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); MdnsSender sender(socket_info.get()); socket_info->EnqueueSendResult(Error::Code::kNone); EXPECT_CALL(*socket_info->client_mock(), OnSendError(_, _)).Times(0); @@ -113,8 +113,8 @@ TEST_F(MdnsSenderTest, SendMulticastIPv4) { } TEST_F(MdnsSenderTest, SendMulticastIPv6) { - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); MdnsSender sender(socket_info.get()); socket_info->EnqueueSendResult(Error::Code::kNone); EXPECT_CALL(*socket_info->client_mock(), OnSendError(_, _)).Times(0); @@ -125,8 +125,8 @@ TEST_F(MdnsSenderTest, SendMulticastIPv6) { TEST_F(MdnsSenderTest, SendUnicastIPv4) { IPEndpoint endpoint{.address = IPAddress{192, 168, 1, 1}, .port = 31337}; - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); MdnsSender sender(socket_info.get()); socket_info->EnqueueSendResult(Error::Code::kNone); EXPECT_CALL(*socket_info->client_mock(), OnSendError(_, _)).Times(0); @@ -142,8 +142,8 @@ TEST_F(MdnsSenderTest, SendUnicastIPv6) { }; IPEndpoint endpoint{.address = IPAddress(kIPv6AddressBytes), .port = 31337}; - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV6); MdnsSender sender(socket_info.get()); socket_info->EnqueueSendResult(Error::Code::kNone); EXPECT_CALL(*socket_info->client_mock(), OnSendError(_, _)).Times(0); @@ -158,8 +158,8 @@ TEST_F(MdnsSenderTest, MessageTooBig) { big_message_.AddQuestion(a_question_); big_message_.AddAnswer(a_record_); } - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); MdnsSender sender(socket_info.get()); socket_info->EnqueueSendResult(Error::Code::kNone); EXPECT_CALL(*socket_info->client_mock(), OnSendError(_, _)).Times(0); @@ -169,8 +169,8 @@ TEST_F(MdnsSenderTest, MessageTooBig) { } TEST_F(MdnsSenderTest, ReturnsErrorOnSocketFailure) { - std::unique_ptr<openscreen::platform::MockUdpSocket> socket_info = - MockUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); + std::unique_ptr<openscreen::platform::FakeUdpSocket> socket_info = + FakeUdpSocket::CreateDefault(openscreen::IPAddress::Version::kV4); MdnsSender sender(socket_info.get()); Error error = Error(Error::Code::kConnectionFailed, "error message"); socket_info->EnqueueSendResult(error); diff --git a/osp/impl/quic/testing/quic_test_support.cc b/osp/impl/quic/testing/quic_test_support.cc index 474219c0..c1223986 100644 --- a/osp/impl/quic/testing/quic_test_support.cc +++ b/osp/impl/quic/testing/quic_test_support.cc @@ -26,7 +26,7 @@ FakeQuicBridge::FakeQuicBridge(platform::FakeTaskRunner* task_runner, auto fake_client_factory = std::make_unique<FakeClientQuicConnectionFactory>(fake_bridge.get()); - client_socket_ = std::make_unique<platform::MockUdpSocket>( + client_socket_ = std::make_unique<platform::FakeUdpSocket>( task_runner_, fake_client_factory.get()); // TODO(rwkeane): Pass actual task runner instead of nullptr once the fake @@ -37,7 +37,7 @@ FakeQuicBridge::FakeQuicBridge(platform::FakeTaskRunner* task_runner, auto fake_server_factory = std::make_unique<FakeServerQuicConnectionFactory>(fake_bridge.get()); - server_socket_ = std::make_unique<platform::MockUdpSocket>( + server_socket_ = std::make_unique<platform::FakeUdpSocket>( task_runner_, fake_server_factory.get()); ServerConfig config; config.connection_endpoints.push_back(kReceiverEndpoint); diff --git a/osp/impl/quic/testing/quic_test_support.h b/osp/impl/quic/testing/quic_test_support.h index 8a73ce9a..53ac48c3 100644 --- a/osp/impl/quic/testing/quic_test_support.h +++ b/osp/impl/quic/testing/quic_test_support.h @@ -20,7 +20,7 @@ #include "platform/base/ip_address.h" #include "platform/impl/task_runner.h" #include "platform/test/fake_clock.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace openscreen { @@ -80,8 +80,8 @@ class FakeQuicBridge { FakeServerQuicConnectionFactory* GetServerFactory(); platform::FakeTaskRunner* task_runner_; - std::unique_ptr<platform::MockUdpSocket> client_socket_; - std::unique_ptr<platform::MockUdpSocket> server_socket_; + std::unique_ptr<platform::FakeUdpSocket> client_socket_; + std::unique_ptr<platform::FakeUdpSocket> server_socket_; }; } // namespace openscreen diff --git a/platform/BUILD.gn b/platform/BUILD.gn index f89507e4..21f33bc5 100644 --- a/platform/BUILD.gn +++ b/platform/BUILD.gn @@ -100,8 +100,8 @@ source_set("test") { "test/fake_clock.h", "test/fake_task_runner.cc", "test/fake_task_runner.h", - "test/mock_udp_socket.cc", - "test/mock_udp_socket.h", + "test/fake_udp_socket.cc", + "test/fake_udp_socket.h", "test/trace_logging_helpers.h", ] diff --git a/platform/api/socket_integration_unittest.cc b/platform/api/socket_integration_unittest.cc index d7fd3ae1..a6c81575 100644 --- a/platform/api/socket_integration_unittest.cc +++ b/platform/api/socket_integration_unittest.cc @@ -6,7 +6,7 @@ #include "platform/api/time.h" #include "platform/test/fake_clock.h" #include "platform/test/fake_task_runner.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace openscreen { namespace platform { @@ -20,7 +20,7 @@ TEST(SocketIntegrationTest, ResolvesLocalEndpoint_IPv4) { const uint8_t kIpV4AddrAny[4] = {}; FakeClock clock(Clock::now()); FakeTaskRunner task_runner(&clock); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; ErrorOr<UdpSocketUniquePtr> create_result = UdpSocket::Create( &task_runner, &client, IPEndpoint{IPAddress(kIpV4AddrAny), 0}); ASSERT_TRUE(create_result) << create_result.error(); @@ -38,7 +38,7 @@ TEST(SocketIntegrationTest, ResolvesLocalEndpoint_IPv6) { const uint8_t kIpV6AddrAny[16] = {}; FakeClock clock(Clock::now()); FakeTaskRunner task_runner(&clock); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; ErrorOr<UdpSocketUniquePtr> create_result = UdpSocket::Create( &task_runner, &client, IPEndpoint{IPAddress(kIpV6AddrAny), 0}); ASSERT_TRUE(create_result) << create_result.error(); diff --git a/platform/api/udp_socket_unittest.cc b/platform/api/udp_socket_unittest.cc index c975adf6..25d33c79 100644 --- a/platform/api/udp_socket_unittest.cc +++ b/platform/api/udp_socket_unittest.cc @@ -8,7 +8,7 @@ #include "platform/api/time.h" #include "platform/test/fake_clock.h" #include "platform/test/fake_task_runner.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace openscreen { namespace platform { @@ -27,13 +27,13 @@ using testing::_; TEST(UdpSocketTest, TestDeletionWithoutCallbackSet) { FakeClock clock(Clock::now()); FakeTaskRunner task_runner(&clock); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; MockCallbacks callbacks; EXPECT_CALL(callbacks, OnCreate(_)).Times(0); EXPECT_CALL(callbacks, OnDestroy(_)).Times(0); { UdpSocket* socket = - new MockUdpSocket(&task_runner, &client, UdpSocket::Version::kV4); + new FakeUdpSocket(&task_runner, &client, UdpSocket::Version::kV4); delete socket; } } @@ -41,7 +41,7 @@ TEST(UdpSocketTest, TestDeletionWithoutCallbackSet) { TEST(UdpSocketTest, TestCallbackCalledOnDeletion) { FakeClock clock(Clock::now()); FakeTaskRunner task_runner(&clock); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; MockCallbacks callbacks; EXPECT_CALL(callbacks, OnCreate(_)).Times(1); EXPECT_CALL(callbacks, OnDestroy(_)).Times(1); @@ -49,7 +49,7 @@ TEST(UdpSocketTest, TestCallbackCalledOnDeletion) { { UdpSocket* socket = - new MockUdpSocket(&task_runner, &client, UdpSocket::Version::kV4); + new FakeUdpSocket(&task_runner, &client, UdpSocket::Version::kV4); delete socket; } diff --git a/platform/impl/network_reader_unittest.cc b/platform/impl/network_reader_unittest.cc index 185d88cf..82a6bf6f 100644 --- a/platform/impl/network_reader_unittest.cc +++ b/platform/impl/network_reader_unittest.cc @@ -10,7 +10,7 @@ #include "platform/impl/udp_socket_posix.h" #include "platform/test/fake_clock.h" #include "platform/test/fake_task_runner.h" -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace openscreen { namespace platform { @@ -97,7 +97,7 @@ TEST(NetworkReaderTest, WatchReadableSucceeds) { std::unique_ptr<NetworkWaiter>(new MockNetworkWaiter()); std::unique_ptr<TaskRunner> task_runner = std::unique_ptr<TaskRunner>(new MockTaskRunner()); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; std::unique_ptr<MockUdpSocketPosix> socket = std::make_unique<MockUdpSocketPosix>(task_runner.get(), &client, UdpSocket::Version::kV4); @@ -117,7 +117,7 @@ TEST(NetworkReaderTest, UnwatchReadableSucceeds) { std::unique_ptr<NetworkWaiter>(new MockNetworkWaiter()); std::unique_ptr<TaskRunner> task_runner = std::unique_ptr<TaskRunner>(new MockTaskRunner()); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; std::unique_ptr<MockUdpSocketPosix> socket = std::make_unique<MockUdpSocketPosix>(task_runner.get(), &client, UdpSocket::Version::kV4); @@ -179,7 +179,7 @@ TEST(NetworkReaderTest, WaitSuccessfullyCalledOnAllWatchedSockets) { std::unique_ptr<NetworkWaiter>(mock_waiter_ptr); std::unique_ptr<TaskRunner> task_runner = std::unique_ptr<TaskRunner>(new MockTaskRunner()); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; std::unique_ptr<MockUdpSocketPosix> socket = std::make_unique<MockUdpSocketPosix>(task_runner.get(), &client, UdpSocket::Version::kV4); @@ -203,7 +203,7 @@ TEST(NetworkReaderTest, WaitSuccessfulReadAndCallCallback) { std::unique_ptr<NetworkWaiter>(mock_waiter_ptr); std::unique_ptr<TaskRunner> task_runner = std::unique_ptr<TaskRunner>(task_runner_ptr); - MockUdpSocket::MockClient client; + FakeUdpSocket::MockClient client; MockUdpSocketPosix socket(task_runner.get(), &client, UdpSocket::Version::kV4); TestingNetworkWaiter network_waiter(std::move(mock_waiter)); diff --git a/platform/test/mock_udp_socket.cc b/platform/test/fake_udp_socket.cc index 8f5a703a..c8273e61 100644 --- a/platform/test/mock_udp_socket.cc +++ b/platform/test/fake_udp_socket.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "platform/test/mock_udp_socket.h" +#include "platform/test/fake_udp_socket.h" namespace openscreen { namespace platform { -MockUdpSocket::MockUdpSocket(TaskRunner* task_runner, +FakeUdpSocket::FakeUdpSocket(TaskRunner* task_runner, Client* client, Version version) : UdpSocket(task_runner, client), client_(client), version_(version) {} // Ensure that the destructors for the unique_ptr objects are called in // the correct order to avoid OSP_CHECK failures. -MockUdpSocket::~MockUdpSocket() { +FakeUdpSocket::~FakeUdpSocket() { CloseIfOpen(); fake_task_runner_.reset(); @@ -22,43 +22,43 @@ MockUdpSocket::~MockUdpSocket() { fake_client_.reset(); } -bool MockUdpSocket::IsIPv4() const { +bool FakeUdpSocket::IsIPv4() const { return version_ == UdpSocket::Version::kV4; } -bool MockUdpSocket::IsIPv6() const { +bool FakeUdpSocket::IsIPv6() const { return version_ == UdpSocket::Version::kV6; } -IPEndpoint MockUdpSocket::GetLocalEndpoint() const { +IPEndpoint FakeUdpSocket::GetLocalEndpoint() const { return IPEndpoint{}; } -void MockUdpSocket::Bind() { +void FakeUdpSocket::Bind() { OSP_CHECK(bind_errors_.size()) << "No Bind responses queued."; ProcessConfigurationMethod(&bind_errors_); } -void MockUdpSocket::SetMulticastOutboundInterface( +void FakeUdpSocket::SetMulticastOutboundInterface( NetworkInterfaceIndex interface) { OSP_CHECK(set_multicast_outbound_interface_errors_.size()) << "No SetMulticastOutboundInterface responses queued."; ProcessConfigurationMethod(&set_multicast_outbound_interface_errors_); } -void MockUdpSocket::JoinMulticastGroup(const IPAddress& address, +void FakeUdpSocket::JoinMulticastGroup(const IPAddress& address, NetworkInterfaceIndex interface) { OSP_CHECK(join_multicast_group_errors_.size()) << "No JoinMulticastGroup responses queued."; ProcessConfigurationMethod(&join_multicast_group_errors_); } -void MockUdpSocket::SetDscp(DscpMode mode) { +void FakeUdpSocket::SetDscp(DscpMode mode) { OSP_CHECK(set_dscp_errors_.size()) << "No SetDscp responses queued."; ProcessConfigurationMethod(&set_dscp_errors_); } -void MockUdpSocket::ProcessConfigurationMethod(std::queue<Error>* errors) { +void FakeUdpSocket::ProcessConfigurationMethod(std::queue<Error>* errors) { Error error = errors->front(); errors->pop(); @@ -67,7 +67,7 @@ void MockUdpSocket::ProcessConfigurationMethod(std::queue<Error>* errors) { } } -void MockUdpSocket::SendMessage(const void* data, +void FakeUdpSocket::SendMessage(const void* data, size_t length, const IPEndpoint& dest) { OSP_CHECK(send_errors_.size()) << "No SendMessage responses queued."; @@ -80,16 +80,16 @@ void MockUdpSocket::SendMessage(const void* data, } // static -std::unique_ptr<MockUdpSocket> MockUdpSocket::CreateDefault( +std::unique_ptr<FakeUdpSocket> FakeUdpSocket::CreateDefault( UdpSocket::Version version) { std::unique_ptr<FakeClock> clock = std::make_unique<FakeClock>(Clock::now()); std::unique_ptr<FakeTaskRunner> task_runner = std::make_unique<FakeTaskRunner>(clock.get()); - std::unique_ptr<MockUdpSocket::MockClient> client = - std::make_unique<MockUdpSocket::MockClient>(); + std::unique_ptr<FakeUdpSocket::MockClient> client = + std::make_unique<FakeUdpSocket::MockClient>(); - std::unique_ptr<MockUdpSocket> socket = - std::make_unique<MockUdpSocket>(task_runner.get(), client.get(), version); + std::unique_ptr<FakeUdpSocket> socket = + std::make_unique<FakeUdpSocket>(task_runner.get(), client.get(), version); socket->fake_clock_.swap(clock); socket->fake_client_.swap(client); socket->fake_task_runner_.swap(task_runner); diff --git a/platform/test/mock_udp_socket.h b/platform/test/fake_udp_socket.h index 0f95a2c5..cdc253d5 100644 --- a/platform/test/mock_udp_socket.h +++ b/platform/test/fake_udp_socket.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PLATFORM_TEST_MOCK_UDP_SOCKET_H_ -#define PLATFORM_TEST_MOCK_UDP_SOCKET_H_ +#ifndef PLATFORM_TEST_FAKE_UDP_SOCKET_H_ +#define PLATFORM_TEST_FAKE_UDP_SOCKET_H_ #include <algorithm> #include <memory> @@ -19,8 +19,7 @@ namespace openscreen { namespace platform { -// TODO(rwkeane): Rename this class to "FakeUdpSocket". -class MockUdpSocket : public UdpSocket { +class FakeUdpSocket : public UdpSocket { public: class MockClient : public UdpSocket::Client { public: @@ -33,13 +32,13 @@ class MockUdpSocket : public UdpSocket { } }; - static std::unique_ptr<MockUdpSocket> CreateDefault( + static std::unique_ptr<FakeUdpSocket> CreateDefault( Version version = Version::kV4); - MockUdpSocket(TaskRunner* task_runner, + FakeUdpSocket(TaskRunner* task_runner, Client* client, Version version = Version::kV4); - ~MockUdpSocket() override; + ~FakeUdpSocket() override; bool IsIPv4() const override; bool IsIPv6() const override; @@ -80,7 +79,7 @@ class MockUdpSocket : public UdpSocket { // Posts a task to call client_'s OnRead method void MockReceivePacket(UdpPacket packet) { OnRead(std::move(packet)); } - MockUdpSocket::MockClient* client_mock() { return fake_client_.get(); } + FakeUdpSocket::MockClient* client_mock() { return fake_client_.get(); } private: void ProcessConfigurationMethod(std::queue<Error>* errors); @@ -99,11 +98,11 @@ class MockUdpSocket : public UdpSocket { // Fake implementations to be set by CreateDefault(). std::unique_ptr<FakeTaskRunner> fake_task_runner_; - std::unique_ptr<MockUdpSocket::MockClient> fake_client_; + std::unique_ptr<FakeUdpSocket::MockClient> fake_client_; std::unique_ptr<FakeClock> fake_clock_; }; } // namespace platform } // namespace openscreen -#endif // PLATFORM_TEST_MOCK_UDP_SOCKET_H_ +#endif // PLATFORM_TEST_FAKE_UDP_SOCKET_H_ |