Fix clang-tidy and golden file issues

pull/17104/head
Vijay Pai 6 years ago
parent 28dd7981d6
commit 2b5d45ab38
  1. 12
      include/grpcpp/impl/codegen/client_callback.h
  2. 1075
      test/cpp/codegen/compiler_test_golden
  3. 8
      test/cpp/end2end/client_callback_end2end_test.cc

@ -157,7 +157,7 @@ template <class Request, class Response>
class ClientBidiReactor { class ClientBidiReactor {
public: public:
virtual ~ClientBidiReactor() {} virtual ~ClientBidiReactor() {}
virtual void OnDone(Status s) {} virtual void OnDone(const Status& s) {}
virtual void OnReadInitialMetadataDone(bool ok) {} virtual void OnReadInitialMetadataDone(bool ok) {}
virtual void OnReadDone(bool ok) {} virtual void OnReadDone(bool ok) {}
virtual void OnWriteDone(bool ok) {} virtual void OnWriteDone(bool ok) {}
@ -186,7 +186,7 @@ template <class Response>
class ClientReadReactor { class ClientReadReactor {
public: public:
virtual ~ClientReadReactor() {} virtual ~ClientReadReactor() {}
virtual void OnDone(Status s) {} virtual void OnDone(const Status& s) {}
virtual void OnReadInitialMetadataDone(bool ok) {} virtual void OnReadInitialMetadataDone(bool ok) {}
virtual void OnReadDone(bool ok) {} virtual void OnReadDone(bool ok) {}
@ -203,7 +203,7 @@ template <class Request>
class ClientWriteReactor { class ClientWriteReactor {
public: public:
virtual ~ClientWriteReactor() {} virtual ~ClientWriteReactor() {}
virtual void OnDone(Status s) {} virtual void OnDone(const Status& s) {}
virtual void OnReadInitialMetadataDone(bool ok) {} virtual void OnReadInitialMetadataDone(bool ok) {}
virtual void OnWriteDone(bool ok) {} virtual void OnWriteDone(bool ok) {}
virtual void OnWritesDoneDone(bool ok) {} virtual void OnWritesDoneDone(bool ok) {}
@ -255,7 +255,7 @@ class ClientCallbackReaderWriterImpl
void MaybeFinish() { void MaybeFinish() {
if (--callbacks_outstanding_ == 0) { if (--callbacks_outstanding_ == 0) {
reactor_->OnDone(std::move(finish_status_)); reactor_->OnDone(finish_status_);
auto* call = call_.call(); auto* call = call_.call();
this->~ClientCallbackReaderWriterImpl(); this->~ClientCallbackReaderWriterImpl();
g_core_codegen_interface->grpc_call_unref(call); g_core_codegen_interface->grpc_call_unref(call);
@ -450,7 +450,7 @@ class ClientCallbackReaderImpl
void MaybeFinish() { void MaybeFinish() {
if (--callbacks_outstanding_ == 0) { if (--callbacks_outstanding_ == 0) {
reactor_->OnDone(std::move(finish_status_)); reactor_->OnDone(finish_status_);
auto* call = call_.call(); auto* call = call_.call();
this->~ClientCallbackReaderImpl(); this->~ClientCallbackReaderImpl();
g_core_codegen_interface->grpc_call_unref(call); g_core_codegen_interface->grpc_call_unref(call);
@ -576,7 +576,7 @@ class ClientCallbackWriterImpl
void MaybeFinish() { void MaybeFinish() {
if (--callbacks_outstanding_ == 0) { if (--callbacks_outstanding_ == 0) {
reactor_->OnDone(std::move(finish_status_)); reactor_->OnDone(finish_status_);
auto* call = call_.call(); auto* call = call_.call();
this->~ClientCallbackWriterImpl(); this->~ClientCallbackWriterImpl();
g_core_codegen_interface->grpc_call_unref(call); g_core_codegen_interface->grpc_call_unref(call);

File diff suppressed because it is too large Load Diff

@ -206,7 +206,7 @@ class ClientCallbackEnd2endTest
EXPECT_TRUE(ParseFromByteBuffer(&recv_buf_, &response)); EXPECT_TRUE(ParseFromByteBuffer(&recv_buf_, &response));
EXPECT_EQ(request_.message(), response.message()); EXPECT_EQ(request_.message(), response.message());
}; };
void OnDone(Status s) override { void OnDone(const Status& s) override {
EXPECT_TRUE(s.ok()); EXPECT_TRUE(s.ok());
std::unique_lock<std::mutex> l(mu_); std::unique_lock<std::mutex> l(mu_);
done_ = true; done_ = true;
@ -345,7 +345,7 @@ TEST_P(ClientCallbackEnd2endTest, RequestStream) {
StartWriteLast(&request_, WriteOptions()); StartWriteLast(&request_, WriteOptions());
} }
} }
void OnDone(Status s) override { void OnDone(const Status& s) override {
EXPECT_TRUE(s.ok()); EXPECT_TRUE(s.ok());
EXPECT_EQ(response_.message(), "Hello server.Hello server.Hello server."); EXPECT_EQ(response_.message(), "Hello server.Hello server.Hello server.");
std::unique_lock<std::mutex> l(mu_); std::unique_lock<std::mutex> l(mu_);
@ -398,7 +398,7 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStream) {
StartRead(&response_); StartRead(&response_);
} }
} }
void OnDone(Status s) override { void OnDone(const Status& s) override {
EXPECT_TRUE(s.ok()); EXPECT_TRUE(s.ok());
std::unique_lock<std::mutex> l(mu_); std::unique_lock<std::mutex> l(mu_);
done_ = true; done_ = true;
@ -458,7 +458,7 @@ TEST_P(ClientCallbackEnd2endTest, BidiStream) {
StartWrite(&request_); StartWrite(&request_);
} }
} }
void OnDone(Status s) override { void OnDone(const Status& s) override {
EXPECT_TRUE(s.ok()); EXPECT_TRUE(s.ok());
std::unique_lock<std::mutex> l(mu_); std::unique_lock<std::mutex> l(mu_);
done_ = true; done_ = true;

Loading…
Cancel
Save