diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-04 16:01:23 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-04 16:01:23 -0700 |
| commit | 194b23856aa7251ad99df62134ab0301c5a37a5d (patch) | |
| tree | a6c2c05cecae62171fccffafdf7adc1ba90d4846 /test/cpp/end2end/streaming_throughput_test.cc | |
| parent | 40c8fba13c7cbed7df5f92b3bab4131178410ccd (diff) | |
| parent | 80eb075e633219cf8972e778eb449d2271ee92ad (diff) | |
Merge github.com:grpc/grpc into decouple_version_number
Diffstat (limited to 'test/cpp/end2end/streaming_throughput_test.cc')
| -rw-r--r-- | test/cpp/end2end/streaming_throughput_test.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index 9e82c30701..302583766b 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -35,6 +35,8 @@ #include <mutex> #include <thread> +#include <gtest/gtest.h> + #include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> @@ -45,9 +47,9 @@ #include <grpc++/server_context.h> #include <grpc/grpc.h> #include <grpc/support/atm.h> +#include <grpc/support/log.h> #include <grpc/support/thd.h> #include <grpc/support/time.h> -#include <gtest/gtest.h> #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" @@ -119,9 +121,9 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { } // Only implement the one method we will be calling for brevity. - Status BidiStream(ServerContext* context, - ServerReaderWriter<EchoResponse, EchoRequest>* stream) - GRPC_OVERRIDE { + Status BidiStream( + ServerContext* context, + ServerReaderWriter<EchoResponse, EchoRequest>* stream) override { EchoRequest request; gpr_atm should_exit; gpr_atm_rel_store(&should_exit, static_cast<gpr_atm>(0)); @@ -145,7 +147,7 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service { class End2endTest : public ::testing::Test { protected: - void SetUp() GRPC_OVERRIDE { + void SetUp() override { int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; // Setup server @@ -156,7 +158,7 @@ class End2endTest : public ::testing::Test { server_ = builder.BuildAndStart(); } - void TearDown() GRPC_OVERRIDE { server_->Shutdown(); } + void TearDown() override { server_->Shutdown(); } void ResetStub() { std::shared_ptr<Channel> channel = |