diff options
author | 2016-01-13 11:42:18 -0800 | |
---|---|---|
committer | 2016-01-13 11:42:18 -0800 | |
commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
tree | fa59a43171854465c89af72734d45350070b7366 /test/cpp/end2end/mock_test.cc | |
parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'test/cpp/end2end/mock_test.cc')
-rw-r--r-- | test/cpp/end2end/mock_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index bd34cfba67..dddd1d0a2e 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -46,12 +46,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" -using grpc::cpp::test::util::EchoRequest; -using grpc::cpp::test::util::EchoResponse; -using grpc::cpp::test::util::TestService; +using grpc::testing::EchoRequest; +using grpc::testing::EchoResponse; +using grpc::testing::TestService; using std::chrono::system_clock; namespace grpc { @@ -245,10 +245,10 @@ class MockTest : public ::testing::Test { void ResetStub() { std::shared_ptr<Channel> channel = CreateChannel(server_address_.str(), InsecureChannelCredentials()); - stub_ = grpc::cpp::test::util::TestService::NewStub(channel); + stub_ = grpc::testing::TestService::NewStub(channel); } - std::unique_ptr<grpc::cpp::test::util::TestService::Stub> stub_; + std::unique_ptr<grpc::testing::TestService::Stub> stub_; std::unique_ptr<Server> server_; std::ostringstream server_address_; TestServiceImpl service_; |