diff options
Diffstat (limited to 'test/core/slice')
-rw-r--r-- | test/core/slice/BUILD | 32 | ||||
-rw-r--r-- | test/core/slice/b64_test.cc (renamed from test/core/slice/b64_test.c) | 0 | ||||
-rw-r--r-- | test/core/slice/percent_decode_fuzzer.cc (renamed from test/core/slice/percent_decode_fuzzer.c) | 2 | ||||
-rw-r--r-- | test/core/slice/percent_encode_fuzzer.cc (renamed from test/core/slice/percent_encode_fuzzer.c) | 2 | ||||
-rw-r--r-- | test/core/slice/percent_encoding_test.cc (renamed from test/core/slice/percent_encoding_test.c) | 0 | ||||
-rw-r--r-- | test/core/slice/slice_buffer_test.cc (renamed from test/core/slice/slice_buffer_test.c) | 0 | ||||
-rw-r--r-- | test/core/slice/slice_hash_table_test.cc (renamed from test/core/slice/slice_hash_table_test.c) | 14 | ||||
-rw-r--r-- | test/core/slice/slice_string_helpers_test.cc (renamed from test/core/slice/slice_string_helpers_test.c) | 3 | ||||
-rw-r--r-- | test/core/slice/slice_test.cc (renamed from test/core/slice/slice_test.c) | 4 |
9 files changed, 30 insertions, 27 deletions
diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index ad2308a4d6..ba2b553e0b 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -22,8 +22,8 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "percent_encode_fuzzer", - srcs = ["percent_encode_fuzzer.c"], - language = "C", + srcs = ["percent_encode_fuzzer.cc"], + language = "C++", corpus = "percent_encode_corpus", deps = [ "//:gpr", @@ -34,8 +34,8 @@ grpc_fuzzer( grpc_fuzzer( name = "percent_decode_fuzzer", - srcs = ["percent_decode_fuzzer.c"], - language = "C", + srcs = ["percent_decode_fuzzer.cc"], + language = "C++", corpus = "percent_decode_corpus", deps = [ "//:gpr", @@ -46,8 +46,8 @@ grpc_fuzzer( grpc_cc_test( name = "percent_encoding_test", - srcs = ["percent_encoding_test.c"], - language = "C", + srcs = ["percent_encoding_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -58,15 +58,15 @@ grpc_cc_test( grpc_cc_test( name = "slice_test", - srcs = ["slice_test.c"], + srcs = ["slice_test.cc"], deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"], - language = "C", + language = "C++", ) grpc_cc_test( name = "slice_string_helpers_test", - srcs = ["slice_string_helpers_test.c"], - language = "C", + srcs = ["slice_string_helpers_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -77,22 +77,22 @@ grpc_cc_test( grpc_cc_test( name = "slice_buffer_test", - srcs = ["slice_buffer_test.c"], + srcs = ["slice_buffer_test.cc"], deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"], - language = "C", + language = "C++", ) grpc_cc_test( name = "slice_hash_table_test", - srcs = ["slice_hash_table_test.c"], + srcs = ["slice_hash_table_test.cc"], deps = ["//:grpc", "//test/core/util:grpc_test_util", "//:gpr", "//test/core/util:gpr_test_util"], - language = "C", + language = "C++", ) grpc_cc_test( name = "b64_test", - srcs = ["b64_test.c"], - language = "C", + srcs = ["b64_test.cc"], + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/slice/b64_test.c b/test/core/slice/b64_test.cc index 479198f9f9..479198f9f9 100644 --- a/test/core/slice/b64_test.c +++ b/test/core/slice/b64_test.cc diff --git a/test/core/slice/percent_decode_fuzzer.c b/test/core/slice/percent_decode_fuzzer.cc index e6458736d3..3603177c47 100644 --- a/test/core/slice/percent_decode_fuzzer.c +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -29,7 +29,7 @@ bool squelch = true; bool leak_check = true; -int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { struct grpc_memory_counters counters; grpc_memory_counters_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); diff --git a/test/core/slice/percent_encode_fuzzer.c b/test/core/slice/percent_encode_fuzzer.cc index 776a998e51..c8e3849fc8 100644 --- a/test/core/slice/percent_encode_fuzzer.c +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -51,7 +51,7 @@ static void test(const uint8_t* data, size_t size, const uint8_t* dict) { GPR_ASSERT(counters.total_size_relative == 0); } -int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { test(data, size, grpc_url_percent_encoding_unreserved_bytes); test(data, size, grpc_compatible_percent_encoding_unreserved_bytes); return 0; diff --git a/test/core/slice/percent_encoding_test.c b/test/core/slice/percent_encoding_test.cc index 253240faad..253240faad 100644 --- a/test/core/slice/percent_encoding_test.c +++ b/test/core/slice/percent_encoding_test.cc diff --git a/test/core/slice/slice_buffer_test.c b/test/core/slice/slice_buffer_test.cc index 338e8079dc..338e8079dc 100644 --- a/test/core/slice/slice_buffer_test.c +++ b/test/core/slice/slice_buffer_test.cc diff --git a/test/core/slice/slice_hash_table_test.c b/test/core/slice/slice_hash_table_test.cc index f3689aac64..a2006b3c10 100644 --- a/test/core/slice/slice_hash_table_test.c +++ b/test/core/slice/slice_hash_table_test.cc @@ -28,8 +28,8 @@ #include "test/core/util/test_config.h" typedef struct { - char* key; - char* value; + const char* key; + const char* value; } test_entry; static void populate_entries(const test_entry* input, size_t num_entries, @@ -44,7 +44,8 @@ static void check_values(const test_entry* input, size_t num_entries, grpc_slice_hash_table* table) { for (size_t i = 0; i < num_entries; ++i) { grpc_slice key = grpc_slice_from_static_string(input[i].key); - char* actual = grpc_slice_hash_table_get(table, key); + const char* actual = + static_cast<const char*>(grpc_slice_hash_table_get(table, key)); GPR_ASSERT(actual != NULL); GPR_ASSERT(strcmp(actual, input[i].value) == 0); grpc_slice_unref(key); @@ -67,7 +68,8 @@ static grpc_slice_hash_table* create_table_from_entries( int (*value_cmp_fn)(void*, void*)) { // Construct table. grpc_slice_hash_table_entry* entries = - gpr_zalloc(sizeof(*entries) * num_test_entries); + static_cast<grpc_slice_hash_table_entry*>( + gpr_zalloc(sizeof(*entries) * num_test_entries)); populate_entries(test_entries, num_test_entries, entries); grpc_slice_hash_table* table = grpc_slice_hash_table_create( num_test_entries, entries, destroy_string, value_cmp_fn); @@ -125,8 +127,8 @@ static void test_slice_hash_table() { } static int value_cmp_fn(void* a, void* b) { - const char* a_str = a; - const char* b_str = b; + const char* a_str = static_cast<const char*>(a); + const char* b_str = static_cast<const char*>(b); return strcmp(a_str, b_str); } diff --git a/test/core/slice/slice_string_helpers_test.c b/test/core/slice/slice_string_helpers_test.cc index 7378735326..260f8c80d5 100644 --- a/test/core/slice/slice_string_helpers_test.c +++ b/test/core/slice/slice_string_helpers_test.cc @@ -67,7 +67,8 @@ static void test_strsplit(void) { LOG_TEST_NAME("test_strsplit"); - parts = gpr_malloc(sizeof(grpc_slice_buffer)); + parts = + static_cast<grpc_slice_buffer*>(gpr_malloc(sizeof(grpc_slice_buffer))); grpc_slice_buffer_init(parts); str = grpc_slice_from_copied_string("one, two, three, four"); diff --git a/test/core/slice/slice_test.c b/test/core/slice/slice_test.cc index 0a069c9ef9..aec5636376 100644 --- a/test/core/slice/slice_test.c +++ b/test/core/slice/slice_test.cc @@ -43,8 +43,8 @@ static void test_slice_malloc_returns_something_sensible(void) { slice = grpc_slice_malloc(length); /* If there is a length, slice.data must be non-NULL. If length is zero we don't care. */ - if (length) { - GPR_ASSERT(GRPC_SLICE_START_PTR(slice)); + if (length > GRPC_SLICE_INLINED_SIZE) { + GPR_ASSERT(slice.data.refcounted.bytes); } /* Returned slice length must be what was requested. */ GPR_ASSERT(GRPC_SLICE_LENGTH(slice) == length); |