zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In p2p/ replace mock macros with unified MOCK_METHOD macro

Browse Source 
Bug: webrtc:11564
Change-Id: I8da8eb4e2fc1613018b9df5c8f3dacb281107a4a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175907
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31339}
This commit is contained in:
Danil Chapovalov
2020-05-25 09:36:40 +02:00
committed by Commit Bot
parent 7eccfc6933
commit b85889d6d5
4 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
p2p/base/mock_async_resolver.h
View File

@ -29,14 +29,17 @@ class MockAsyncResolver : public AsyncResolverInterface {
}
~MockAsyncResolver() = default;
MOCK_METHOD1(Start, void(const rtc::SocketAddress&));
MOCK_CONST_METHOD2(GetResolvedAddress, bool(int family, SocketAddress* addr));
MOCK_CONST_METHOD0(GetError, int());
MOCK_METHOD(void, Start, (const rtc::SocketAddress&), (override));
MOCK_METHOD(bool,
GetResolvedAddress,
(int family, SocketAddress* addr),
(const, override));
MOCK_METHOD(int, GetError, (), (const, override));
// Note that this won't delete the object like AsyncResolverInterface says in
// order to avoid sanitizer failures caused by this being a synchronous
// implementation. The test code should delete the object instead.
MOCK_METHOD1(Destroy, void(bool));
MOCK_METHOD(void, Destroy, (bool), (override));
};
} // namespace rtc
@ -45,7 +48,7 @@ namespace webrtc {
class MockAsyncResolverFactory : public AsyncResolverFactory {
public:
MOCK_METHOD0(Create, rtc::AsyncResolverInterface*());
MOCK_METHOD(rtc::AsyncResolverInterface*, Create, (), (override));
};
} // namespace webrtc

19
p2p/base/mock_ice_transport.h
View File

@ -32,15 +32,20 @@ class MockIceTransport : public IceTransportInternal {
SignalWritableState(this);
}
MOCK_METHOD4(SendPacket,
int(const char* data,
MOCK_METHOD(int,
SendPacket,
(const char* data,
size_t len,
const rtc::PacketOptions& options,
int flags));
MOCK_METHOD2(SetOption, int(rtc::Socket::Option opt, int value));
MOCK_METHOD0(GetError, int());
MOCK_CONST_METHOD0(GetIceRole, cricket::IceRole());
MOCK_METHOD1(GetStats, bool(cricket::IceTransportStats* ice_transport_stats));
int flags),
(override));
MOCK_METHOD(int, SetOption, (rtc::Socket::Option opt, int value), (override));
MOCK_METHOD(int, GetError, (), (override));
MOCK_METHOD(cricket::IceRole, GetIceRole, (), (const, override));
MOCK_METHOD(bool,
GetStats,
(cricket::IceTransportStats * ice_transport_stats),
(override));
IceTransportState GetState() const override {
return IceTransportState::STATE_INIT;

18
p2p/base/p2p_transport_channel_unittest.cc
View File

@ -177,14 +177,14 @@ cricket::BasicPortAllocator* CreateBasicPortAllocator(
class MockIceControllerFactory : public cricket::IceControllerFactoryInterface {
public:
~MockIceControllerFactory() = default;
~MockIceControllerFactory() override = default;
std::unique_ptr<cricket::IceControllerInterface> Create(
const cricket::IceControllerFactoryArgs& args) {
const cricket::IceControllerFactoryArgs& args) override {
RecordIceControllerCreated();
return std::make_unique<cricket::BasicIceController>(args);
}
MOCK_METHOD0(RecordIceControllerCreated, void());
MOCK_METHOD(void, RecordIceControllerCreated, ());
};
} // namespace
@ -5255,10 +5255,14 @@ TEST_F(P2PTransportChannelTest,
class MockMdnsResponder : public webrtc::MdnsResponderInterface {
public:
MOCK_METHOD2(CreateNameForAddress,
void(const rtc::IPAddress&, NameCreatedCallback));
MOCK_METHOD2(RemoveNameForAddress,
void(const rtc::IPAddress&, NameRemovedCallback));
MOCK_METHOD(void,
CreateNameForAddress,
(const rtc::IPAddress&, NameCreatedCallback),
(override));
MOCK_METHOD(void,
RemoveNameForAddress,
(const rtc::IPAddress&, NameRemovedCallback),
(override));
};
TEST_F(P2PTransportChannelTest,

35
p2p/base/stun_port_unittest.cc
View File

@ -412,24 +412,29 @@ class MockAsyncPacketSocket : public rtc::AsyncPacketSocket {
public:
~MockAsyncPacketSocket() = default;
MOCK_CONST_METHOD0(GetLocalAddress, SocketAddress());
MOCK_CONST_METHOD0(GetRemoteAddress, SocketAddress());
MOCK_METHOD3(Send,
int(const void* pv,
size_t cb,
const rtc::PacketOptions& options));
MOCK_METHOD(SocketAddress, GetLocalAddress, (), (const, override));
MOCK_METHOD(SocketAddress, GetRemoteAddress, (), (const, override));
MOCK_METHOD(int,
Send,
(const void* pv, size_t cb, const rtc::PacketOptions& options),
(override));
MOCK_METHOD4(SendTo,
int(const void* pv,
MOCK_METHOD(int,
SendTo,
(const void* pv,
size_t cb,
const SocketAddress& addr,
const rtc::PacketOptions& options));
MOCK_METHOD0(Close, int());
MOCK_CONST_METHOD0(GetState, State());
MOCK_METHOD2(GetOption, int(rtc::Socket::Option opt, int* value));
MOCK_METHOD2(SetOption, int(rtc::Socket::Option opt, int value));
MOCK_CONST_METHOD0(GetError, int());
MOCK_METHOD1(SetError, void(int error));
const rtc::PacketOptions& options),
(override));
MOCK_METHOD(int, Close, (), (override));
MOCK_METHOD(State, GetState, (), (const, override));
MOCK_METHOD(int,
GetOption,
(rtc::Socket::Option opt, int* value),
(override));
MOCK_METHOD(int, SetOption, (rtc::Socket::Option opt, int value), (override));
MOCK_METHOD(int, GetError, (), (const, override));
MOCK_METHOD(void, SetError, (int error), (override));
};
// Test that outbound packets inherit the dscp value assigned to the socket.