From 657ab449c65e069b6523ac5624ac052a2c505b1c Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Fri, 26 Apr 2019 13:16:54 -0700
Subject: [PATCH] Make single-argument constructor explicit
---
test/cpp/end2end/client_callback_end2end_test.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc
index f0d159ba2a..9acaf4d076 100644
--- a/test/cpp/end2end/client_callback_end2end_test.cc
+++ b/test/cpp/end2end/client_callback_end2end_test.cc
@@ -536,9 +536,9 @@ TEST_P(ClientCallbackEnd2endTest, RequestEchoServerCancel) {
struct ClientCancelInfo {
bool cancel{false};
int ops_before_cancel;
+
ClientCancelInfo() : cancel{false} {}
- // Allow the single-op version to be non-explicit for ease of use
- ClientCancelInfo(int ops) : cancel{true}, ops_before_cancel{ops} {}
+ explicit ClientCancelInfo(int ops) : cancel{true}, ops_before_cancel{ops} {}
};
class WriteClient : public grpc::experimental::ClientWriteReactor<EchoRequest> {
@@ -651,7 +651,7 @@ TEST_P(ClientCallbackEnd2endTest, RequestStream) {
TEST_P(ClientCallbackEnd2endTest, ClientCancelsRequestStream) {
MAYBE_SKIP_TEST;
ResetStub();
- WriteClient test{stub_.get(), DO_NOT_CANCEL, 3, {2}};
+ WriteClient test{stub_.get(), DO_NOT_CANCEL, 3, ClientCancelInfo{2}};
test.Await();
// Make sure that the server interceptors got the cancel
if (GetParam().use_interceptors) {
@@ -869,7 +869,7 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStream) {
TEST_P(ClientCallbackEnd2endTest, ClientCancelsResponseStream) {
MAYBE_SKIP_TEST;
ResetStub();
- ReadClient test{stub_.get(), DO_NOT_CANCEL, 2};
+ ReadClient test{stub_.get(), DO_NOT_CANCEL, ClientCancelInfo{2}};
test.Await();
// Because cancel in this case races with server finish, we can't be sure that
// server interceptors even see cancellation
@@ -1052,7 +1052,7 @@ TEST_P(ClientCallbackEnd2endTest, ClientCancelsBidiStream) {
MAYBE_SKIP_TEST;
ResetStub();
BidiClient test{stub_.get(), DO_NOT_CANCEL,
- kServerDefaultResponseStreamsToSend, 2};
+ kServerDefaultResponseStreamsToSend, ClientCancelInfo{2}};
test.Await();
// Make sure that the server interceptors were notified of a cancel
if (GetParam().use_interceptors) {
--
GitLab