From 12925d6fc8312f0a6f27430b8946a2712f966d7e Mon Sep 17 00:00:00 2001 From: Hope Casey-Allen Date: Thu, 11 Oct 2018 14:38:26 -0700 Subject: [PATCH] Move check closer to relevant code --- test/cpp/end2end/async_end2end_test.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 917b2a486f0..6ecb9578015 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -980,6 +980,13 @@ TEST_P(AsyncEnd2endTest, ServerInitialMetadataServerStreaming) { srv_ctx.AddInitialMetadata(meta2.first, meta2.second); srv_stream.SendInitialMetadata(tag(10)); Verifier().Expect(10, true).Expect(11, true).Verify(cq_.get()); + auto server_initial_metadata = cli_ctx.GetServerInitialMetadata(); + EXPECT_EQ(meta1.second, + ToString(server_initial_metadata.find(meta1.first)->second)); + EXPECT_EQ(meta2.second, + ToString(server_initial_metadata.find(meta2.first)->second)); + EXPECT_EQ(static_cast(2), server_initial_metadata.size()); + srv_stream.Write(send_response, tag(3)); cli_stream->Read(&recv_response, tag(4)); @@ -989,13 +996,6 @@ TEST_P(AsyncEnd2endTest, ServerInitialMetadataServerStreaming) { cli_stream->Read(&recv_response, tag(6)); Verifier().Expect(5, true).Expect(6, true).Verify(cq_.get()); - auto server_initial_metadata = cli_ctx.GetServerInitialMetadata(); - EXPECT_EQ(meta1.second, - ToString(server_initial_metadata.find(meta1.first)->second)); - EXPECT_EQ(meta2.second, - ToString(server_initial_metadata.find(meta2.first)->second)); - EXPECT_EQ(static_cast(2), server_initial_metadata.size()); - srv_stream.Finish(Status::OK, tag(7)); cli_stream->Read(&recv_response, tag(8)); Verifier().Expect(7, true).Expect(8, false).Verify(cq_.get());