aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2018-12-18 12:51:48 -0800
committerGravatar Mark D. Roth <roth@google.com>2018-12-18 15:09:48 -0800
commit09a173b4b612d1cb27d82490d83dd95e0aece203 (patch)
tree040c526019b95982c0f95aebc85073bb4f55326d /test/core
parent21940df57e3d5d34cc72d5f6785e9c2718165263 (diff)
Remove now-unnecessary workarounds for alignment issues.
Diffstat (limited to 'test/core')
-rw-r--r--test/core/security/credentials_test.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc
index b3a8161786..b655535335 100644
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@@ -465,14 +465,14 @@ static void test_oauth2_google_iam_composite_creds(void) {
google_iam_creds->Unref();
GPR_ASSERT(strcmp(composite_creds->type(),
GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE) == 0);
- const grpc_call_credentials_array& creds_array =
+ const grpc_composite_call_credentials::CallCredentialsList& creds_list =
static_cast<const grpc_composite_call_credentials*>(composite_creds)
->inner();
- GPR_ASSERT(creds_array.size() == 2);
- GPR_ASSERT(strcmp(creds_array.get(0)->type(),
- GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0);
- GPR_ASSERT(
- strcmp(creds_array.get(1)->type(), GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0);
+ GPR_ASSERT(creds_list.size() == 2);
+ GPR_ASSERT(strcmp(creds_list[0]->type(), GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) ==
+ 0);
+ GPR_ASSERT(strcmp(creds_list[1]->type(), GRPC_CALL_CREDENTIALS_TYPE_IAM) ==
+ 0);
run_request_metadata_test(composite_creds, auth_md_ctx, state);
composite_creds->Unref();
}
@@ -492,13 +492,13 @@ class check_channel_oauth2_google_iam final : public grpc_channel_credentials {
GPR_ASSERT(call_creds != nullptr);
GPR_ASSERT(
strcmp(call_creds->type(), GRPC_CALL_CREDENTIALS_TYPE_COMPOSITE) == 0);
- const grpc_call_credentials_array& creds_array =
+ const grpc_composite_call_credentials::CallCredentialsList& creds_list =
static_cast<const grpc_composite_call_credentials*>(call_creds.get())
->inner();
- GPR_ASSERT(strcmp(creds_array.get(0)->type(),
- GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0);
- GPR_ASSERT(strcmp(creds_array.get(1)->type(),
- GRPC_CALL_CREDENTIALS_TYPE_IAM) == 0);
+ GPR_ASSERT(
+ strcmp(creds_list[0]->type(), GRPC_CALL_CREDENTIALS_TYPE_OAUTH2) == 0);
+ GPR_ASSERT(strcmp(creds_list[1]->type(), GRPC_CALL_CREDENTIALS_TYPE_IAM) ==
+ 0);
return nullptr;
}
};