diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-02 15:29:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-02 15:29:14 -0800 |
| commit | 40d2a4307b8b1e6c794c0eeee6774ddf31e99c6b (patch) | |
| tree | e2defbb84ec4858e1896e260b016894d5b4708b5 /test/core/end2end/tests/request_response_with_metadata_and_payload.c | |
| parent | 566316f3a52f67e3b3806fcb052ab442bc7c4af9 (diff) | |
| parent | 9b5da20897fac8fa215a4aa2e98ba892b417c0e2 (diff) | |
Merge branch 'async-api-prep' of github.com:ctiller/grpc into async-api
Diffstat (limited to 'test/core/end2end/tests/request_response_with_metadata_and_payload.c')
| -rw-r--r-- | test/core/end2end/tests/request_response_with_metadata_and_payload.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/test/core/end2end/tests/request_response_with_metadata_and_payload.c b/test/core/end2end/tests/request_response_with_metadata_and_payload.c index fb7b155367..0a58398c4a 100644 --- a/test/core/end2end/tests/request_response_with_metadata_and_payload.c +++ b/test/core/end2end/tests/request_response_with_metadata_and_payload.c @@ -128,18 +128,19 @@ static void test_request_response_with_metadata_and_payload( gpr_slice_unref(request_payload_slice); gpr_slice_unref(response_payload_slice); - c = grpc_channel_create_call(f.client, "/foo", "test.google.com", deadline); + c = grpc_channel_create_call_old(f.client, "/foo", "test.google.com", + deadline); GPR_ASSERT(c); /* add multiple metadata */ - GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata(c, &meta1, 0)); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata(c, &meta2, 0)); + 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(c, f.client_cq, tag(2), tag(3), 0)); + grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); GPR_ASSERT(GRPC_CALL_OK == - grpc_call_start_write(c, request_payload, tag(4), 0)); + 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); @@ -150,20 +151,20 @@ static void test_request_response_with_metadata_and_payload( deadline, "key1", "val1", "key2", "val2", NULL); cq_verify(v_server); - grpc_call_server_accept(s, f.server_cq, tag(102)); + grpc_call_server_accept_old(s, f.server_cq, tag(102)); /* add multiple metadata */ - GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata(s, &meta3, 0)); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_add_metadata(s, &meta4, 0)); + 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(s, 0); + grpc_call_server_end_initial_metadata_old(s, 0); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read(s, tag(5))); + 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(s, response_payload, tag(6), 0)); + 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); @@ -175,12 +176,12 @@ static void test_request_response_with_metadata_and_payload( "val4", NULL); cq_verify(v_client); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read(c, tag(7))); + 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(c, tag(8))); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status( + 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); |