diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
commit | 4e9265c828f0b559b5fdba04913fed46bf771399 (patch) | |
tree | 4a379fc2bdc037753cf8d81f8b86327e4bc50a42 /test/core/client_channel/resolvers | |
parent | 0ee7574732a06e8cace4e099a678f4bd5dbff679 (diff) | |
parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) |
Merge with master
Diffstat (limited to 'test/core/client_channel/resolvers')
-rw-r--r-- | test/core/client_channel/resolvers/BUILD | 16 | ||||
-rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc (renamed from test/core/client_channel/resolvers/dns_resolver_connectivity_test.c) | 73 | ||||
-rw-r--r-- | test/core/client_channel/resolvers/dns_resolver_test.cc (renamed from test/core/client_channel/resolvers/dns_resolver_test.c) | 24 | ||||
-rw-r--r-- | test/core/client_channel/resolvers/fake_resolver_test.cc (renamed from test/core/client_channel/resolvers/fake_resolver_test.c) | 52 | ||||
-rw-r--r-- | test/core/client_channel/resolvers/sockaddr_resolver_test.cc (renamed from test/core/client_channel/resolvers/sockaddr_resolver_test.c) | 32 |
5 files changed, 99 insertions, 98 deletions
diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index 0907e06623..b5269c7ef0 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -20,8 +20,8 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "dns_resolver_connectivity_test", - srcs = ["dns_resolver_connectivity_test.c"], - language = "C", + srcs = ["dns_resolver_connectivity_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -32,8 +32,8 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_test", - srcs = ["dns_resolver_test.c"], - language = "C", + srcs = ["dns_resolver_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -44,8 +44,8 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_resolver_test", - srcs = ["sockaddr_resolver_test.c"], - language = "C", + srcs = ["sockaddr_resolver_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -56,8 +56,8 @@ grpc_cc_test( grpc_cc_test( name = "fake_resolver_test", - srcs = ["fake_resolver_test.c"], - language = "C", + srcs = ["fake_resolver_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 3715fbdc02..e2823a4501 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -33,37 +33,38 @@ static gpr_mu g_mu; static bool g_fail_resolution = true; -static grpc_combiner *g_combiner; +static grpc_combiner* g_combiner; -static void my_resolve_address(const char *addr, const char *default_port, - grpc_pollset_set *interested_parties, - grpc_closure *on_done, - grpc_resolved_addresses **addrs) { +static void my_resolve_address(const char* addr, const char* default_port, + grpc_pollset_set* interested_parties, + grpc_closure* on_done, + grpc_resolved_addresses** addrs) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); - grpc_error *error = GRPC_ERROR_NONE; + grpc_error* error = GRPC_ERROR_NONE; if (g_fail_resolution) { g_fail_resolution = false; gpr_mu_unlock(&g_mu); error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Forced Failure"); } else { gpr_mu_unlock(&g_mu); - *addrs = gpr_malloc(sizeof(**addrs)); + *addrs = static_cast<grpc_resolved_addresses*>(gpr_malloc(sizeof(**addrs))); (*addrs)->naddrs = 1; - (*addrs)->addrs = gpr_malloc(sizeof(*(*addrs)->addrs)); + (*addrs)->addrs = static_cast<grpc_resolved_address*>( + gpr_malloc(sizeof(*(*addrs)->addrs))); (*addrs)->addrs[0].len = 123; } GRPC_CLOSURE_SCHED(on_done, error); } -static grpc_ares_request *my_dns_lookup_ares( - const char *dns_server, const char *addr, const char *default_port, - grpc_pollset_set *interested_parties, grpc_closure *on_done, - grpc_lb_addresses **lb_addrs, bool check_grpclb, - char **service_config_json) { +static grpc_ares_request* my_dns_lookup_ares( + const char* dns_server, const char* addr, const char* default_port, + grpc_pollset_set* interested_parties, grpc_closure* on_done, + grpc_lb_addresses** lb_addrs, bool check_grpclb, + char** service_config_json) { gpr_mu_lock(&g_mu); GPR_ASSERT(0 == strcmp("test", addr)); - grpc_error *error = GRPC_ERROR_NONE; + grpc_error* error = GRPC_ERROR_NONE; if (g_fail_resolution) { g_fail_resolution = false; gpr_mu_unlock(&g_mu); @@ -77,33 +78,33 @@ static grpc_ares_request *my_dns_lookup_ares( return NULL; } -static grpc_resolver *create_resolver(const char *name) { - grpc_resolver_factory *factory = grpc_resolver_factory_lookup("dns"); - grpc_uri *uri = grpc_uri_parse(name, 0); +static grpc_resolver* create_resolver(const char* name) { + grpc_resolver_factory* factory = grpc_resolver_factory_lookup("dns"); + grpc_uri* uri = grpc_uri_parse(name, 0); GPR_ASSERT(uri); grpc_resolver_args args; memset(&args, 0, sizeof(args)); args.uri = uri; args.combiner = g_combiner; - grpc_resolver *resolver = + grpc_resolver* resolver = grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); grpc_uri_destroy(uri); return resolver; } -static void on_done(void *ev, grpc_error *error) { - gpr_event_set(ev, (void *)1); +static void on_done(void* ev, grpc_error* error) { + gpr_event_set((gpr_event*)ev, (void*)1); } // interleave waiting for an event with a timer check -static bool wait_loop(int deadline_seconds, gpr_event *ev) { +static bool wait_loop(int deadline_seconds, gpr_event* ev) { while (deadline_seconds) { gpr_log(GPR_DEBUG, "Test: waiting for %d more seconds", deadline_seconds); if (gpr_event_wait(ev, grpc_timeout_seconds_to_deadline(1))) return true; deadline_seconds--; - exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; grpc_timer_check(NULL); grpc_exec_ctx_finish(); } @@ -111,22 +112,22 @@ static bool wait_loop(int deadline_seconds, gpr_event *ev) { } typedef struct next_args { - grpc_resolver *resolver; - grpc_channel_args **result; - grpc_closure *on_complete; + grpc_resolver* resolver; + grpc_channel_args** result; + grpc_closure* on_complete; } next_args; -static void call_resolver_next_now_lock_taken(void *arg, - grpc_error *error_unused) { - next_args *a = arg; +static void call_resolver_next_now_lock_taken(void* arg, + grpc_error* error_unused) { + next_args* a = static_cast<next_args*>(arg); grpc_resolver_next_locked(a->resolver, a->result, a->on_complete); gpr_free(a); } -static void call_resolver_next_after_locking(grpc_resolver *resolver, - grpc_channel_args **result, - grpc_closure *on_complete) { - next_args *a = gpr_malloc(sizeof(*a)); +static void call_resolver_next_after_locking(grpc_resolver* resolver, + grpc_channel_args** result, + grpc_closure* on_complete) { + next_args* a = static_cast<next_args*>(gpr_malloc(sizeof(*a))); a->resolver = resolver; a->result = result; a->on_complete = on_complete; @@ -136,7 +137,7 @@ static void call_resolver_next_after_locking(grpc_resolver *resolver, GRPC_ERROR_NONE); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); @@ -144,10 +145,10 @@ int main(int argc, char **argv) { g_combiner = grpc_combiner_create(); grpc_resolve_address = my_resolve_address; grpc_dns_lookup_ares = my_dns_lookup_ares; - grpc_channel_args *result = (grpc_channel_args *)1; + grpc_channel_args* result = (grpc_channel_args*)1; - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_resolver *resolver = create_resolver("dns:test"); + ExecCtx _local_exec_ctx; + grpc_resolver* resolver = create_resolver("dns:test"); gpr_event ev1; gpr_event_init(&ev1); call_resolver_next_after_locking( diff --git a/test/core/client_channel/resolvers/dns_resolver_test.c b/test/core/client_channel/resolvers/dns_resolver_test.cc index 3717d0efd7..8b40360263 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.c +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -25,13 +25,13 @@ #include "src/core/lib/iomgr/combiner.h" #include "test/core/util/test_config.h" -static grpc_combiner *g_combiner; +static grpc_combiner* g_combiner; -static void test_succeeds(grpc_resolver_factory *factory, const char *string) { - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(string, 0); +static void test_succeeds(grpc_resolver_factory* factory, const char* string) { + ExecCtx _local_exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; - grpc_resolver *resolver; + grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, factory->vtable->scheme); GPR_ASSERT(uri); @@ -45,11 +45,11 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { grpc_exec_ctx_finish(); } -static void test_fails(grpc_resolver_factory *factory, const char *string) { - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(string, 0); +static void test_fails(grpc_resolver_factory* factory, const char* string) { + ExecCtx _local_exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; - grpc_resolver *resolver; + grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, factory->vtable->scheme); GPR_ASSERT(uri); @@ -62,8 +62,8 @@ static void test_fails(grpc_resolver_factory *factory, const char *string) { grpc_exec_ctx_finish(); } -int main(int argc, char **argv) { - grpc_resolver_factory *dns; +int main(int argc, char** argv) { + grpc_resolver_factory* dns; grpc_test_init(argc, argv); grpc_init(); @@ -82,7 +82,7 @@ int main(int argc, char **argv) { grpc_resolver_factory_unref(dns); { - exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); grpc_exec_ctx_finish(); } diff --git a/test/core/client_channel/resolvers/fake_resolver_test.c b/test/core/client_channel/resolvers/fake_resolver_test.cc index 8cc5fc6ce5..ec49558f87 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.c +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -32,10 +32,10 @@ #include "test/core/util/test_config.h" -static grpc_resolver *build_fake_resolver( - grpc_combiner *combiner, - grpc_fake_resolver_response_generator *response_generator) { - grpc_resolver_factory *factory = grpc_resolver_factory_lookup("fake"); +static grpc_resolver* build_fake_resolver( + grpc_combiner* combiner, + grpc_fake_resolver_response_generator* response_generator) { + grpc_resolver_factory* factory = grpc_resolver_factory_lookup("fake"); grpc_arg generator_arg = grpc_fake_resolver_response_generator_arg(response_generator); grpc_resolver_args args; @@ -43,49 +43,49 @@ static grpc_resolver *build_fake_resolver( grpc_channel_args channel_args = {1, &generator_arg}; args.args = &channel_args; args.combiner = combiner; - grpc_resolver *resolver = + grpc_resolver* resolver = grpc_resolver_factory_create_resolver(factory, &args); grpc_resolver_factory_unref(factory); return resolver; } typedef struct on_resolution_arg { - grpc_channel_args *resolver_result; - grpc_channel_args *expected_resolver_result; + grpc_channel_args* resolver_result; + grpc_channel_args* expected_resolver_result; gpr_event ev; } on_resolution_arg; -void on_resolution_cb(void *arg, grpc_error *error) { - on_resolution_arg *res = arg; +void on_resolution_cb(void* arg, grpc_error* error) { + on_resolution_arg* res = static_cast<on_resolution_arg*>(arg); // We only check the addresses channel arg because that's the only one // explicitly set by the test via // grpc_fake_resolver_response_generator_set_response. - const grpc_lb_addresses *actual_lb_addresses = + const grpc_lb_addresses* actual_lb_addresses = grpc_lb_addresses_find_channel_arg(res->resolver_result); - const grpc_lb_addresses *expected_lb_addresses = + const grpc_lb_addresses* expected_lb_addresses = grpc_lb_addresses_find_channel_arg(res->expected_resolver_result); GPR_ASSERT( grpc_lb_addresses_cmp(actual_lb_addresses, expected_lb_addresses) == 0); grpc_channel_args_destroy(res->resolver_result); grpc_channel_args_destroy(res->expected_resolver_result); - gpr_event_set(&res->ev, (void *)1); + gpr_event_set(&res->ev, (void*)1); } static void test_fake_resolver() { - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_combiner *combiner = grpc_combiner_create(); + ExecCtx _local_exec_ctx; + grpc_combiner* combiner = grpc_combiner_create(); // Create resolver. - grpc_fake_resolver_response_generator *response_generator = + grpc_fake_resolver_response_generator* response_generator = grpc_fake_resolver_response_generator_create(); - grpc_resolver *resolver = build_fake_resolver(combiner, response_generator); + grpc_resolver* resolver = build_fake_resolver(combiner, response_generator); GPR_ASSERT(resolver != NULL); // Setup expectations. - grpc_uri *uris[] = {grpc_uri_parse("ipv4:10.2.1.1:1234", true), + grpc_uri* uris[] = {grpc_uri_parse("ipv4:10.2.1.1:1234", true), grpc_uri_parse("ipv4:127.0.0.1:4321", true)}; - char *balancer_names[] = {"name1", "name2"}; + const char* balancer_names[] = {"name1", "name2"}; const bool is_balancer[] = {true, false}; - grpc_lb_addresses *addresses = grpc_lb_addresses_create(3, NULL); + grpc_lb_addresses* addresses = grpc_lb_addresses_create(3, NULL); for (size_t i = 0; i < GPR_ARRAY_SIZE(uris); ++i) { grpc_lb_addresses_set_address_from_uri( addresses, i, uris[i], is_balancer[i], balancer_names[i], NULL); @@ -93,14 +93,14 @@ static void test_fake_resolver() { } const grpc_arg addresses_arg = grpc_lb_addresses_create_channel_arg(addresses); - grpc_channel_args *results = + grpc_channel_args* results = grpc_channel_args_copy_and_add(NULL, &addresses_arg, 1); grpc_lb_addresses_destroy(addresses); on_resolution_arg on_res_arg; memset(&on_res_arg, 0, sizeof(on_res_arg)); on_res_arg.expected_resolver_result = results; gpr_event_init(&on_res_arg.ev); - grpc_closure *on_resolution = GRPC_CLOSURE_CREATE( + grpc_closure* on_resolution = GRPC_CLOSURE_CREATE( on_resolution_cb, &on_res_arg, grpc_combiner_scheduler(combiner)); // Set resolver results and trigger first resolution. on_resolution_cb @@ -114,10 +114,10 @@ static void test_fake_resolver() { grpc_timeout_seconds_to_deadline(5)) != NULL); // Setup update. - grpc_uri *uris_update[] = {grpc_uri_parse("ipv4:192.168.1.0:31416", true)}; - char *balancer_names_update[] = {"name3"}; + grpc_uri* uris_update[] = {grpc_uri_parse("ipv4:192.168.1.0:31416", true)}; + const char* balancer_names_update[] = {"name3"}; const bool is_balancer_update[] = {false}; - grpc_lb_addresses *addresses_update = grpc_lb_addresses_create(1, NULL); + grpc_lb_addresses* addresses_update = grpc_lb_addresses_create(1, NULL); for (size_t i = 0; i < GPR_ARRAY_SIZE(uris_update); ++i) { grpc_lb_addresses_set_address_from_uri(addresses_update, i, uris_update[i], is_balancer_update[i], @@ -127,7 +127,7 @@ static void test_fake_resolver() { grpc_arg addresses_update_arg = grpc_lb_addresses_create_channel_arg(addresses_update); - grpc_channel_args *results_update = + grpc_channel_args* results_update = grpc_channel_args_copy_and_add(NULL, &addresses_update_arg, 1); grpc_lb_addresses_destroy(addresses_update); @@ -164,7 +164,7 @@ static void test_fake_resolver() { grpc_fake_resolver_response_generator_unref(response_generator); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); grpc_init(); diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.c b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index e69c68141b..dbc8a965d5 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.c +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -28,23 +28,23 @@ #include "test/core/util/test_config.h" -static grpc_combiner *g_combiner; +static grpc_combiner* g_combiner; typedef struct on_resolution_arg { - char *expected_server_name; - grpc_channel_args *resolver_result; + char* expected_server_name; + grpc_channel_args* resolver_result; } on_resolution_arg; -void on_resolution_cb(void *arg, grpc_error *error) { - on_resolution_arg *res = arg; +void on_resolution_cb(void* arg, grpc_error* error) { + on_resolution_arg* res = static_cast<on_resolution_arg*>(arg); grpc_channel_args_destroy(res->resolver_result); } -static void test_succeeds(grpc_resolver_factory *factory, const char *string) { - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(string, 0); +static void test_succeeds(grpc_resolver_factory* factory, const char* string) { + ExecCtx _local_exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; - grpc_resolver *resolver; + grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be valid for '%s'", string, factory->vtable->scheme); GPR_ASSERT(uri); @@ -57,7 +57,7 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { on_resolution_arg on_res_arg; memset(&on_res_arg, 0, sizeof(on_res_arg)); on_res_arg.expected_server_name = uri->path; - grpc_closure *on_resolution = GRPC_CLOSURE_CREATE( + grpc_closure* on_resolution = GRPC_CLOSURE_CREATE( on_resolution_cb, &on_res_arg, grpc_schedule_on_exec_ctx); grpc_resolver_next_locked(resolver, &on_res_arg.resolver_result, @@ -67,11 +67,11 @@ static void test_succeeds(grpc_resolver_factory *factory, const char *string) { grpc_uri_destroy(uri); } -static void test_fails(grpc_resolver_factory *factory, const char *string) { - exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_uri *uri = grpc_uri_parse(string, 0); +static void test_fails(grpc_resolver_factory* factory, const char* string) { + ExecCtx _local_exec_ctx; + grpc_uri* uri = grpc_uri_parse(string, 0); grpc_resolver_args args; - grpc_resolver *resolver; + grpc_resolver* resolver; gpr_log(GPR_DEBUG, "test: '%s' should be invalid for '%s'", string, factory->vtable->scheme); GPR_ASSERT(uri); @@ -84,7 +84,7 @@ static void test_fails(grpc_resolver_factory *factory, const char *string) { grpc_exec_ctx_finish(); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_resolver_factory *ipv4, *ipv6; grpc_test_init(argc, argv); grpc_init(); @@ -112,7 +112,7 @@ int main(int argc, char **argv) { grpc_resolver_factory_unref(ipv6); { - exec_ctx = GRPC_EXEC_CTX_INIT; + ExecCtx _local_exec_ctx; GRPC_COMBINER_UNREF(g_combiner, "test"); grpc_exec_ctx_finish(); } |