Added missing payloads to streaming compressed test

pull/3067/head
David Garcia Quintas 10 years ago
parent f3552725f3
commit 04ecfa1ad7
  1. 29
      test/cpp/interop/interop_client.cc
  2. 8
      test/cpp/interop/server.cc

@ -362,20 +362,37 @@ void InteropClient::DoResponseCompressedStreaming() {
request.set_response_type(payload_types[i]); request.set_response_type(payload_types[i]);
request.set_response_compression(compression_types[j]); request.set_response_compression(compression_types[j]);
for (unsigned int i = 0; i < response_stream_sizes.size(); ++i) { for (size_t k = 0; k < response_stream_sizes.size(); ++k) {
ResponseParameters* response_parameter = ResponseParameters* response_parameter =
request.add_response_parameters(); request.add_response_parameters();
response_parameter->set_size(response_stream_sizes[i]); response_parameter->set_size(response_stream_sizes[k]);
} }
StreamingOutputCallResponse response; StreamingOutputCallResponse response;
std::unique_ptr<ClientReader<StreamingOutputCallResponse>> stream( std::unique_ptr<ClientReader<StreamingOutputCallResponse>> stream(
stub->StreamingOutputCall(&context, request)); stub->StreamingOutputCall(&context, request));
unsigned int i = 0; size_t k = 0;
while (stream->Read(&response)) { while (stream->Read(&response)) {
// Payload related checks.
if (request.response_type() != PayloadType::RANDOM) {
GPR_ASSERT(response.payload().type() == request.response_type());
}
switch (response.payload().type()) {
case PayloadType::COMPRESSABLE:
GPR_ASSERT(response.payload().body() == GPR_ASSERT(response.payload().body() ==
grpc::string(response_stream_sizes[i], '\0')); grpc::string(response_stream_sizes[k], '\0'));
break;
case PayloadType::UNCOMPRESSABLE: {
std::ifstream rnd_file(kRandomFile);
GPR_ASSERT(rnd_file.good());
for (int n = 0; n < response_stream_sizes[k]; n++) {
GPR_ASSERT(response.payload().body()[n] == (char)rnd_file.get());
}
} break;
default:
GPR_ASSERT(false);
}
// Compression related checks. // Compression related checks.
GPR_ASSERT(request.response_compression() == GPR_ASSERT(request.response_compression() ==
@ -391,10 +408,10 @@ void InteropClient::DoResponseCompressedStreaming() {
GRPC_WRITE_INTERNAL_COMPRESS); GRPC_WRITE_INTERNAL_COMPRESS);
} }
++i; ++k;
} }
GPR_ASSERT(response_stream_sizes.size() == i); GPR_ASSERT(response_stream_sizes.size() == k);
Status s = stream->Finish(); Status s = stream->Finish();
AssertOkOrPrintErrorStatus(s); AssertOkOrPrintErrorStatus(s);

@ -158,11 +158,13 @@ class TestServiceImpl : public TestService::Service {
SetResponseCompression(context, *request); SetResponseCompression(context, *request);
StreamingOutputCallResponse response; StreamingOutputCallResponse response;
bool write_success = true; bool write_success = true;
response.mutable_payload()->set_type(request->response_type());
for (int i = 0; write_success && i < request->response_parameters_size(); for (int i = 0; write_success && i < request->response_parameters_size();
i++) { i++) {
response.mutable_payload()->set_body( if (!SetPayload(request->response_type(),
grpc::string(request->response_parameters(i).size(), '\0')); request->response_parameters(i).size(),
response.mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
write_success = writer->Write(response); write_success = writer->Write(response);
} }
if (write_success) { if (write_success) {

Loading…
Cancel
Save