Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from googletest 1.8 to googletest 1.10 #67

Closed
wants to merge 1 commit into from
Closed

Migrate from googletest 1.8 to googletest 1.10 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/mvfst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ folly
fizz

[dependencies.all(test=on, not(os=windows))]
googletest_1_8
googletest

[shipit.pathmap]
fbcode/quic/public_root = .
Expand Down
2 changes: 1 addition & 1 deletion build/fbcode_builder/manifests/proxygen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ wangle
mvfst

[dependencies.test=on]
googletest_1_8
googletest

[shipit.pathmap]
fbcode/proxygen/public_tld = .
Expand Down
17 changes: 9 additions & 8 deletions server/test/HaskellProcessorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,19 @@ struct MockResponseChannelRequest : public ResponseChannelRequest {
return true;
}

MOCK_METHOD3(
MOCK_METHOD(
void,
sendReply,
void(
ResponsePayload&&,
MessageChannel::SendCallback*,
folly::Optional<uint32_t>));
(ResponsePayload&&,
MessageChannel::SendCallback*,
folly::Optional<uint32_t>));

MOCK_METHOD2(
MOCK_METHOD(
void,
sendException,
void(ResponsePayload&&, MessageChannel::SendCallback*));
(ResponsePayload&&, MessageChannel::SendCallback*));

MOCK_METHOD2(sendErrorWrapped, void(folly::exception_wrapper, std::string));
MOCK_METHOD(void, sendErrorWrapped, (folly::exception_wrapper, std::string));

bool active;
size_t& destroyed;
Expand Down