lib/mvfst
1
0
Fork 0
mirror of https://github.com/facebookincubator/mvfst.git synced 2025-11-12 08:41:01 +03:00
Code Activity

Workaround lack of const noexept support in public GMock for Quic ConnIdAlgo

Browse Source 
Summary: 9 years and counting since c++11 is a thing.

Reviewed By: mjoras

Differential Revision: D20068892

fbshipit-source-id: e9d486d588481232de9dac5eb8e4f0b8dbf38bb6
This commit is contained in:
Yang Chi
2020-02-24 15:13:27 -08:00
committed by Facebook Github Bot
parent 9164827b6f
commit 76de6e15c0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quic/codec/test/Mocks.h
View File

@@ -23,9 +23,9 @@ std::ostream& operator<<(std::ostream& out, const QuicWriteFrame& /*rhs*/) {
namespace quic { namespace quic {
namespace test { namespace test {
class MockConnectoinIdAlgo : public ConnectionIdAlgo { class MockConnectionIdAlgo : public ConnectionIdAlgo {
public: public:
GMOCK_METHOD1_(, const noexcept, , canParse, bool(const ConnectionId& id)); GMOCK_METHOD1_(, noexcept, , canParseNonConst, bool(const ConnectionId& id));
GMOCK_METHOD1_( GMOCK_METHOD1_(
, ,
noexcept, noexcept,
@@ -40,6 +40,10 @@ class MockConnectoinIdAlgo : public ConnectionIdAlgo {
encodeConnectionId, encodeConnectionId,
folly::Expected<ConnectionId, QuicInternalException>( folly::Expected<ConnectionId, QuicInternalException>(
const ServerConnectionIdParams&)); const ServerConnectionIdParams&));
bool canParse(const ConnectionId& id) const noexcept override {
return const_cast<MockConnectionIdAlgo&>(*this).canParseNonConst(id);
}
}; };
class MockQuicPacketBuilder : public PacketBuilderInterface { class MockQuicPacketBuilder : public PacketBuilderInterface {

4
quic/server/test/QuicServerTest.cpp
View File

@@ -633,7 +633,7 @@ TEST_F(QuicServerWorkerTest, FailToParseConnectionId) {
auto data = createData(kDefaultUDPSendPacketLen); auto data = createData(kDefaultUDPSendPacketLen);
auto srcConnId = getTestConnectionId(0); auto srcConnId = getTestConnectionId(0);
auto dstConnId = getTestConnectionId(1); auto dstConnId = getTestConnectionId(1);
auto mockConnIdAlgo = std::make_unique<MockConnectoinIdAlgo>(); auto mockConnIdAlgo = std::make_unique<MockConnectionIdAlgo>();
auto rawConnIdAlgo = mockConnIdAlgo.get(); auto rawConnIdAlgo = mockConnIdAlgo.get();
worker_->setConnectionIdAlgo(std::move(mockConnIdAlgo)); worker_->setConnectionIdAlgo(std::move(mockConnIdAlgo));
@@ -656,7 +656,7 @@ TEST_F(QuicServerWorkerTest, FailToParseConnectionId) {
srcConnId); srcConnId);
NetworkData networkData(std::move(packet), Clock::now()); NetworkData networkData(std::move(packet), Clock::now());
EXPECT_CALL(*rawConnIdAlgo, canParse(_)).WillOnce(Return(true)); EXPECT_CALL(*rawConnIdAlgo, canParseNonConst(_)).WillOnce(Return(true));
EXPECT_CALL(*rawConnIdAlgo, parseConnectionId(dstConnId)) EXPECT_CALL(*rawConnIdAlgo, parseConnectionId(dstConnId))
.WillOnce(Return(folly::makeUnexpected(QuicInternalException( .WillOnce(Return(folly::makeUnexpected(QuicInternalException(
"This CID has COVID-19", LocalErrorCode::INTERNAL_ERROR)))); "This CID has COVID-19", LocalErrorCode::INTERNAL_ERROR))));