aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c')
-rw-r--r--test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c178
1 files changed, 103 insertions, 75 deletions
diff --git a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
index f5f0e646ea..5878058c98 100644
--- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
@@ -114,98 +114,126 @@ static void test_request_response_with_metadata_and_payload(
grpc_byte_buffer *response_payload =
grpc_byte_buffer_create(&response_payload_slice, 1);
gpr_timespec deadline = five_seconds_time();
- grpc_metadata meta1 = {"key1", "val1", 4};
- grpc_metadata meta2 = {"key2", "val2", 4};
- grpc_metadata meta3 = {"key3", "val3", 4};
- grpc_metadata meta4 = {"key4", "val4", 4};
- grpc_metadata meta5 = {"key5", "val5", 4};
- grpc_metadata meta6 = {"key6", "val6", 4};
+ grpc_metadata meta_c[2] = {{"key1", "val1", 4}, {"key2", "val2", 4}};
+ grpc_metadata meta_s[2] = {{"key3", "val3", 4}, {"key4", "val4", 4}};
+ grpc_metadata meta_t[2] = {{"key5", "val5", 4}, {"key6", "val6", 4}};
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100)));
-
- /* byte buffer holds the slice, we can unref it already */
- gpr_slice_unref(request_payload_slice);
- gpr_slice_unref(response_payload_slice);
-
- c = grpc_channel_create_call_old(f.client, "/foo", "test.google.com",
- deadline);
+ grpc_op ops[6];
+ grpc_op *op;
+ grpc_metadata_array initial_metadata_recv;
+ grpc_metadata_array trailing_metadata_recv;
+ grpc_metadata_array request_metadata_recv;
+ grpc_byte_buffer *request_payload_recv = NULL;
+ grpc_byte_buffer *response_payload_recv = NULL;
+ grpc_call_details call_details;
+ grpc_status_code status;
+ char *details = NULL;
+ size_t details_capacity = 0;
+ int was_cancelled = 2;
+
+ c = grpc_channel_create_call(f.client, f.client_cq, "/foo", "test.google.com",
+ deadline);
GPR_ASSERT(c);
- /* add multiple metadata */
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(c, &meta1, 0));
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(c, &meta2, 0));
-
- GPR_ASSERT(GRPC_CALL_OK ==
- grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0));
-
- GPR_ASSERT(GRPC_CALL_OK ==
- grpc_call_start_write_old(c, request_payload, tag(4), 0));
- /* destroy byte buffer early to ensure async code keeps track of its contents
- correctly */
- grpc_byte_buffer_destroy(request_payload);
- cq_expect_write_accepted(v_client, tag(4), GRPC_OP_OK);
- cq_verify(v_client);
-
- cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "test.google.com",
- deadline, "key1", "val1", "key2", "val2", NULL);
+ grpc_metadata_array_init(&initial_metadata_recv);
+ grpc_metadata_array_init(&trailing_metadata_recv);
+ grpc_metadata_array_init(&request_metadata_recv);
+ grpc_call_details_init(&call_details);
+
+ op = ops;
+ op->op = GRPC_OP_SEND_INITIAL_METADATA;
+ op->data.send_initial_metadata.count = 2;
+ op->data.send_initial_metadata.metadata = meta_c;
+ op++;
+ op->op = GRPC_OP_SEND_MESSAGE;
+ op->data.send_message = request_payload;
+ op++;
+ op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
+ op++;
+ op->op = GRPC_OP_RECV_INITIAL_METADATA;
+ op->data.recv_initial_metadata = &initial_metadata_recv;
+ op++;
+ op->op = GRPC_OP_RECV_MESSAGE;
+ op->data.recv_message = &response_payload_recv;
+ op++;
+ op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
+ op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
+ op->data.recv_status_on_client.status = &status;
+ op->data.recv_status_on_client.status_details = &details;
+ op->data.recv_status_on_client.status_details_capacity = &details_capacity;
+ op++;
+ GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
+
+ GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
+ &call_details,
+ &request_metadata_recv,
+ f.server_cq, tag(101)));
+ cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server);
- grpc_call_server_accept_old(s, f.server_cq, tag(102));
-
- /* add multiple metadata */
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(s, &meta3, 0));
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(s, &meta4, 0));
-
- grpc_call_server_end_initial_metadata_old(s, 0);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(s, &meta5, 0));
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata_old(s, &meta6, 0));
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read_old(s, tag(5)));
- cq_expect_read(v_server, tag(5), gpr_slice_from_copied_string("hello world"));
- cq_verify(v_server);
-
- GPR_ASSERT(GRPC_CALL_OK ==
- grpc_call_start_write_old(s, response_payload, tag(6), 0));
- /* destroy byte buffer early to ensure async code keeps track of its contents
- correctly */
- grpc_byte_buffer_destroy(response_payload);
- cq_expect_write_accepted(v_server, tag(6), GRPC_OP_OK);
+ op = ops;
+ op->op = GRPC_OP_SEND_INITIAL_METADATA;
+ op->data.send_initial_metadata.count = 2;
+ op->data.send_initial_metadata.metadata = meta_s;
+ op++;
+ op->op = GRPC_OP_SEND_MESSAGE;
+ op->data.send_message = response_payload;
+ op++;
+ op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
+ op->data.send_status_from_server.trailing_metadata_count = 2;
+ op->data.send_status_from_server.trailing_metadata = meta_t;
+ op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
+ op->data.send_status_from_server.status_details = "xyz";
+ op++;
+ op->op = GRPC_OP_RECV_MESSAGE;
+ op->data.recv_message = &request_payload_recv;
+ op++;
+ op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
+ op->data.recv_close_on_server.cancelled = &was_cancelled;
+ op++;
+ GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
+
+ cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server);
- /* fetch metadata.. */
- cq_expect_client_metadata_read(v_client, tag(2), "key3", "val3", "key4",
- "val4", NULL);
+ cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
cq_verify(v_client);
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read_old(c, tag(7)));
- cq_expect_read(v_client, tag(7), gpr_slice_from_copied_string("hello you"));
- cq_verify(v_client);
-
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(8)));
- GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status_old(
- s, GRPC_STATUS_UNIMPLEMENTED, "xyz", tag(9)));
-
- cq_expect_finish_accepted(v_client, tag(8), GRPC_OP_OK);
- cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED,
- "xyz", "key5", "val5", "key6", "val6", NULL);
- cq_verify(v_client);
-
- cq_expect_finish_accepted(v_server, tag(9), GRPC_OP_OK);
- cq_expect_finished(v_server, tag(102), NULL);
- cq_verify(v_server);
+ GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
+ GPR_ASSERT(0 == strcmp(details, "xyz"));
+ GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
+ GPR_ASSERT(0 == strcmp(call_details.host, "test.google.com"));
+ GPR_ASSERT(was_cancelled == 1);
+ GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world"));
+ GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you"));
+ GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1"));
+ GPR_ASSERT(contains_metadata(&request_metadata_recv, "key2", "val2"));
+ GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key3", "val3"));
+ GPR_ASSERT(contains_metadata(&initial_metadata_recv, "key4", "val4"));
+ GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key5", "val5"));
+ GPR_ASSERT(contains_metadata(&trailing_metadata_recv, "key6", "val6"));
+
+ gpr_free(details);
+ grpc_metadata_array_destroy(&initial_metadata_recv);
+ grpc_metadata_array_destroy(&trailing_metadata_recv);
+ grpc_metadata_array_destroy(&request_metadata_recv);
+ grpc_call_details_destroy(&call_details);
grpc_call_destroy(c);
grpc_call_destroy(s);
- end_test(&f);
- config.tear_down_data(&f);
-
cq_verifier_destroy(v_client);
cq_verifier_destroy(v_server);
+
+ grpc_byte_buffer_destroy(request_payload);
+ grpc_byte_buffer_destroy(response_payload);
+ grpc_byte_buffer_destroy(request_payload_recv);
+ grpc_byte_buffer_destroy(response_payload_recv);
+
+ end_test(&f);
+ config.tear_down_data(&f);
}
void grpc_end2end_tests(grpc_end2end_test_config config) {