diff options
author | 2016-01-11 10:30:38 -0800 | |
---|---|---|
committer | 2016-01-11 10:30:38 -0800 | |
commit | b3a6787bd52a9fe4a68114cbe5cd45926287da17 (patch) | |
tree | 2d52c30933afee569c8fc8dfec46c1d1a91c8060 /test/cpp/end2end/client_crash_test.cc | |
parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) | |
parent | cd92509e40adaae67edd683593da07e9b98fc6d9 (diff) |
Merge pull request #4525 from ctiller/proto_names
Consolidate C++ proto files under src/proto
Diffstat (limited to 'test/cpp/end2end/client_crash_test.cc')
-rw-r--r-- | test/cpp/end2end/client_crash_test.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index 116785bbf2..68c63b2f93 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -44,12 +44,12 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "test/cpp/util/echo_duplicate.grpc.pb.h" -#include "test/cpp/util/echo.grpc.pb.h" +#include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" +#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/subprocess.h" -using grpc::cpp::test::util::EchoRequest; -using grpc::cpp::test::util::EchoResponse; +using grpc::testing::EchoRequest; +using grpc::testing::EchoResponse; using std::chrono::system_clock; static std::string g_root; @@ -63,8 +63,7 @@ class CrashTest : public ::testing::Test { protected: CrashTest() {} - std::unique_ptr<grpc::cpp::test::util::TestService::Stub> - CreateServerAndStub() { + std::unique_ptr<grpc::testing::TestService::Stub> CreateServerAndStub() { auto port = grpc_pick_unused_port_or_die(); std::ostringstream addr_stream; addr_stream << "localhost:" << port; @@ -73,7 +72,7 @@ class CrashTest : public ::testing::Test { g_root + "/client_crash_test_server", "--address=" + addr, })); GPR_ASSERT(server_); - return grpc::cpp::test::util::TestService::NewStub( + return grpc::testing::TestService::NewStub( CreateChannel(addr, InsecureChannelCredentials())); } |