diff options
| -rw-r--r-- | test/cpp/interop/client.cc | 2 | ||||
| -rw-r--r-- | test/cpp/interop/interop_client.cc | 2 | ||||
| -rw-r--r-- | test/cpp/interop/server.cc | 22 | ||||
| -rw-r--r-- | test/proto/test.proto | 3 |
4 files changed, 7 insertions, 22 deletions
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index ed410c9ef0..48143b2e53 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -74,7 +74,7 @@ DEFINE_string(test_case, "large_unary", "jwt_token_creds: large_unary with JWT token auth; " "oauth2_auth_token: raw oauth2 access token auth; " "per_rpc_creds: raw oauth2 access token on a single rpc; " - "status_code_and_message: verify status code & message; " + "status_code_and_message: verify status code & message; " "all : all of above."); DEFINE_string(default_service_account, "", "Email of GCE default service account"); diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 7ad0f31575..a43225011e 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -122,7 +122,7 @@ void InteropClient::PerformLargeCompressedUnary(SimpleRequest* request, grpc::string payload(kLargeRequestSize, '\0'); request->mutable_payload()->set_body(payload.c_str(), kLargeRequestSize); - Status s = stub->CompressedUnaryCall(&context, *request, response); + Status s = stub->UnaryCall(&context, *request, response); // Compression related checks. GPR_ASSERT(request->response_compression() == diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc index ac0a2e512b..2ea8794e5a 100644 --- a/test/cpp/interop/server.cc +++ b/test/cpp/interop/server.cc @@ -43,6 +43,7 @@ #include <grpc/grpc.h> #include <grpc/support/log.h> #include <grpc/support/useful.h> + #include <grpc++/config.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> @@ -140,6 +141,7 @@ class TestServiceImpl : public TestService::Service { Status UnaryCall(ServerContext* context, const SimpleRequest* request, SimpleResponse* response) { + SetResponseCompression(context, *request); if (request->has_response_size() && request->response_size() > 0) { if (!SetPayload(request->response_type(), request->response_size(), response->mutable_payload())) { @@ -148,21 +150,14 @@ class TestServiceImpl : public TestService::Service { } if (request->has_response_status()) { - return Status(static_cast<grpc::StatusCode> - (request->response_status().code()), - request->response_status().message()); + return Status( + static_cast<grpc::StatusCode>(request->response_status().code()), + request->response_status().message()); } return Status::OK; } - Status CompressedUnaryCall(ServerContext* context, - const SimpleRequest* request, - SimpleResponse* response) { - SetResponseCompression(context, *request); - return UnaryCall(context, request, response); - } - Status StreamingOutputCall( ServerContext* context, const StreamingOutputCallRequest* request, ServerWriter<StreamingOutputCallResponse>* writer) { @@ -183,13 +178,6 @@ class TestServiceImpl : public TestService::Service { } } - Status CompressedStreamingOutputCall( - ServerContext* context, const StreamingOutputCallRequest* request, - ServerWriter<StreamingOutputCallResponse>* writer) { - SetResponseCompression(context, *request); - return StreamingOutputCall(context, request, writer); - } - Status StreamingInputCall(ServerContext* context, ServerReader<StreamingInputCallRequest>* reader, StreamingInputCallResponse* response) { diff --git a/test/proto/test.proto b/test/proto/test.proto index 574c6a5b50..368522dc4c 100644 --- a/test/proto/test.proto +++ b/test/proto/test.proto @@ -48,9 +48,6 @@ service TestService { // TODO(Issue 527): Describe required server behavior. rpc UnaryCall(SimpleRequest) returns (SimpleResponse); - // One request followed by one compressed response. - rpc CompressedUnaryCall(SimpleRequest) returns (SimpleResponse); - // One request followed by a sequence of responses (streamed download). // The server returns the payload with client desired type and sizes. rpc StreamingOutputCall(StreamingOutputCallRequest) |