From 34a57d0346afe95e11104462c30dc468b0cb0b89 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 23 Oct 2017 15:33:21 -0700 Subject: rename all test core files to cc and a lot of C++ style conversions --- test/core/compression/algorithm_test.c | 97 ------- test/core/compression/algorithm_test.cc | 100 +++++++ test/core/compression/compression_test.c | 214 --------------- test/core/compression/compression_test.cc | 220 +++++++++++++++ test/core/compression/message_compress_test.c | 320 ---------------------- test/core/compression/message_compress_test.cc | 330 +++++++++++++++++++++++ test/core/compression/stream_compression_test.c | 297 -------------------- test/core/compression/stream_compression_test.cc | 298 ++++++++++++++++++++ 8 files changed, 948 insertions(+), 928 deletions(-) delete mode 100644 test/core/compression/algorithm_test.c create mode 100644 test/core/compression/algorithm_test.cc delete mode 100644 test/core/compression/compression_test.c create mode 100644 test/core/compression/compression_test.cc delete mode 100644 test/core/compression/message_compress_test.c create mode 100644 test/core/compression/message_compress_test.cc delete mode 100644 test/core/compression/stream_compression_test.c create mode 100644 test/core/compression/stream_compression_test.cc (limited to 'test/core/compression') diff --git a/test/core/compression/algorithm_test.c b/test/core/compression/algorithm_test.c deleted file mode 100644 index a11e6e90ac..0000000000 --- a/test/core/compression/algorithm_test.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/core/lib/compression/algorithm_metadata.h" - -#include -#include - -#include -#include -#include - -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/transport/static_metadata.h" -#include "test/core/util/test_config.h" - -static void test_algorithm_mesh(void) { - int i; - - gpr_log(GPR_DEBUG, "test_algorithm_mesh"); - - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - const char *name; - grpc_compression_algorithm parsed; - grpc_slice mdstr; - grpc_mdelem mdelem; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT( - grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); - GPR_ASSERT(grpc_compression_algorithm_parse( - grpc_slice_from_static_string(name), &parsed)); - GPR_ASSERT((int)parsed == i); - mdstr = grpc_slice_from_copied_string(name); - GPR_ASSERT(grpc_slice_eq(mdstr, grpc_compression_algorithm_slice(parsed))); - GPR_ASSERT(parsed == grpc_compression_algorithm_from_slice(mdstr)); - mdelem = grpc_compression_encoding_mdelem(parsed); - GPR_ASSERT(grpc_slice_eq(GRPC_MDVALUE(mdelem), mdstr)); - GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); - grpc_slice_unref_internal(&exec_ctx, mdstr); - GRPC_MDELEM_UNREF(&exec_ctx, mdelem); - grpc_exec_ctx_finish(&exec_ctx); - } - - /* test failure */ - GPR_ASSERT(GRPC_MDISNULL( - grpc_compression_encoding_mdelem(GRPC_COMPRESS_ALGORITHMS_COUNT))); -} - -static void test_algorithm_failure(void) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_slice mdstr; - - gpr_log(GPR_DEBUG, "test_algorithm_failure"); - - GPR_ASSERT(grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT, - NULL) == 0); - GPR_ASSERT(grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT + 1, - NULL) == 0); - mdstr = grpc_slice_from_static_string("this-is-an-invalid-algorithm"); - GPR_ASSERT(grpc_compression_algorithm_from_slice(mdstr) == - GRPC_COMPRESS_ALGORITHMS_COUNT); - GPR_ASSERT(grpc_slice_eq( - grpc_compression_algorithm_slice(GRPC_COMPRESS_ALGORITHMS_COUNT), - grpc_empty_slice())); - GPR_ASSERT(grpc_slice_eq( - grpc_compression_algorithm_slice(GRPC_COMPRESS_ALGORITHMS_COUNT + 1), - grpc_empty_slice())); - grpc_slice_unref_internal(&exec_ctx, mdstr); - grpc_exec_ctx_finish(&exec_ctx); -} - -int main(int argc, char **argv) { - grpc_test_init(argc, argv); - grpc_init(); - - test_algorithm_mesh(); - test_algorithm_failure(); - - grpc_shutdown(); - - return 0; -} diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc new file mode 100644 index 0000000000..4ca979e30f --- /dev/null +++ b/test/core/compression/algorithm_test.cc @@ -0,0 +1,100 @@ +/* + * + * Copyright 2015 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include "src/core/lib/compression/algorithm_metadata.h" + +#include +#include + +#include +#include +#include + +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/transport/static_metadata.h" +#include "test/core/util/test_config.h" + +static void test_algorithm_mesh(void) { + int i; + + gpr_log(GPR_DEBUG, "test_algorithm_mesh"); + + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + const char *name; + grpc_compression_algorithm parsed; + grpc_slice mdstr; + grpc_mdelem mdelem; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT( + grpc_compression_algorithm_name((grpc_compression_algorithm)i, &name)); + GPR_ASSERT(grpc_compression_algorithm_parse( + grpc_slice_from_static_string(name), &parsed)); + GPR_ASSERT((int)parsed == i); + mdstr = grpc_slice_from_copied_string(name); + GPR_ASSERT(grpc_slice_eq(mdstr, grpc_compression_algorithm_slice(parsed))); + GPR_ASSERT(parsed == grpc_compression_algorithm_from_slice(mdstr)); + mdelem = grpc_compression_encoding_mdelem(parsed); + GPR_ASSERT(grpc_slice_eq(GRPC_MDVALUE(mdelem), mdstr)); + GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING)); + grpc_slice_unref_internal(&exec_ctx, mdstr); + GRPC_MDELEM_UNREF(&exec_ctx, mdelem); + grpc_exec_ctx_finish(&exec_ctx); + } + + /* test failure */ + GPR_ASSERT(GRPC_MDISNULL( + grpc_compression_encoding_mdelem(GRPC_COMPRESS_ALGORITHMS_COUNT))); +} + +static void test_algorithm_failure(void) { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_slice mdstr; + + gpr_log(GPR_DEBUG, "test_algorithm_failure"); + + GPR_ASSERT(grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT, + NULL) == 0); + GPR_ASSERT( + grpc_compression_algorithm_name(static_cast( + GRPC_COMPRESS_ALGORITHMS_COUNT + 1), + NULL) == 0); + mdstr = grpc_slice_from_static_string("this-is-an-invalid-algorithm"); + GPR_ASSERT(grpc_compression_algorithm_from_slice(mdstr) == + GRPC_COMPRESS_ALGORITHMS_COUNT); + GPR_ASSERT(grpc_slice_eq( + grpc_compression_algorithm_slice(GRPC_COMPRESS_ALGORITHMS_COUNT), + grpc_empty_slice())); + GPR_ASSERT(grpc_slice_eq( + grpc_compression_algorithm_slice(static_cast( + static_cast(GRPC_COMPRESS_ALGORITHMS_COUNT) + 1)), + grpc_empty_slice())); + grpc_slice_unref_internal(&exec_ctx, mdstr); + grpc_exec_ctx_finish(&exec_ctx); +} + +int main(int argc, char **argv) { + grpc_test_init(argc, argv); + grpc_init(); + + test_algorithm_mesh(); + test_algorithm_failure(); + + grpc_shutdown(); + + return 0; +} diff --git a/test/core/compression/compression_test.c b/test/core/compression/compression_test.c deleted file mode 100644 index 326a800300..0000000000 --- a/test/core/compression/compression_test.c +++ /dev/null @@ -1,214 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include - -#include -#include -#include -#include - -#include "test/core/util/test_config.h" - -static void test_compression_algorithm_parse(void) { - size_t i; - const char *valid_names[] = {"identity", "gzip", "deflate"}; - const grpc_compression_algorithm valid_algorithms[] = { - GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; - const char *invalid_names[] = {"gzip2", "foo", "", "2gzip"}; - - gpr_log(GPR_DEBUG, "test_compression_algorithm_parse"); - - for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) { - const char *valid_name = valid_names[i]; - grpc_compression_algorithm algorithm; - const int success = grpc_compression_algorithm_parse( - grpc_slice_from_static_string(valid_name), &algorithm); - GPR_ASSERT(success != 0); - GPR_ASSERT(algorithm == valid_algorithms[i]); - } - - for (i = 0; i < GPR_ARRAY_SIZE(invalid_names); i++) { - const char *invalid_name = invalid_names[i]; - grpc_compression_algorithm algorithm; - int success; - success = grpc_compression_algorithm_parse( - grpc_slice_from_static_string(invalid_name), &algorithm); - GPR_ASSERT(success == 0); - /* the value of "algorithm" is undefined upon failure */ - } -} - -static void test_compression_algorithm_name(void) { - int success; - const char *name; - size_t i; - const char *valid_names[] = {"identity", "gzip", "deflate"}; - const grpc_compression_algorithm valid_algorithms[] = { - GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; - - gpr_log(GPR_DEBUG, "test_compression_algorithm_name"); - - for (i = 0; i < GPR_ARRAY_SIZE(valid_algorithms); i++) { - success = grpc_compression_algorithm_name(valid_algorithms[i], &name); - GPR_ASSERT(success != 0); - GPR_ASSERT(strcmp(name, valid_names[i]) == 0); - } - - success = - grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT, &name); - GPR_ASSERT(success == 0); - /* the value of "name" is undefined upon failure */ -} - -static void test_compression_algorithm_for_level(void) { - gpr_log(GPR_DEBUG, "test_compression_algorithm_for_level"); - - { - /* accept only identity (aka none) */ - uint32_t accepted_encodings = 0; - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, - accepted_encodings)); - } - - { - /* accept only gzip */ - uint32_t accepted_encodings = 0; - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_GZIP); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_GZIP == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_GZIP == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_GZIP == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, - accepted_encodings)); - } - - { - /* accept only deflate */ - uint32_t accepted_encodings = 0; - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_DEFLATE); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_DEFLATE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_DEFLATE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_DEFLATE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, - accepted_encodings)); - } - - { - /* accept gzip and deflate */ - uint32_t accepted_encodings = 0; - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_GZIP); - GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_DEFLATE); - - GPR_ASSERT(GRPC_COMPRESS_NONE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_GZIP == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_DEFLATE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, - accepted_encodings)); - - GPR_ASSERT(GRPC_COMPRESS_DEFLATE == - grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, - accepted_encodings)); - } -} - -static void test_compression_enable_disable_algorithm(void) { - grpc_compression_options options; - grpc_compression_algorithm algorithm; - - gpr_log(GPR_DEBUG, "test_compression_enable_disable_algorithm"); - - grpc_compression_options_init(&options); - for (algorithm = GRPC_COMPRESS_NONE; - algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; algorithm++) { - /* all algorithms are enabled by default */ - GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, - algorithm) != 0); - } - /* disable one by one */ - for (algorithm = GRPC_COMPRESS_NONE; - algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; algorithm++) { - grpc_compression_options_disable_algorithm(&options, algorithm); - GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, - algorithm) == 0); - } - /* re-enable one by one */ - for (algorithm = GRPC_COMPRESS_NONE; - algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; algorithm++) { - grpc_compression_options_enable_algorithm(&options, algorithm); - GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, - algorithm) != 0); - } -} - -int main(int argc, char **argv) { - grpc_init(); - test_compression_algorithm_parse(); - test_compression_algorithm_name(); - test_compression_algorithm_for_level(); - test_compression_enable_disable_algorithm(); - grpc_shutdown(); - - return 0; -} diff --git a/test/core/compression/compression_test.cc b/test/core/compression/compression_test.cc new file mode 100644 index 0000000000..f4fa3a8d63 --- /dev/null +++ b/test/core/compression/compression_test.cc @@ -0,0 +1,220 @@ +/* + * + * Copyright 2015 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include + +#include +#include +#include +#include + +#include "test/core/util/test_config.h" + +static void test_compression_algorithm_parse(void) { + size_t i; + const char *valid_names[] = {"identity", "gzip", "deflate"}; + const grpc_compression_algorithm valid_algorithms[] = { + GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; + const char *invalid_names[] = {"gzip2", "foo", "", "2gzip"}; + + gpr_log(GPR_DEBUG, "test_compression_algorithm_parse"); + + for (i = 0; i < GPR_ARRAY_SIZE(valid_names); i++) { + const char *valid_name = valid_names[i]; + grpc_compression_algorithm algorithm; + const int success = grpc_compression_algorithm_parse( + grpc_slice_from_static_string(valid_name), &algorithm); + GPR_ASSERT(success != 0); + GPR_ASSERT(algorithm == valid_algorithms[i]); + } + + for (i = 0; i < GPR_ARRAY_SIZE(invalid_names); i++) { + const char *invalid_name = invalid_names[i]; + grpc_compression_algorithm algorithm; + int success; + success = grpc_compression_algorithm_parse( + grpc_slice_from_static_string(invalid_name), &algorithm); + GPR_ASSERT(success == 0); + /* the value of "algorithm" is undefined upon failure */ + } +} + +static void test_compression_algorithm_name(void) { + int success; + const char *name; + size_t i; + const char *valid_names[] = {"identity", "gzip", "deflate"}; + const grpc_compression_algorithm valid_algorithms[] = { + GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, GRPC_COMPRESS_DEFLATE}; + + gpr_log(GPR_DEBUG, "test_compression_algorithm_name"); + + for (i = 0; i < GPR_ARRAY_SIZE(valid_algorithms); i++) { + success = grpc_compression_algorithm_name(valid_algorithms[i], &name); + GPR_ASSERT(success != 0); + GPR_ASSERT(strcmp(name, valid_names[i]) == 0); + } + + success = + grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT, &name); + GPR_ASSERT(success == 0); + /* the value of "name" is undefined upon failure */ +} + +static void test_compression_algorithm_for_level(void) { + gpr_log(GPR_DEBUG, "test_compression_algorithm_for_level"); + + { + /* accept only identity (aka none) */ + uint32_t accepted_encodings = 0; + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, + accepted_encodings)); + } + + { + /* accept only gzip */ + uint32_t accepted_encodings = 0; + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_GZIP); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_GZIP == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_GZIP == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_GZIP == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, + accepted_encodings)); + } + + { + /* accept only deflate */ + uint32_t accepted_encodings = 0; + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_DEFLATE); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_DEFLATE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_DEFLATE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_DEFLATE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, + accepted_encodings)); + } + + { + /* accept gzip and deflate */ + uint32_t accepted_encodings = 0; + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_NONE); /* always */ + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_GZIP); + GPR_BITSET(&accepted_encodings, GRPC_COMPRESS_DEFLATE); + + GPR_ASSERT(GRPC_COMPRESS_NONE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_NONE, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_GZIP == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_LOW, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_DEFLATE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_MED, + accepted_encodings)); + + GPR_ASSERT(GRPC_COMPRESS_DEFLATE == + grpc_compression_algorithm_for_level(GRPC_COMPRESS_LEVEL_HIGH, + accepted_encodings)); + } +} + +static void test_compression_enable_disable_algorithm(void) { + grpc_compression_options options; + grpc_compression_algorithm algorithm; + + gpr_log(GPR_DEBUG, "test_compression_enable_disable_algorithm"); + + grpc_compression_options_init(&options); + for (algorithm = GRPC_COMPRESS_NONE; + algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; + algorithm = static_cast( + static_cast(algorithm) + 1)) { + /* all algorithms are enabled by default */ + GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, + algorithm) != 0); + } + /* disable one by one */ + for (algorithm = GRPC_COMPRESS_NONE; + algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; + algorithm = static_cast( + static_cast(algorithm) + 1)) { + grpc_compression_options_disable_algorithm(&options, algorithm); + GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, + algorithm) == 0); + } + /* re-enable one by one */ + for (algorithm = GRPC_COMPRESS_NONE; + algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT; + algorithm = static_cast( + static_cast(algorithm) + 1)) { + grpc_compression_options_enable_algorithm(&options, algorithm); + GPR_ASSERT(grpc_compression_options_is_algorithm_enabled(&options, + algorithm) != 0); + } +} + +int main(int argc, char **argv) { + grpc_init(); + test_compression_algorithm_parse(); + test_compression_algorithm_name(); + test_compression_algorithm_for_level(); + test_compression_enable_disable_algorithm(); + grpc_shutdown(); + + return 0; +} diff --git a/test/core/compression/message_compress_test.c b/test/core/compression/message_compress_test.c deleted file mode 100644 index f7f4893dee..0000000000 --- a/test/core/compression/message_compress_test.c +++ /dev/null @@ -1,320 +0,0 @@ -/* - * - * Copyright 2015 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include "src/core/lib/compression/message_compress.h" - -#include -#include - -#include -#include -#include - -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/support/murmur_hash.h" -#include "test/core/util/slice_splitter.h" -#include "test/core/util/test_config.h" - -typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; - -typedef enum { - SHOULD_NOT_COMPRESS, - SHOULD_COMPRESS, - MAYBE_COMPRESSES -} compressability; - -static void assert_passthrough(grpc_slice value, - grpc_compression_algorithm algorithm, - grpc_slice_split_mode uncompressed_split_mode, - grpc_slice_split_mode compressed_split_mode, - compressability compress_result_check) { - grpc_slice_buffer input; - grpc_slice_buffer compressed_raw; - grpc_slice_buffer compressed; - grpc_slice_buffer output; - grpc_slice final; - int was_compressed; - const char *algorithm_name; - - GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algorithm_name) != 0); - gpr_log( - GPR_INFO, "assert_passthrough: value_length=%" PRIuPTR - " value_hash=0x%08x " - "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", - GRPC_SLICE_LENGTH(value), gpr_murmur_hash3(GRPC_SLICE_START_PTR(value), - GRPC_SLICE_LENGTH(value), 0), - algorithm_name, grpc_slice_split_mode_name(uncompressed_split_mode), - grpc_slice_split_mode_name(compressed_split_mode)); - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&compressed_raw); - grpc_slice_buffer_init(&compressed); - grpc_slice_buffer_init(&output); - - grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); - - { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = - grpc_msg_compress(&exec_ctx, algorithm, &input, &compressed_raw); - grpc_exec_ctx_finish(&exec_ctx); - } - GPR_ASSERT(input.count > 0); - - switch (compress_result_check) { - case SHOULD_NOT_COMPRESS: - GPR_ASSERT(was_compressed == 0); - break; - case SHOULD_COMPRESS: - GPR_ASSERT(was_compressed == 1); - break; - case MAYBE_COMPRESSES: - /* no check */ - break; - } - - grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); - - { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(grpc_msg_decompress( - &exec_ctx, was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, - &output)); - grpc_exec_ctx_finish(&exec_ctx); - } - - final = grpc_slice_merge(output.slices, output.count); - GPR_ASSERT(grpc_slice_eq(value, final)); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&compressed); - grpc_slice_buffer_destroy(&compressed_raw); - grpc_slice_buffer_destroy(&output); - grpc_slice_unref(final); -} - -static grpc_slice repeated(char c, size_t length) { - grpc_slice out = grpc_slice_malloc(length); - memset(GRPC_SLICE_START_PTR(out), c, length); - return out; -} - -static compressability get_compressability( - test_value id, grpc_compression_algorithm algorithm) { - if (algorithm == GRPC_COMPRESS_NONE) return SHOULD_NOT_COMPRESS; - switch (id) { - case ONE_A: - return SHOULD_NOT_COMPRESS; - case ONE_KB_A: - case ONE_MB_A: - return SHOULD_COMPRESS; - case TEST_VALUE_COUNT: - abort(); - break; - } - return MAYBE_COMPRESSES; -} - -static grpc_slice create_test_value(test_value id) { - switch (id) { - case ONE_A: - return grpc_slice_from_copied_string("a"); - case ONE_KB_A: - return repeated('a', 1024); - case ONE_MB_A: - return repeated('a', 1024 * 1024); - case TEST_VALUE_COUNT: - abort(); - break; - } - return grpc_slice_from_copied_string("bad value"); -} - -static void test_tiny_data_compress(void) { - grpc_slice_buffer input; - grpc_slice_buffer output; - grpc_compression_algorithm i; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&output); - grpc_slice_buffer_add(&input, create_test_value(ONE_A)); - - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - if (i == GRPC_COMPRESS_NONE) continue; - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_compress(&exec_ctx, i, &input, &output)); - grpc_exec_ctx_finish(&exec_ctx); - GPR_ASSERT(1 == output.count); - } - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&output); -} - -static void test_bad_decompression_data_crc(void) { - grpc_slice_buffer input; - grpc_slice_buffer corrupted; - grpc_slice_buffer output; - size_t idx; - const uint32_t bad = 0xdeadbeef; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&corrupted); - grpc_slice_buffer_init(&output); - grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); - - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - /* compress it */ - grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_GZIP, &input, &corrupted); - /* corrupt the output by smashing the CRC */ - GPR_ASSERT(corrupted.count > 1); - GPR_ASSERT(GRPC_SLICE_LENGTH(corrupted.slices[1]) > 8); - idx = GRPC_SLICE_LENGTH(corrupted.slices[1]) - 8; - memcpy(GRPC_SLICE_START_PTR(corrupted.slices[1]) + idx, &bad, 4); - - /* try (and fail) to decompress the corrupted compresed buffer */ - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_GZIP, &corrupted, - &output)); - grpc_exec_ctx_finish(&exec_ctx); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&corrupted); - grpc_slice_buffer_destroy(&output); -} - -static void test_bad_decompression_data_trailing_garbage(void) { - grpc_slice_buffer input; - grpc_slice_buffer output; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&output); - /* append 0x99 to the end of an otherwise valid stream */ - grpc_slice_buffer_add( - &input, grpc_slice_from_copied_buffer( - "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); - - /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&output); -} - -static void test_bad_decompression_data_stream(void) { - grpc_slice_buffer input; - grpc_slice_buffer output; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&output); - grpc_slice_buffer_add(&input, - grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); - - /* try (and fail) to decompress the invalid compresed buffer */ - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, - &output)); - grpc_exec_ctx_finish(&exec_ctx); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&output); -} - -static void test_bad_compression_algorithm(void) { - grpc_slice_buffer input; - grpc_slice_buffer output; - int was_compressed; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&output); - grpc_slice_buffer_add( - &input, grpc_slice_from_copied_string("Never gonna give you up")); - - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_compressed = grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, - &input, &output); - GPR_ASSERT(0 == was_compressed); - - was_compressed = grpc_msg_compress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output); - GPR_ASSERT(0 == was_compressed); - grpc_exec_ctx_finish(&exec_ctx); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&output); -} - -static void test_bad_decompression_algorithm(void) { - grpc_slice_buffer input; - grpc_slice_buffer output; - int was_decompressed; - - grpc_slice_buffer_init(&input); - grpc_slice_buffer_init(&output); - grpc_slice_buffer_add(&input, - grpc_slice_from_copied_string( - "I'm not really compressed but it doesn't matter")); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - was_decompressed = grpc_msg_decompress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); - GPR_ASSERT(0 == was_decompressed); - - was_decompressed = grpc_msg_decompress( - &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT + 123, &input, &output); - GPR_ASSERT(0 == was_decompressed); - grpc_exec_ctx_finish(&exec_ctx); - - grpc_slice_buffer_destroy(&input); - grpc_slice_buffer_destroy(&output); -} - -int main(int argc, char **argv) { - unsigned i, j, k, m; - grpc_slice_split_mode uncompressed_split_modes[] = { - GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE}; - grpc_slice_split_mode compressed_split_modes[] = {GRPC_SLICE_SPLIT_MERGE_ALL, - GRPC_SLICE_SPLIT_IDENTITY, - GRPC_SLICE_SPLIT_ONE_BYTE}; - - grpc_test_init(argc, argv); - grpc_init(); - - for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { - for (j = 0; j < GPR_ARRAY_SIZE(uncompressed_split_modes); j++) { - for (k = 0; k < GPR_ARRAY_SIZE(compressed_split_modes); k++) { - for (m = 0; m < TEST_VALUE_COUNT; m++) { - grpc_slice slice = create_test_value(m); - assert_passthrough(slice, i, j, k, get_compressability(m, i)); - grpc_slice_unref(slice); - } - } - } - } - - test_tiny_data_compress(); - test_bad_decompression_data_crc(); - test_bad_decompression_data_stream(); - test_bad_decompression_data_trailing_garbage(); - test_bad_compression_algorithm(); - test_bad_decompression_algorithm(); - grpc_shutdown(); - - return 0; -} diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc new file mode 100644 index 0000000000..1395d42739 --- /dev/null +++ b/test/core/compression/message_compress_test.cc @@ -0,0 +1,330 @@ +/* + * + * Copyright 2015 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include "src/core/lib/compression/message_compress.h" + +#include +#include + +#include +#include +#include + +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/support/murmur_hash.h" +#include "test/core/util/slice_splitter.h" +#include "test/core/util/test_config.h" + +typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value; + +typedef enum { + SHOULD_NOT_COMPRESS, + SHOULD_COMPRESS, + MAYBE_COMPRESSES +} compressability; + +static void assert_passthrough(grpc_slice value, + grpc_compression_algorithm algorithm, + grpc_slice_split_mode uncompressed_split_mode, + grpc_slice_split_mode compressed_split_mode, + compressability compress_result_check) { + grpc_slice_buffer input; + grpc_slice_buffer compressed_raw; + grpc_slice_buffer compressed; + grpc_slice_buffer output; + grpc_slice final; + int was_compressed; + const char *algorithm_name; + + GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algorithm_name) != 0); + gpr_log( + GPR_INFO, "assert_passthrough: value_length=%" PRIuPTR + " value_hash=0x%08x " + "algorithm='%s' uncompressed_split='%s' compressed_split='%s'", + GRPC_SLICE_LENGTH(value), gpr_murmur_hash3(GRPC_SLICE_START_PTR(value), + GRPC_SLICE_LENGTH(value), 0), + algorithm_name, grpc_slice_split_mode_name(uncompressed_split_mode), + grpc_slice_split_mode_name(compressed_split_mode)); + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&compressed_raw); + grpc_slice_buffer_init(&compressed); + grpc_slice_buffer_init(&output); + + grpc_split_slices_to_buffer(uncompressed_split_mode, &value, 1, &input); + + { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = + grpc_msg_compress(&exec_ctx, algorithm, &input, &compressed_raw); + grpc_exec_ctx_finish(&exec_ctx); + } + GPR_ASSERT(input.count > 0); + + switch (compress_result_check) { + case SHOULD_NOT_COMPRESS: + GPR_ASSERT(was_compressed == 0); + break; + case SHOULD_COMPRESS: + GPR_ASSERT(was_compressed == 1); + break; + case MAYBE_COMPRESSES: + /* no check */ + break; + } + + grpc_split_slice_buffer(compressed_split_mode, &compressed_raw, &compressed); + + { + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(grpc_msg_decompress( + &exec_ctx, was_compressed ? algorithm : GRPC_COMPRESS_NONE, &compressed, + &output)); + grpc_exec_ctx_finish(&exec_ctx); + } + + final = grpc_slice_merge(output.slices, output.count); + GPR_ASSERT(grpc_slice_eq(value, final)); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&compressed); + grpc_slice_buffer_destroy(&compressed_raw); + grpc_slice_buffer_destroy(&output); + grpc_slice_unref(final); +} + +static grpc_slice repeated(char c, size_t length) { + grpc_slice out = grpc_slice_malloc(length); + memset(GRPC_SLICE_START_PTR(out), c, length); + return out; +} + +static compressability get_compressability( + test_value id, grpc_compression_algorithm algorithm) { + if (algorithm == GRPC_COMPRESS_NONE) return SHOULD_NOT_COMPRESS; + switch (id) { + case ONE_A: + return SHOULD_NOT_COMPRESS; + case ONE_KB_A: + case ONE_MB_A: + return SHOULD_COMPRESS; + case TEST_VALUE_COUNT: + abort(); + break; + } + return MAYBE_COMPRESSES; +} + +static grpc_slice create_test_value(test_value id) { + switch (id) { + case ONE_A: + return grpc_slice_from_copied_string("a"); + case ONE_KB_A: + return repeated('a', 1024); + case ONE_MB_A: + return repeated('a', 1024 * 1024); + case TEST_VALUE_COUNT: + abort(); + break; + } + return grpc_slice_from_copied_string("bad value"); +} + +static void test_tiny_data_compress(void) { + grpc_slice_buffer input; + grpc_slice_buffer output; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&output); + grpc_slice_buffer_add(&input, create_test_value(ONE_A)); + + for (int i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + if (i == GRPC_COMPRESS_NONE) continue; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_compress( + &exec_ctx, static_cast(i), + &input, &output)); + grpc_exec_ctx_finish(&exec_ctx); + GPR_ASSERT(1 == output.count); + } + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&output); +} + +static void test_bad_decompression_data_crc(void) { + grpc_slice_buffer input; + grpc_slice_buffer corrupted; + grpc_slice_buffer output; + size_t idx; + const uint32_t bad = 0xdeadbeef; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&corrupted); + grpc_slice_buffer_init(&output); + grpc_slice_buffer_add(&input, create_test_value(ONE_MB_A)); + + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + /* compress it */ + grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_GZIP, &input, &corrupted); + /* corrupt the output by smashing the CRC */ + GPR_ASSERT(corrupted.count > 1); + GPR_ASSERT(GRPC_SLICE_LENGTH(corrupted.slices[1]) > 8); + idx = GRPC_SLICE_LENGTH(corrupted.slices[1]) - 8; + memcpy(GRPC_SLICE_START_PTR(corrupted.slices[1]) + idx, &bad, 4); + + /* try (and fail) to decompress the corrupted compresed buffer */ + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_GZIP, &corrupted, + &output)); + grpc_exec_ctx_finish(&exec_ctx); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&corrupted); + grpc_slice_buffer_destroy(&output); +} + +static void test_bad_decompression_data_trailing_garbage(void) { + grpc_slice_buffer input; + grpc_slice_buffer output; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&output); + /* append 0x99 to the end of an otherwise valid stream */ + grpc_slice_buffer_add( + &input, grpc_slice_from_copied_buffer( + "\x78\xda\x63\x60\x60\x60\x00\x00\x00\x04\x00\x01\x99", 13)); + + /* try (and fail) to decompress the invalid compresed buffer */ + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, + &output)); + grpc_exec_ctx_finish(&exec_ctx); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&output); +} + +static void test_bad_decompression_data_stream(void) { + grpc_slice_buffer input; + grpc_slice_buffer output; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&output); + grpc_slice_buffer_add(&input, + grpc_slice_from_copied_buffer("\x78\xda\xff\xff", 4)); + + /* try (and fail) to decompress the invalid compresed buffer */ + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + GPR_ASSERT(0 == grpc_msg_decompress(&exec_ctx, GRPC_COMPRESS_DEFLATE, &input, + &output)); + grpc_exec_ctx_finish(&exec_ctx); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&output); +} + +static void test_bad_compression_algorithm(void) { + grpc_slice_buffer input; + grpc_slice_buffer output; + int was_compressed; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&output); + grpc_slice_buffer_add( + &input, grpc_slice_from_copied_string("Never gonna give you up")); + + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_compressed = grpc_msg_compress(&exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, + &input, &output); + GPR_ASSERT(0 == was_compressed); + + was_compressed = + grpc_msg_compress(&exec_ctx, static_cast( + GRPC_COMPRESS_ALGORITHMS_COUNT + 123), + &input, &output); + GPR_ASSERT(0 == was_compressed); + grpc_exec_ctx_finish(&exec_ctx); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&output); +} + +static void test_bad_decompression_algorithm(void) { + grpc_slice_buffer input; + grpc_slice_buffer output; + int was_decompressed; + + grpc_slice_buffer_init(&input); + grpc_slice_buffer_init(&output); + grpc_slice_buffer_add(&input, + grpc_slice_from_copied_string( + "I'm not really compressed but it doesn't matter")); + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + was_decompressed = grpc_msg_decompress( + &exec_ctx, GRPC_COMPRESS_ALGORITHMS_COUNT, &input, &output); + GPR_ASSERT(0 == was_decompressed); + + was_decompressed = + grpc_msg_decompress(&exec_ctx, static_cast( + GRPC_COMPRESS_ALGORITHMS_COUNT + 123), + &input, &output); + GPR_ASSERT(0 == was_decompressed); + grpc_exec_ctx_finish(&exec_ctx); + + grpc_slice_buffer_destroy(&input); + grpc_slice_buffer_destroy(&output); +} + +int main(int argc, char **argv) { + unsigned i, j, k, m; + grpc_slice_split_mode uncompressed_split_modes[] = { + GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE}; + grpc_slice_split_mode compressed_split_modes[] = {GRPC_SLICE_SPLIT_MERGE_ALL, + GRPC_SLICE_SPLIT_IDENTITY, + GRPC_SLICE_SPLIT_ONE_BYTE}; + + grpc_test_init(argc, argv); + grpc_init(); + + for (i = 0; i < GRPC_COMPRESS_ALGORITHMS_COUNT; i++) { + for (j = 0; j < GPR_ARRAY_SIZE(uncompressed_split_modes); j++) { + for (k = 0; k < GPR_ARRAY_SIZE(compressed_split_modes); k++) { + for (m = 0; m < TEST_VALUE_COUNT; m++) { + grpc_slice slice = create_test_value(static_cast(m)); + assert_passthrough( + slice, static_cast(i), + static_cast(j), + static_cast(k), + get_compressability(static_cast(m), + static_cast(i))); + grpc_slice_unref(slice); + } + } + } + } + + test_tiny_data_compress(); + test_bad_decompression_data_crc(); + test_bad_decompression_data_stream(); + test_bad_decompression_data_trailing_garbage(); + test_bad_compression_algorithm(); + test_bad_decompression_algorithm(); + grpc_shutdown(); + + return 0; +} diff --git a/test/core/compression/stream_compression_test.c b/test/core/compression/stream_compression_test.c deleted file mode 100644 index afed6cd6b5..0000000000 --- a/test/core/compression/stream_compression_test.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * - * Copyright 2017 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -#include -#include -#include -#include - -#include "src/core/lib/compression/stream_compression.h" - -static void generate_random_payload(char *payload, size_t size) { - size_t i; - static const char chars[] = "abcdefghijklmnopqrstuvwxyz1234567890"; - for (i = 0; i < size - 1; ++i) { - payload[i] = chars[rand() % (int)(sizeof(chars) - 1)]; - } - payload[size - 1] = '\0'; -} - -static bool slice_buffer_equals_string(grpc_slice_buffer *buf, - const char *str) { - size_t i; - if (buf->length != strlen(str)) { - return false; - } - size_t pointer = 0; - for (i = 0; i < buf->count; i++) { - size_t slice_len = GRPC_SLICE_LENGTH(buf->slices[i]); - if (0 != strncmp(str + pointer, - (char *)GRPC_SLICE_START_PTR(buf->slices[i]), slice_len)) { - return false; - } - pointer += slice_len; - } - return true; -} - -static void test_stream_compression_simple_compress_decompress() { - const char test_str[] = "aaaaaaabbbbbbbccccccctesttesttest"; - grpc_slice_buffer source, relay, sink; - grpc_slice_buffer_init(&source); - grpc_slice_buffer_init(&relay); - grpc_slice_buffer_init(&sink); - grpc_stream_compression_context *compress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - grpc_stream_compression_context *decompress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - grpc_slice slice = grpc_slice_from_static_string(test_str); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - bool end_of_context; - size_t output_size; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(output_size == sizeof(test_str) - 1); - grpc_stream_compression_context_destroy(compress_ctx); - grpc_stream_compression_context_destroy(decompress_ctx); - - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); - - grpc_slice_buffer_destroy(&source); - grpc_slice_buffer_destroy(&relay); - grpc_slice_buffer_destroy(&sink); -} - -static void -test_stream_compression_simple_compress_decompress_with_output_size_constraint() { - const char test_str[] = "aaaaaaabbbbbbbccccccctesttesttest"; - grpc_slice_buffer source, relay, sink; - grpc_slice_buffer_init(&source); - grpc_slice_buffer_init(&relay); - grpc_slice_buffer_init(&sink); - grpc_stream_compression_context *compress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - grpc_stream_compression_context *decompress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - grpc_slice slice = grpc_slice_from_static_string(test_str); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - grpc_stream_compression_context_destroy(compress_ctx); - - bool end_of_context; - size_t output_size; - size_t max_output_size = 2; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - max_output_size, &end_of_context)); - GPR_ASSERT(output_size == max_output_size); - GPR_ASSERT(end_of_context == false); - grpc_slice slice_recv = grpc_slice_buffer_take_first(&sink); - char *str_recv = (char *)GRPC_SLICE_START_PTR(slice_recv); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice_recv) == max_output_size); - GPR_ASSERT(0 == strncmp(test_str, str_recv, max_output_size)); - grpc_slice_unref(slice_recv); - - size_t remaining_size = sizeof(test_str) - 1 - max_output_size; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - remaining_size, &end_of_context)); - GPR_ASSERT(output_size == remaining_size); - GPR_ASSERT(end_of_context == true); - - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str + max_output_size)); - - grpc_stream_compression_context_destroy(decompress_ctx); - grpc_slice_buffer_destroy(&source); - grpc_slice_buffer_destroy(&relay); - grpc_slice_buffer_destroy(&sink); -} - -#define LARGE_DATA_SIZE (1024 * 1024) -static void -test_stream_compression_simple_compress_decompress_with_large_data() { - char *test_str = gpr_malloc(LARGE_DATA_SIZE * sizeof(char)); - generate_random_payload(test_str, LARGE_DATA_SIZE); - grpc_slice_buffer source, relay, sink; - grpc_slice_buffer_init(&source); - grpc_slice_buffer_init(&relay); - grpc_slice_buffer_init(&sink); - grpc_stream_compression_context *compress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - grpc_stream_compression_context *decompress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - grpc_slice slice = grpc_slice_from_static_string(test_str); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - bool end_of_context; - size_t output_size; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(output_size == LARGE_DATA_SIZE - 1); - grpc_stream_compression_context_destroy(compress_ctx); - grpc_stream_compression_context_destroy(decompress_ctx); - - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); - - grpc_slice_buffer_destroy(&source); - grpc_slice_buffer_destroy(&relay); - grpc_slice_buffer_destroy(&sink); - gpr_free(test_str); -} - -static void test_stream_compression_drop_context() { - const char test_str[] = "aaaaaaabbbbbbbccccccc"; - const char test_str2[] = "dddddddeeeeeeefffffffggggg"; - grpc_slice_buffer source, relay, sink; - grpc_slice_buffer_init(&source); - grpc_slice_buffer_init(&relay); - grpc_slice_buffer_init(&sink); - grpc_stream_compression_context *compress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - grpc_slice slice = grpc_slice_from_static_string(test_str); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - grpc_stream_compression_context_destroy(compress_ctx); - - compress_ctx = grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - slice = grpc_slice_from_static_string(test_str2); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - grpc_stream_compression_context_destroy(compress_ctx); - - /* Concatenate the two compressed sliced into one to test decompressing two - * contexts */ - grpc_slice slice1 = grpc_slice_buffer_take_first(&relay); - grpc_slice slice2 = grpc_slice_buffer_take_first(&relay); - grpc_slice slice3 = - grpc_slice_malloc(GRPC_SLICE_LENGTH(slice1) + GRPC_SLICE_LENGTH(slice2)); - memcpy(GRPC_SLICE_START_PTR(slice3), GRPC_SLICE_START_PTR(slice1), - GRPC_SLICE_LENGTH(slice1)); - memcpy(GRPC_SLICE_START_PTR(slice3) + GRPC_SLICE_LENGTH(slice1), - GRPC_SLICE_START_PTR(slice2), GRPC_SLICE_LENGTH(slice2)); - grpc_slice_unref(slice1); - grpc_slice_unref(slice2); - grpc_slice_buffer_add(&relay, slice3); - - grpc_stream_compression_context *decompress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - bool end_of_context; - size_t output_size; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(end_of_context == true); - GPR_ASSERT(output_size == sizeof(test_str) - 1); - - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); - grpc_stream_compression_context_destroy(decompress_ctx); - grpc_slice_buffer_destroy(&sink); - - grpc_slice_buffer_init(&sink); - decompress_ctx = grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(end_of_context == true); - GPR_ASSERT(output_size == sizeof(test_str2) - 1); - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str2)); - grpc_stream_compression_context_destroy(decompress_ctx); - - grpc_slice_buffer_destroy(&source); - grpc_slice_buffer_destroy(&relay); - grpc_slice_buffer_destroy(&sink); -} - -static void test_stream_compression_sync_flush() { - const char test_str[] = "aaaaaaabbbbbbbccccccc"; - const char test_str2[] = "dddddddeeeeeeefffffffggggg"; - grpc_slice_buffer source, relay, sink; - grpc_slice_buffer_init(&source); - grpc_slice_buffer_init(&relay); - grpc_slice_buffer_init(&sink); - grpc_stream_compression_context *compress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); - grpc_slice slice = grpc_slice_from_static_string(test_str); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_SYNC)); - - grpc_stream_compression_context *decompress_ctx = - grpc_stream_compression_context_create( - GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); - bool end_of_context; - size_t output_size; - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(end_of_context == false); - GPR_ASSERT(output_size == sizeof(test_str) - 1); - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); - grpc_slice_buffer_destroy(&sink); - - grpc_slice_buffer_init(&sink); - slice = grpc_slice_from_static_string(test_str2); - grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, - ~(size_t)0, - GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); - grpc_stream_compression_context_destroy(compress_ctx); - - GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, - ~(size_t)0, &end_of_context)); - GPR_ASSERT(end_of_context == true); - GPR_ASSERT(output_size == sizeof(test_str2) - 1); - GPR_ASSERT(slice_buffer_equals_string(&sink, test_str2)); - grpc_stream_compression_context_destroy(decompress_ctx); - - grpc_slice_buffer_destroy(&source); - grpc_slice_buffer_destroy(&relay); - grpc_slice_buffer_destroy(&sink); -} - -int main(int argc, char **argv) { - grpc_init(); - test_stream_compression_simple_compress_decompress(); - test_stream_compression_simple_compress_decompress_with_output_size_constraint(); - test_stream_compression_simple_compress_decompress_with_large_data(); - test_stream_compression_sync_flush(); - test_stream_compression_drop_context(); - grpc_shutdown(); - - return 0; -} diff --git a/test/core/compression/stream_compression_test.cc b/test/core/compression/stream_compression_test.cc new file mode 100644 index 0000000000..d136408710 --- /dev/null +++ b/test/core/compression/stream_compression_test.cc @@ -0,0 +1,298 @@ +/* + * + * Copyright 2017 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +#include +#include +#include +#include + +#include "src/core/lib/compression/stream_compression.h" + +static void generate_random_payload(char *payload, size_t size) { + size_t i; + static const char chars[] = "abcdefghijklmnopqrstuvwxyz1234567890"; + for (i = 0; i < size - 1; ++i) { + payload[i] = chars[rand() % (int)(sizeof(chars) - 1)]; + } + payload[size - 1] = '\0'; +} + +static bool slice_buffer_equals_string(grpc_slice_buffer *buf, + const char *str) { + size_t i; + if (buf->length != strlen(str)) { + return false; + } + size_t pointer = 0; + for (i = 0; i < buf->count; i++) { + size_t slice_len = GRPC_SLICE_LENGTH(buf->slices[i]); + if (0 != strncmp(str + pointer, + (char *)GRPC_SLICE_START_PTR(buf->slices[i]), slice_len)) { + return false; + } + pointer += slice_len; + } + return true; +} + +static void test_stream_compression_simple_compress_decompress() { + const char test_str[] = "aaaaaaabbbbbbbccccccctesttesttest"; + grpc_slice_buffer source, relay, sink; + grpc_slice_buffer_init(&source); + grpc_slice_buffer_init(&relay); + grpc_slice_buffer_init(&sink); + grpc_stream_compression_context *compress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_stream_compression_context *decompress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + grpc_slice slice = grpc_slice_from_static_string(test_str); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + bool end_of_context; + size_t output_size; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(output_size == sizeof(test_str) - 1); + grpc_stream_compression_context_destroy(compress_ctx); + grpc_stream_compression_context_destroy(decompress_ctx); + + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); + + grpc_slice_buffer_destroy(&source); + grpc_slice_buffer_destroy(&relay); + grpc_slice_buffer_destroy(&sink); +} + +static void +test_stream_compression_simple_compress_decompress_with_output_size_constraint() { + const char test_str[] = "aaaaaaabbbbbbbccccccctesttesttest"; + grpc_slice_buffer source, relay, sink; + grpc_slice_buffer_init(&source); + grpc_slice_buffer_init(&relay); + grpc_slice_buffer_init(&sink); + grpc_stream_compression_context *compress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_stream_compression_context *decompress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + grpc_slice slice = grpc_slice_from_static_string(test_str); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + grpc_stream_compression_context_destroy(compress_ctx); + + bool end_of_context; + size_t output_size; + size_t max_output_size = 2; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + max_output_size, &end_of_context)); + GPR_ASSERT(output_size == max_output_size); + GPR_ASSERT(end_of_context == false); + grpc_slice slice_recv = grpc_slice_buffer_take_first(&sink); + char *str_recv = (char *)GRPC_SLICE_START_PTR(slice_recv); + GPR_ASSERT(GRPC_SLICE_LENGTH(slice_recv) == max_output_size); + GPR_ASSERT(0 == strncmp(test_str, str_recv, max_output_size)); + grpc_slice_unref(slice_recv); + + size_t remaining_size = sizeof(test_str) - 1 - max_output_size; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + remaining_size, &end_of_context)); + GPR_ASSERT(output_size == remaining_size); + GPR_ASSERT(end_of_context == true); + + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str + max_output_size)); + + grpc_stream_compression_context_destroy(decompress_ctx); + grpc_slice_buffer_destroy(&source); + grpc_slice_buffer_destroy(&relay); + grpc_slice_buffer_destroy(&sink); +} + +#define LARGE_DATA_SIZE (1024 * 1024) +static void +test_stream_compression_simple_compress_decompress_with_large_data() { + char *test_str = + static_cast(gpr_malloc(LARGE_DATA_SIZE * sizeof(char))); + generate_random_payload(test_str, LARGE_DATA_SIZE); + grpc_slice_buffer source, relay, sink; + grpc_slice_buffer_init(&source); + grpc_slice_buffer_init(&relay); + grpc_slice_buffer_init(&sink); + grpc_stream_compression_context *compress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_stream_compression_context *decompress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + grpc_slice slice = grpc_slice_from_static_string(test_str); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + bool end_of_context; + size_t output_size; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(output_size == LARGE_DATA_SIZE - 1); + grpc_stream_compression_context_destroy(compress_ctx); + grpc_stream_compression_context_destroy(decompress_ctx); + + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); + + grpc_slice_buffer_destroy(&source); + grpc_slice_buffer_destroy(&relay); + grpc_slice_buffer_destroy(&sink); + gpr_free(test_str); +} + +static void test_stream_compression_drop_context() { + const char test_str[] = "aaaaaaabbbbbbbccccccc"; + const char test_str2[] = "dddddddeeeeeeefffffffggggg"; + grpc_slice_buffer source, relay, sink; + grpc_slice_buffer_init(&source); + grpc_slice_buffer_init(&relay); + grpc_slice_buffer_init(&sink); + grpc_stream_compression_context *compress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_slice slice = grpc_slice_from_static_string(test_str); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + grpc_stream_compression_context_destroy(compress_ctx); + + compress_ctx = grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + slice = grpc_slice_from_static_string(test_str2); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + grpc_stream_compression_context_destroy(compress_ctx); + + /* Concatenate the two compressed sliced into one to test decompressing two + * contexts */ + grpc_slice slice1 = grpc_slice_buffer_take_first(&relay); + grpc_slice slice2 = grpc_slice_buffer_take_first(&relay); + grpc_slice slice3 = + grpc_slice_malloc(GRPC_SLICE_LENGTH(slice1) + GRPC_SLICE_LENGTH(slice2)); + memcpy(GRPC_SLICE_START_PTR(slice3), GRPC_SLICE_START_PTR(slice1), + GRPC_SLICE_LENGTH(slice1)); + memcpy(GRPC_SLICE_START_PTR(slice3) + GRPC_SLICE_LENGTH(slice1), + GRPC_SLICE_START_PTR(slice2), GRPC_SLICE_LENGTH(slice2)); + grpc_slice_unref(slice1); + grpc_slice_unref(slice2); + grpc_slice_buffer_add(&relay, slice3); + + grpc_stream_compression_context *decompress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + bool end_of_context; + size_t output_size; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(end_of_context == true); + GPR_ASSERT(output_size == sizeof(test_str) - 1); + + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); + grpc_stream_compression_context_destroy(decompress_ctx); + grpc_slice_buffer_destroy(&sink); + + grpc_slice_buffer_init(&sink); + decompress_ctx = grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(end_of_context == true); + GPR_ASSERT(output_size == sizeof(test_str2) - 1); + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str2)); + grpc_stream_compression_context_destroy(decompress_ctx); + + grpc_slice_buffer_destroy(&source); + grpc_slice_buffer_destroy(&relay); + grpc_slice_buffer_destroy(&sink); +} + +static void test_stream_compression_sync_flush() { + const char test_str[] = "aaaaaaabbbbbbbccccccc"; + const char test_str2[] = "dddddddeeeeeeefffffffggggg"; + grpc_slice_buffer source, relay, sink; + grpc_slice_buffer_init(&source); + grpc_slice_buffer_init(&relay); + grpc_slice_buffer_init(&sink); + grpc_stream_compression_context *compress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_slice slice = grpc_slice_from_static_string(test_str); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_SYNC)); + + grpc_stream_compression_context *decompress_ctx = + grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + bool end_of_context; + size_t output_size; + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(end_of_context == false); + GPR_ASSERT(output_size == sizeof(test_str) - 1); + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str)); + grpc_slice_buffer_destroy(&sink); + + grpc_slice_buffer_init(&sink); + slice = grpc_slice_from_static_string(test_str2); + grpc_slice_buffer_add(&source, slice); + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + ~(size_t)0, + GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); + grpc_stream_compression_context_destroy(compress_ctx); + + GPR_ASSERT(grpc_stream_decompress(decompress_ctx, &relay, &sink, &output_size, + ~(size_t)0, &end_of_context)); + GPR_ASSERT(end_of_context == true); + GPR_ASSERT(output_size == sizeof(test_str2) - 1); + GPR_ASSERT(slice_buffer_equals_string(&sink, test_str2)); + grpc_stream_compression_context_destroy(decompress_ctx); + + grpc_slice_buffer_destroy(&source); + grpc_slice_buffer_destroy(&relay); + grpc_slice_buffer_destroy(&sink); +} + +int main(int argc, char **argv) { + grpc_init(); + test_stream_compression_simple_compress_decompress(); + test_stream_compression_simple_compress_decompress_with_output_size_constraint(); + test_stream_compression_simple_compress_decompress_with_large_data(); + test_stream_compression_sync_flush(); + test_stream_compression_drop_context(); + grpc_shutdown(); + + return 0; +} -- cgit v1.2.3 From e5863246272f5e15d17f74606f6357c6aef24e6e Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 30 Oct 2017 17:52:07 -0700 Subject: BUILD files changes for bazel --- test/core/backoff/BUILD | 2 +- test/core/census/BUILD | 8 ++--- test/core/channel/BUILD | 6 ++-- test/core/client_channel/BUILD | 4 +-- test/core/client_channel/lb_policies_test.cc | 4 +-- test/core/client_channel/resolvers/BUILD | 8 ++--- test/core/compression/BUILD | 6 ++-- test/core/fling/BUILD | 8 ++--- test/core/handshake/BUILD | 4 +-- test/core/http/BUILD | 10 +++--- test/core/iomgr/BUILD | 42 +++++++++++----------- test/core/json/BUILD | 10 +++--- test/core/nanopb/BUILD | 4 +-- test/core/network_benchmarks/BUILD | 2 +- .../core/network_benchmarks/low_level_ping_pong.cc | 12 ++++--- test/core/security/BUILD | 20 +++++------ test/core/slice/BUILD | 16 ++++----- test/core/support/BUILD | 36 +++++++++---------- test/core/surface/BUILD | 24 ++++++------- test/core/transport/BUILD | 12 +++---- test/core/transport/chttp2/BUILD | 18 +++++----- test/core/tsi/BUILD | 8 ++--- test/core/util/BUILD | 24 ++++++------- 23 files changed, 146 insertions(+), 142 deletions(-) (limited to 'test/core/compression') diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD index 4ae762007c..97a08aecd0 100644 --- a/test/core/backoff/BUILD +++ b/test/core/backoff/BUILD @@ -25,7 +25,7 @@ package( grpc_cc_test( name = "backoff_test", - srcs = ["backoff_test.c"], + srcs = ["backoff_test.cc"], language = "C", deps = [ "//:grpc", diff --git a/test/core/census/BUILD b/test/core/census/BUILD index 24fd2807d0..52d0b772d1 100644 --- a/test/core/census/BUILD +++ b/test/core/census/BUILD @@ -20,7 +20,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "context_test", - srcs = ["context_test.c"], + srcs = ["context_test.cc"], language = "C", deps = [ "//:gpr", @@ -32,7 +32,7 @@ grpc_cc_test( grpc_cc_test( name = "mlog_test", - srcs = ["mlog_test.c"], + srcs = ["mlog_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "resource_test", - srcs = ["resource_test.c"], + srcs = ["resource_test.cc"], language = "C", data = [ ":data/resource_empty_name.pb", @@ -64,7 +64,7 @@ grpc_cc_test( grpc_cc_test( name = "trace_context_test", - srcs = ["trace_context_test.c"], + srcs = ["trace_context_test.cc"], language = "C", data = [ ":data/context_empty.pb", diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index 5ac77c449b..14e45bf3c7 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -20,7 +20,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "channel_args_test", - srcs = ["channel_args_test.c"], + srcs = ["channel_args_test.cc"], language = "C", deps = [ "//:gpr", @@ -32,7 +32,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_stack_test", - srcs = ["channel_stack_test.c"], + srcs = ["channel_stack_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_stack_builder_test", - srcs = ["channel_stack_builder_test.c"], + srcs = ["channel_stack_builder_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD index c4a93238f2..75628413c5 100644 --- a/test/core/client_channel/BUILD +++ b/test/core/client_channel/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "uri_fuzzer_test", - srcs = ["uri_fuzzer_test.c"], + srcs = ["uri_fuzzer_test.cc"], language = "C", corpus = "uri_corpus", deps = [ @@ -34,7 +34,7 @@ grpc_fuzzer( grpc_cc_test( name = "lb_policies_test", - srcs = ["lb_policies_test.c"], + srcs = ["lb_policies_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/client_channel/lb_policies_test.cc b/test/core/client_channel/lb_policies_test.cc index aa0e1ba14d..25b896697e 100644 --- a/test/core/client_channel/lb_policies_test.cc +++ b/test/core/client_channel/lb_policies_test.cc @@ -234,8 +234,8 @@ static request_sequences request_sequences_create(size_t n) { res.n = n; res.connections = static_cast(gpr_malloc(sizeof(*res.connections) * n)); - res.connectivity_states = - static_cast(gpr_malloc(sizeof(*res.connectivity_states) * n)); + res.connectivity_states = static_cast( + gpr_malloc(sizeof(*res.connectivity_states) * n)); memset(res.connections, 0, sizeof(*res.connections) * n); memset(res.connectivity_states, 0, sizeof(*res.connectivity_states) * n); return res; diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index 0907e06623..ae3ce0b257 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -20,7 +20,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "dns_resolver_connectivity_test", - srcs = ["dns_resolver_connectivity_test.c"], + srcs = ["dns_resolver_connectivity_test.cc"], language = "C", deps = [ "//:gpr", @@ -32,7 +32,7 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_test", - srcs = ["dns_resolver_test.c"], + srcs = ["dns_resolver_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_resolver_test", - srcs = ["sockaddr_resolver_test.c"], + srcs = ["sockaddr_resolver_test.cc"], language = "C", deps = [ "//:gpr", @@ -56,7 +56,7 @@ grpc_cc_test( grpc_cc_test( name = "fake_resolver_test", - srcs = ["fake_resolver_test.c"], + srcs = ["fake_resolver_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/compression/BUILD b/test/core/compression/BUILD index 1ab6e35f0d..60453fc036 100644 --- a/test/core/compression/BUILD +++ b/test/core/compression/BUILD @@ -20,7 +20,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "algorithm_test", - srcs = ["algorithm_test.c"], + srcs = ["algorithm_test.cc"], language = "C", deps = [ "//:gpr", @@ -32,7 +32,7 @@ grpc_cc_test( grpc_cc_test( name = "compression_test", - srcs = ["compression_test.c"], + srcs = ["compression_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "message_compress_test", - srcs = ["message_compress_test.c"], + srcs = ["message_compress_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/fling/BUILD b/test/core/fling/BUILD index 27b2b5bec6..beacae7a75 100644 --- a/test/core/fling/BUILD +++ b/test/core/fling/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_cc_binary( name = "client", testonly = 1, - srcs = ["client.c"], + srcs = ["client.cc"], language = "C", deps = [ "//:gpr", @@ -37,7 +37,7 @@ grpc_cc_binary( grpc_cc_binary( name = "server", testonly = 1, - srcs = ["server.c"], + srcs = ["server.cc"], language = "C", deps = [ "//:gpr", @@ -50,7 +50,7 @@ grpc_cc_binary( grpc_cc_test( name = "fling", - srcs = ["fling_test.c"], + srcs = ["fling_test.cc"], data = [ ":client", ":server", @@ -66,7 +66,7 @@ grpc_cc_test( grpc_cc_test( name = "fling_stream", - srcs = ["fling_stream_test.c"], + srcs = ["fling_stream_test.cc"], data = [ ":client", ":server", diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index 8e462cfc5b..a2ac501927 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -20,7 +20,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "client_ssl", - srcs = ["client_ssl.c"], + srcs = ["client_ssl.cc"], language = "C", data = [ "//src/core/tsi/test_creds:ca.pem", @@ -37,7 +37,7 @@ grpc_cc_test( grpc_cc_test( name = "server_ssl", - srcs = ["server_ssl.c"], + srcs = ["server_ssl.cc"], language = "C", data = [ "//src/core/tsi/test_creds:ca.pem", diff --git a/test/core/http/BUILD b/test/core/http/BUILD index fffdac5e08..4dbba73f31 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "response_fuzzer", - srcs = ["response_fuzzer.c"], + srcs = ["response_fuzzer.cc"], language = "C", corpus = "response_corpus", deps = [ @@ -34,7 +34,7 @@ grpc_fuzzer( grpc_fuzzer( name = "request_fuzzer", - srcs = ["request_fuzzer.c"], + srcs = ["request_fuzzer.cc"], language = "C", corpus = "request_corpus", deps = [ @@ -64,7 +64,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_cc_test( name = "httpcli_test", - srcs = ["httpcli_test.c"], + srcs = ["httpcli_test.cc"], language = "C", data = ["test_server.py"], deps = [ @@ -78,7 +78,7 @@ grpc_cc_test( grpc_cc_test( name = "httpscli_test", - srcs = ["httpscli_test.c"], + srcs = ["httpscli_test.cc"], language = "C", data = ["test_server.py"], deps = [ @@ -92,7 +92,7 @@ grpc_cc_test( grpc_cc_test( name = "parser_test", - srcs = ["parser_test.c"], + srcs = ["parser_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 7620d1de21..b4490e7a5f 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -22,7 +22,7 @@ grpc_package(name = "test/core/iomgr", visibility = "public") # Useful for third grpc_cc_library( name = "endpoint_tests", - srcs = ["endpoint_tests.c"], + srcs = ["endpoint_tests.cc"], hdrs = ["endpoint_tests.h"], language = "C", visibility = ["//test:__subpackages__"], @@ -36,7 +36,7 @@ grpc_cc_library( grpc_cc_test( name = "combiner_test", - srcs = ["combiner_test.c"], + srcs = ["combiner_test.cc"], language = "C", deps = [ "//:gpr", @@ -48,7 +48,7 @@ grpc_cc_test( grpc_cc_test( name = "endpoint_pair_test", - srcs = ["endpoint_pair_test.c"], + srcs = ["endpoint_pair_test.cc"], language = "C", deps = [ ":endpoint_tests", @@ -61,7 +61,7 @@ grpc_cc_test( grpc_cc_test( name = "ev_epollsig_linux_test", - srcs = ["ev_epollsig_linux_test.c"], + srcs = ["ev_epollsig_linux_test.cc"], deps = [ "//:gpr", "//:grpc", @@ -73,7 +73,7 @@ grpc_cc_test( grpc_cc_test( name = "fd_conservation_posix_test", - srcs = ["fd_conservation_posix_test.c"], + srcs = ["fd_conservation_posix_test.cc"], language = "C", deps = [ "//:gpr", @@ -85,7 +85,7 @@ grpc_cc_test( grpc_cc_test( name = "fd_posix_test", - srcs = ["fd_posix_test.c"], + srcs = ["fd_posix_test.cc"], language = "C", deps = [ "//:gpr", @@ -97,7 +97,7 @@ grpc_cc_test( grpc_cc_test( name = "load_file_test", - srcs = ["load_file_test.c"], + srcs = ["load_file_test.cc"], language = "C", deps = [ "//:gpr", @@ -109,7 +109,7 @@ grpc_cc_test( grpc_cc_test( name = "pollset_set_test", - srcs = ["pollset_set_test.c"], + srcs = ["pollset_set_test.cc"], language = "C", deps = [ "//:gpr", @@ -121,7 +121,7 @@ grpc_cc_test( grpc_cc_test( name = "resolve_address_posix_test", - srcs = ["resolve_address_posix_test.c"], + srcs = ["resolve_address_posix_test.cc"], language = "C", deps = [ "//:gpr", @@ -133,7 +133,7 @@ grpc_cc_test( grpc_cc_test( name = "resolve_address_test", - srcs = ["resolve_address_test.c"], + srcs = ["resolve_address_test.cc"], language = "C", deps = [ "//:gpr", @@ -145,7 +145,7 @@ grpc_cc_test( grpc_cc_test( name = "resource_quota_test", - srcs = ["resource_quota_test.c"], + srcs = ["resource_quota_test.cc"], language = "C", deps = [ "//:gpr", @@ -157,7 +157,7 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_utils_test", - srcs = ["sockaddr_utils_test.c"], + srcs = ["sockaddr_utils_test.cc"], language = "C", deps = [ "//:gpr", @@ -169,7 +169,7 @@ grpc_cc_test( grpc_cc_test( name = "socket_utils_test", - srcs = ["socket_utils_test.c"], + srcs = ["socket_utils_test.cc"], language = "C", deps = [ "//:gpr", @@ -181,7 +181,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_client_posix_test", - srcs = ["tcp_client_posix_test.c"], + srcs = ["tcp_client_posix_test.cc"], language = "C", deps = [ "//:gpr", @@ -193,7 +193,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_posix_test", - srcs = ["tcp_posix_test.c"], + srcs = ["tcp_posix_test.cc"], language = "C", deps = [ ":endpoint_tests", @@ -206,7 +206,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_server_posix_test", - srcs = ["tcp_server_posix_test.c"], + srcs = ["tcp_server_posix_test.cc"], language = "C", deps = [ "//:gpr", @@ -218,7 +218,7 @@ grpc_cc_test( grpc_cc_test( name = "time_averaged_stats_test", - srcs = ["time_averaged_stats_test.c"], + srcs = ["time_averaged_stats_test.cc"], language = "C", deps = [ "//:gpr", @@ -230,7 +230,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_heap_test", - srcs = ["timer_heap_test.c"], + srcs = ["timer_heap_test.cc"], language = "C", deps = [ "//:gpr", @@ -242,7 +242,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_list_test", - srcs = ["timer_list_test.c"], + srcs = ["timer_list_test.cc"], language = "C", deps = [ "//:gpr", @@ -254,7 +254,7 @@ grpc_cc_test( grpc_cc_test( name = "udp_server_test", - srcs = ["udp_server_test.c"], + srcs = ["udp_server_test.cc"], language = "C", deps = [ "//:gpr", @@ -266,7 +266,7 @@ grpc_cc_test( grpc_cc_test( name = "wakeup_fd_cv_test", - srcs = ["wakeup_fd_cv_test.c"], + srcs = ["wakeup_fd_cv_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/json/BUILD b/test/core/json/BUILD index 3ff7918677..6e92fdc069 100644 --- a/test/core/json/BUILD +++ b/test/core/json/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "json_fuzzer", - srcs = ["fuzzer.c"], + srcs = ["fuzzer.cc"], language = "C", corpus = "corpus", deps = [ @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_cc_binary( name = "json_rewrite", testonly = 1, - srcs = ["json_rewrite.c"], + srcs = ["json_rewrite.cc"], language = "C", deps = [ "//:gpr", @@ -47,7 +47,7 @@ grpc_cc_binary( grpc_cc_test( name = "json_rewrite_test", - srcs = ["json_rewrite_test.c"], + srcs = ["json_rewrite_test.cc"], language = "C", data = [ "rewrite_test_input.json", @@ -65,7 +65,7 @@ grpc_cc_test( grpc_cc_test( name = "json_stream_error_test", - srcs = ["json_stream_error_test.c"], + srcs = ["json_stream_error_test.cc"], language = "C", deps = [ "//:gpr", @@ -77,7 +77,7 @@ grpc_cc_test( grpc_cc_test( name = "json_test", - srcs = ["json_test.c"], + srcs = ["json_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/nanopb/BUILD b/test/core/nanopb/BUILD index f332207e2d..a814cd3411 100644 --- a/test/core/nanopb/BUILD +++ b/test/core/nanopb/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "fuzzer_response", - srcs = ["fuzzer_response.c"], + srcs = ["fuzzer_response.cc"], language = "C", corpus = "corpus_response", deps = [ @@ -34,7 +34,7 @@ grpc_fuzzer( grpc_fuzzer( name = "fuzzer_serverlist", - srcs = ["fuzzer_serverlist.c"], + srcs = ["fuzzer_serverlist.cc"], language = "C", corpus = "corpus_serverlist", deps = [ diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD index 0e15393030..0db3ad7940 100644 --- a/test/core/network_benchmarks/BUILD +++ b/test/core/network_benchmarks/BUILD @@ -22,7 +22,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_binary( name = "low_level_ping_pong", - srcs = ["low_level_ping_pong.c"], + srcs = ["low_level_ping_pong.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index acd84aaa09..8aed0bccbd 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -594,8 +594,10 @@ static int run_all_benchmarks(size_t msg_size) { test_strategy *strategy = &test_strategies[i]; size_t j; for (j = 0; j < GPR_ARRAY_SIZE(socket_types); ++j) { - thread_args *client_args = static_cast(gpr_malloc(sizeof(thread_args))); - thread_args *server_args = static_cast(gpr_malloc(sizeof(thread_args))); + thread_args *client_args = + static_cast(gpr_malloc(sizeof(thread_args))); + thread_args *server_args = + static_cast(gpr_malloc(sizeof(thread_args))); char *socket_type = socket_types[j]; client_args->read_bytes = strategy->read_strategy; @@ -618,8 +620,10 @@ static int run_all_benchmarks(size_t msg_size) { } int main(int argc, char **argv) { - thread_args *client_args = static_cast(gpr_malloc(sizeof(thread_args))); - thread_args *server_args = static_cast(gpr_malloc(sizeof(thread_args))); + thread_args *client_args = + static_cast(gpr_malloc(sizeof(thread_args))); + thread_args *server_args = + static_cast(gpr_malloc(sizeof(thread_args))); int msg_size = -1; const char *read_strategy = NULL; const char *socket_type = NULL; diff --git a/test/core/security/BUILD b/test/core/security/BUILD index 83b1747648..e771465be2 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "ssl_server_fuzzer", - srcs = ["ssl_server_fuzzer.c"], + srcs = ["ssl_server_fuzzer.cc"], language = "C", corpus = "corpus", deps = [ @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_cc_library( name = "oauth2_utils", - srcs = ["oauth2_utils.c"], + srcs = ["oauth2_utils.cc"], hdrs = ["oauth2_utils.h"], language = "C", deps = ["//:grpc"], @@ -44,7 +44,7 @@ grpc_cc_library( grpc_cc_test( name = "auth_context_test", - srcs = ["auth_context_test.c"], + srcs = ["auth_context_test.cc"], language = "C", deps = [ "//:gpr", @@ -56,7 +56,7 @@ grpc_cc_test( grpc_cc_test( name = "credentials_test", - srcs = ["credentials_test.c"], + srcs = ["credentials_test.cc"], language = "C", deps = [ "//:gpr", @@ -68,7 +68,7 @@ grpc_cc_test( grpc_cc_test( name = "secure_endpoint_test", - srcs = ["secure_endpoint_test.c"], + srcs = ["secure_endpoint_test.cc"], language = "C", deps = [ "//:gpr", @@ -81,7 +81,7 @@ grpc_cc_test( grpc_cc_test( name = "security_connector_test", - srcs = ["security_connector_test.c"], + srcs = ["security_connector_test.cc"], language = "C", deps = [ "//:gpr", @@ -93,7 +93,7 @@ grpc_cc_test( grpc_cc_test( name = "ssl_credentials_test", - srcs = ["ssl_credentials_test.c"], + srcs = ["ssl_credentials_test.cc"], language = "C", deps = [ "//:gpr", @@ -105,7 +105,7 @@ grpc_cc_test( grpc_cc_binary( name = "create_jwt", - srcs = ["create_jwt.c"], + srcs = ["create_jwt.cc"], language = "C", deps = [ "//:gpr", @@ -115,7 +115,7 @@ grpc_cc_binary( grpc_cc_binary( name = "fetch_oauth2", - srcs = ["fetch_oauth2.c"], + srcs = ["fetch_oauth2.cc"], language = "C", deps = [ ":oauth2_utils", @@ -126,7 +126,7 @@ grpc_cc_binary( grpc_cc_binary( name = "verify_jwt", - srcs = ["verify_jwt.c"], + srcs = ["verify_jwt.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index ad2308a4d6..d7bcc37f6b 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "percent_encode_fuzzer", - srcs = ["percent_encode_fuzzer.c"], + srcs = ["percent_encode_fuzzer.cc"], language = "C", corpus = "percent_encode_corpus", deps = [ @@ -34,7 +34,7 @@ grpc_fuzzer( grpc_fuzzer( name = "percent_decode_fuzzer", - srcs = ["percent_decode_fuzzer.c"], + srcs = ["percent_decode_fuzzer.cc"], language = "C", corpus = "percent_decode_corpus", deps = [ @@ -46,7 +46,7 @@ grpc_fuzzer( grpc_cc_test( name = "percent_encoding_test", - srcs = ["percent_encoding_test.c"], + srcs = ["percent_encoding_test.cc"], language = "C", deps = [ "//:gpr", @@ -58,14 +58,14 @@ 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", ) grpc_cc_test( name = "slice_string_helpers_test", - srcs = ["slice_string_helpers_test.c"], + srcs = ["slice_string_helpers_test.cc"], language = "C", deps = [ "//:gpr", @@ -77,21 +77,21 @@ 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", ) 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", ) grpc_cc_test( name = "b64_test", - srcs = ["b64_test.c"], + srcs = ["b64_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/support/BUILD b/test/core/support/BUILD index 3bdc1c4186..c1edb7ee8a 100644 --- a/test/core/support/BUILD +++ b/test/core/support/BUILD @@ -20,7 +20,7 @@ grpc_package(name = "test/core/support") grpc_cc_test( name = "alloc_test", - srcs = ["alloc_test.c"], + srcs = ["alloc_test.cc"], language = "C", deps = [ "//:gpr", @@ -30,7 +30,7 @@ grpc_cc_test( grpc_cc_test( name = "avl_test", - srcs = ["avl_test.c"], + srcs = ["avl_test.cc"], language = "C", deps = [ "//:gpr", @@ -40,7 +40,7 @@ grpc_cc_test( grpc_cc_test( name = "cmdline_test", - srcs = ["cmdline_test.c"], + srcs = ["cmdline_test.cc"], language = "C", deps = [ "//:gpr", @@ -50,7 +50,7 @@ grpc_cc_test( grpc_cc_test( name = "cpu_test", - srcs = ["cpu_test.c"], + srcs = ["cpu_test.cc"], language = "C", deps = [ "//:gpr", @@ -60,7 +60,7 @@ grpc_cc_test( grpc_cc_test( name = "env_test", - srcs = ["env_test.c"], + srcs = ["env_test.cc"], language = "C", deps = [ "//:gpr", @@ -70,7 +70,7 @@ grpc_cc_test( grpc_cc_test( name = "histogram_test", - srcs = ["histogram_test.c"], + srcs = ["histogram_test.cc"], language = "C", deps = [ "//:gpr", @@ -80,7 +80,7 @@ grpc_cc_test( grpc_cc_test( name = "host_port_test", - srcs = ["host_port_test.c"], + srcs = ["host_port_test.cc"], language = "C", deps = [ "//:gpr", @@ -90,7 +90,7 @@ grpc_cc_test( grpc_cc_test( name = "log_test", - srcs = ["log_test.c"], + srcs = ["log_test.cc"], language = "C", deps = [ "//:gpr", @@ -100,7 +100,7 @@ grpc_cc_test( grpc_cc_test( name = "mpscq_test", - srcs = ["mpscq_test.c"], + srcs = ["mpscq_test.cc"], language = "C", deps = [ "//:gpr", @@ -110,7 +110,7 @@ grpc_cc_test( grpc_cc_test( name = "murmur_hash_test", - srcs = ["murmur_hash_test.c"], + srcs = ["murmur_hash_test.cc"], language = "C", deps = [ "//:gpr", @@ -120,7 +120,7 @@ grpc_cc_test( grpc_cc_test( name = "stack_lockfree_test", - srcs = ["stack_lockfree_test.c"], + srcs = ["stack_lockfree_test.cc"], language = "C", deps = [ "//:gpr", @@ -130,7 +130,7 @@ grpc_cc_test( grpc_cc_test( name = "string_test", - srcs = ["string_test.c"], + srcs = ["string_test.cc"], language = "C", deps = [ "//:gpr", @@ -140,7 +140,7 @@ grpc_cc_test( grpc_cc_test( name = "spinlock_test", - srcs = ["spinlock_test.c"], + srcs = ["spinlock_test.cc"], language = "C", deps = [ "//:gpr", @@ -150,7 +150,7 @@ grpc_cc_test( grpc_cc_test( name = "sync_test", - srcs = ["sync_test.c"], + srcs = ["sync_test.cc"], language = "C", deps = [ "//:gpr", @@ -160,7 +160,7 @@ grpc_cc_test( grpc_cc_test( name = "thd_test", - srcs = ["thd_test.c"], + srcs = ["thd_test.cc"], language = "C", deps = [ "//:gpr", @@ -170,7 +170,7 @@ grpc_cc_test( grpc_cc_test( name = "time_test", - srcs = ["time_test.c"], + srcs = ["time_test.cc"], language = "C", deps = [ "//:gpr", @@ -180,7 +180,7 @@ grpc_cc_test( grpc_cc_test( name = "tls_test", - srcs = ["tls_test.c"], + srcs = ["tls_test.cc"], language = "C", deps = [ "//:gpr", @@ -190,7 +190,7 @@ grpc_cc_test( grpc_cc_test( name = "useful_test", - srcs = ["useful_test.c"], + srcs = ["useful_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD index 17db7737f7..3514278113 100644 --- a/test/core/surface/BUILD +++ b/test/core/surface/BUILD @@ -20,7 +20,7 @@ grpc_package(name = "test/core/surface") grpc_cc_test( name = "alarm_test", - srcs = ["alarm_test.c"], + srcs = ["alarm_test.cc"], language = "C", deps = [ "//:gpr", @@ -32,7 +32,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_byte_buffer_reader_test", - srcs = ["byte_buffer_reader_test.c"], + srcs = ["byte_buffer_reader_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_create_test", - srcs = ["channel_create_test.c"], + srcs = ["channel_create_test.cc"], language = "C", deps = [ "//:gpr", @@ -56,7 +56,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_completion_queue_test", - srcs = ["completion_queue_test.c"], + srcs = ["completion_queue_test.cc"], language = "C", deps = [ "//:gpr", @@ -68,7 +68,7 @@ grpc_cc_test( grpc_cc_test( name = "concurrent_connectivity_test", - srcs = ["concurrent_connectivity_test.c"], + srcs = ["concurrent_connectivity_test.cc"], language = "C", deps = [ "//:gpr", @@ -80,7 +80,7 @@ grpc_cc_test( grpc_cc_test( name = "init_test", - srcs = ["init_test.c"], + srcs = ["init_test.cc"], language = "C", deps = [ "//:gpr", @@ -92,7 +92,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_invalid_channel_args_test", - srcs = ["invalid_channel_args_test.c"], + srcs = ["invalid_channel_args_test.cc"], language = "C", deps = [ "//:gpr", @@ -104,7 +104,7 @@ grpc_cc_test( grpc_cc_test( name = "lame_client_test", - srcs = ["lame_client_test.c"], + srcs = ["lame_client_test.cc"], language = "C", deps = [ "//:gpr", @@ -129,7 +129,7 @@ grpc_cc_test( grpc_cc_test( name = "secure_channel_create_test", - srcs = ["secure_channel_create_test.c"], + srcs = ["secure_channel_create_test.cc"], language = "C", deps = [ "//:gpr", @@ -141,7 +141,7 @@ grpc_cc_test( grpc_cc_test( name = "sequential_connectivity_test", - srcs = ["sequential_connectivity_test.c"], + srcs = ["sequential_connectivity_test.cc"], language = "C", deps = [ "//:gpr", @@ -154,7 +154,7 @@ grpc_cc_test( grpc_cc_test( name = "server_chttp2_test", - srcs = ["server_chttp2_test.c"], + srcs = ["server_chttp2_test.cc"], language = "C", deps = [ "//:gpr", @@ -166,7 +166,7 @@ grpc_cc_test( grpc_cc_test( name = "server_test", - srcs = ["server_test.c"], + srcs = ["server_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index edd27b8a5f..d49731a765 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -35,7 +35,7 @@ grpc_cc_test( grpc_cc_test( name = "byte_stream_test", - srcs = ["byte_stream_test.c"], + srcs = ["byte_stream_test.cc"], language = "C", deps = [ "//:gpr", @@ -47,7 +47,7 @@ grpc_cc_test( grpc_cc_test( name = "connectivity_state_test", - srcs = ["connectivity_state_test.c"], + srcs = ["connectivity_state_test.cc"], language = "C", deps = [ "//:gpr", @@ -59,7 +59,7 @@ grpc_cc_test( grpc_cc_test( name = "metadata_test", - srcs = ["metadata_test.c"], + srcs = ["metadata_test.cc"], language = "C", deps = [ "//:gpr", @@ -86,7 +86,7 @@ grpc_cc_test( grpc_cc_test( name = "status_conversion_test", - srcs = ["status_conversion_test.c"], + srcs = ["status_conversion_test.cc"], language = "C", deps = [ "//:gpr", @@ -98,7 +98,7 @@ grpc_cc_test( grpc_cc_test( name = "stream_owned_slice_test", - srcs = ["stream_owned_slice_test.c"], + srcs = ["stream_owned_slice_test.cc"], language = "C", deps = [ "//:gpr", @@ -110,7 +110,7 @@ grpc_cc_test( grpc_cc_test( name = "timeout_encoding_test", - srcs = ["timeout_encoding_test.c"], + srcs = ["timeout_encoding_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index 6081940243..dbb3670856 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "hpack_parser_fuzzer", - srcs = ["hpack_parser_fuzzer_test.c"], + srcs = ["hpack_parser_fuzzer_test.cc"], corpus = "hpack_parser_corpus", deps = [ "//:grpc", @@ -32,7 +32,7 @@ grpc_fuzzer( grpc_cc_test( name = "alpn_test", - srcs = ["alpn_test.c"], + srcs = ["alpn_test.cc"], language = "C", deps = [ "//:gpr", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_decoder_test", - srcs = ["bin_decoder_test.c"], + srcs = ["bin_decoder_test.cc"], language = "C", deps = [ "//:gpr", @@ -56,7 +56,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_encoder_test", - srcs = ["bin_encoder_test.c"], + srcs = ["bin_encoder_test.cc"], language = "C", deps = [ "//:gpr", @@ -68,7 +68,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_encoder_test", - srcs = ["hpack_encoder_test.c"], + srcs = ["hpack_encoder_test.cc"], language = "C", deps = [ "//:gpr", @@ -80,7 +80,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_parser_test", - srcs = ["hpack_parser_test.c"], + srcs = ["hpack_parser_test.cc"], language = "C", deps = [ "//:gpr", @@ -92,7 +92,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_table_test", - srcs = ["hpack_table_test.c"], + srcs = ["hpack_table_test.cc"], language = "C", deps = [ "//:gpr", @@ -104,7 +104,7 @@ grpc_cc_test( grpc_cc_test( name = "stream_map_test", - srcs = ["stream_map_test.c"], + srcs = ["stream_map_test.cc"], language = "C", deps = [ "//:gpr", @@ -116,7 +116,7 @@ grpc_cc_test( grpc_cc_test( name = "varint_test", - srcs = ["varint_test.c"], + srcs = ["varint_test.cc"], language = "C", deps = [ "//:gpr", diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD index 0c5509dda6..84878be0dc 100644 --- a/test/core/tsi/BUILD +++ b/test/core/tsi/BUILD @@ -20,7 +20,7 @@ grpc_package(name = "test/core/tsi") grpc_cc_library( name = "transport_security_test_lib", - srcs = ["transport_security_test_lib.c"], + srcs = ["transport_security_test_lib.cc"], hdrs = ["transport_security_test_lib.h"], deps = [ "//:grpc", @@ -30,7 +30,7 @@ grpc_cc_library( grpc_cc_test( name = "fake_transport_security_test", - srcs = ["fake_transport_security_test.c"], + srcs = ["fake_transport_security_test.cc"], language = "C", deps = [ ":transport_security_test_lib", @@ -44,7 +44,7 @@ grpc_cc_test( grpc_cc_test( name = "ssl_transport_security_test", - srcs = ["ssl_transport_security_test.c"], + srcs = ["ssl_transport_security_test.cc"], data = [ "//src/core/tsi/test_creds:badclient.key", "//src/core/tsi/test_creds:badclient.pem", @@ -70,7 +70,7 @@ grpc_cc_test( grpc_cc_test( name = "transport_security_test", - srcs = ["transport_security_test.c"], + srcs = ["transport_security_test.cc"], language = "C", deps = [ "//:grpc", diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 5844a17728..7d8d7ded75 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -21,8 +21,8 @@ grpc_package(name = "test/core/util", visibility = "public") grpc_cc_library( name = "gpr_test_util", srcs = [ - "memory_counters.c", - "test_config.c", + "memory_counters.cc", + "test_config.cc", ], hdrs = [ "memory_counters.h", @@ -48,16 +48,16 @@ grpc_cc_library( grpc_cc_library( name = "grpc_test_util_base", srcs = [ - "grpc_profiler.c", - "mock_endpoint.c", - "parse_hexstring.c", - "passthru_endpoint.c", - "port.c", - "port_server_client.c", - "reconnect_server.c", - "slice_splitter.c", - "test_tcp_server.c", - "trickle_endpoint.c", + "grpc_profiler.cc", + "mock_endpoint.cc", + "parse_hexstring.cc", + "passthru_endpoint.cc", + "port.cc", + "port_server_client.cc", + "reconnect_server.cc", + "slice_splitter.cc", + "test_tcp_server.cc", + "trickle_endpoint.cc", ], hdrs = [ "grpc_profiler.h", -- cgit v1.2.3 From 77532036b65bc3130c232effb882dc99c302a64a Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 31 Oct 2017 11:11:18 -0700 Subject: BUILD changes. test languauge to C++ --- Makefile | 14 -------- grpc.gyp | 14 -------- test/core/backoff/BUILD | 2 +- test/core/census/BUILD | 8 ++--- test/core/channel/BUILD | 6 ++-- test/core/client_channel/BUILD | 4 +-- test/core/client_channel/resolvers/BUILD | 8 ++--- test/core/compression/BUILD | 6 ++-- test/core/end2end/BUILD | 8 ++--- test/core/end2end/fuzzers/BUILD | 6 ++-- test/core/end2end/generate_tests.bzl | 4 +-- test/core/fling/BUILD | 4 +-- test/core/handshake/BUILD | 4 +-- test/core/http/BUILD | 10 +++--- test/core/iomgr/BUILD | 42 +++++++++++----------- test/core/json/BUILD | 10 +++--- test/core/nanopb/BUILD | 4 +-- test/core/network_benchmarks/BUILD | 2 +- test/core/security/BUILD | 20 +++++------ test/core/slice/BUILD | 16 ++++----- test/core/support/BUILD | 36 +++++++++---------- test/core/surface/BUILD | 24 ++++++------- test/core/transport/BUILD | 12 +++---- test/core/transport/chttp2/BUILD | 16 ++++----- test/core/tsi/BUILD | 6 ++-- test/core/util/BUILD | 6 ++-- tools/run_tests/generated/sources_and_headers.json | 23 +----------- 27 files changed, 133 insertions(+), 182 deletions(-) (limited to 'test/core/compression') diff --git a/Makefile b/Makefile index af1df7e57b..0e3e9a2e77 100644 --- a/Makefile +++ b/Makefile @@ -8300,20 +8300,6 @@ endif LIBBENCHMARK_SRC = \ - third_party/benchmark/src/benchmark.cc \ - third_party/benchmark/src/benchmark_register.cc \ - third_party/benchmark/src/colorprint.cc \ - third_party/benchmark/src/commandlineflags.cc \ - third_party/benchmark/src/complexity.cc \ - third_party/benchmark/src/console_reporter.cc \ - third_party/benchmark/src/counter.cc \ - third_party/benchmark/src/csv_reporter.cc \ - third_party/benchmark/src/json_reporter.cc \ - third_party/benchmark/src/reporter.cc \ - third_party/benchmark/src/sleep.cc \ - third_party/benchmark/src/string_util.cc \ - third_party/benchmark/src/sysinfo.cc \ - third_party/benchmark/src/timers.cc \ PUBLIC_HEADERS_CXX += \ diff --git a/grpc.gyp b/grpc.gyp index ef7410d60b..2295ebc9c4 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -2316,20 +2316,6 @@ 'dependencies': [ ], 'sources': [ - 'third_party/benchmark/src/benchmark.cc', - 'third_party/benchmark/src/benchmark_register.cc', - 'third_party/benchmark/src/colorprint.cc', - 'third_party/benchmark/src/commandlineflags.cc', - 'third_party/benchmark/src/complexity.cc', - 'third_party/benchmark/src/console_reporter.cc', - 'third_party/benchmark/src/counter.cc', - 'third_party/benchmark/src/csv_reporter.cc', - 'third_party/benchmark/src/json_reporter.cc', - 'third_party/benchmark/src/reporter.cc', - 'third_party/benchmark/src/sleep.cc', - 'third_party/benchmark/src/string_util.cc', - 'third_party/benchmark/src/sysinfo.cc', - 'third_party/benchmark/src/timers.cc', ], }, { diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD index 97a08aecd0..4cd7acf066 100644 --- a/test/core/backoff/BUILD +++ b/test/core/backoff/BUILD @@ -26,7 +26,7 @@ package( grpc_cc_test( name = "backoff_test", srcs = ["backoff_test.cc"], - language = "C", + language = "C++", deps = [ "//:grpc", "//test/core/util:grpc_test_util", diff --git a/test/core/census/BUILD b/test/core/census/BUILD index 52d0b772d1..70a0e79932 100644 --- a/test/core/census/BUILD +++ b/test/core/census/BUILD @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "context_test", srcs = ["context_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -33,7 +33,7 @@ grpc_cc_test( grpc_cc_test( name = "mlog_test", srcs = ["mlog_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "resource_test", srcs = ["resource_test.cc"], - language = "C", + language = "C++", data = [ ":data/resource_empty_name.pb", ":data/resource_full.pb", @@ -65,7 +65,7 @@ grpc_cc_test( grpc_cc_test( name = "trace_context_test", srcs = ["trace_context_test.cc"], - language = "C", + language = "C++", data = [ ":data/context_empty.pb", ":data/context_full.pb", diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index 14e45bf3c7..92f5907aac 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "channel_args_test", srcs = ["channel_args_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -33,7 +33,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_stack_test", srcs = ["channel_stack_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_stack_builder_test", srcs = ["channel_stack_builder_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD index 75628413c5..ec72e0ea72 100644 --- a/test/core/client_channel/BUILD +++ b/test/core/client_channel/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "uri_fuzzer_test", srcs = ["uri_fuzzer_test.cc"], - language = "C", + language = "C++", corpus = "uri_corpus", deps = [ "//:gpr", @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_cc_test( name = "lb_policies_test", srcs = ["lb_policies_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index ae3ce0b257..b5269c7ef0 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "dns_resolver_connectivity_test", srcs = ["dns_resolver_connectivity_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -33,7 +33,7 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_test", srcs = ["dns_resolver_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_resolver_test", srcs = ["sockaddr_resolver_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -57,7 +57,7 @@ grpc_cc_test( grpc_cc_test( name = "fake_resolver_test", srcs = ["fake_resolver_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/compression/BUILD b/test/core/compression/BUILD index 60453fc036..ee71eecfeb 100644 --- a/test/core/compression/BUILD +++ b/test/core/compression/BUILD @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "algorithm_test", srcs = ["algorithm_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -33,7 +33,7 @@ grpc_cc_test( grpc_cc_test( name = "compression_test", srcs = ["compression_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "message_compress_test", srcs = ["message_compress_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 831ba7611d..f8281bfe6f 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -24,7 +24,7 @@ grpc_cc_library( name = "cq_verifier", srcs = ["cq_verifier.cc"], hdrs = ["cq_verifier.h"], - language = "C", + language = "C++", visibility = ["//test:__subpackages__"], deps = [ "//:gpr", @@ -42,7 +42,7 @@ grpc_cc_library( "data/test_root_cert.cc", ], hdrs = ["data/ssl_test_data.h"], - language = "C", + language = "C++", visibility = ["//test:__subpackages__"], ) @@ -51,7 +51,7 @@ grpc_cc_library( name = "http_proxy", srcs = ["fixtures/http_proxy_fixture.cc"], hdrs = ["fixtures/http_proxy_fixture.h"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -63,7 +63,7 @@ grpc_cc_library( name = "proxy", srcs = ["fixtures/proxy.cc"], hdrs = ["fixtures/proxy.h"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index 09c175e8d2..d33e2b0ff4 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "api_fuzzer", srcs = ["api_fuzzer.cc"], - language = "C", + language = "C++", corpus = "api_fuzzer_corpus", deps = [ "//:gpr", @@ -36,7 +36,7 @@ grpc_fuzzer( grpc_fuzzer( name = "client_fuzzer", srcs = ["client_fuzzer.cc"], - language = "C", + language = "C++", corpus = "client_fuzzer_corpus", deps = [ "//:gpr", @@ -48,7 +48,7 @@ grpc_fuzzer( grpc_fuzzer( name = "server_fuzzer", srcs = ["server_fuzzer.cc"], - language = "C", + language = "C++", corpus = "server_fuzzer_corpus", deps = [ "//:gpr", diff --git a/test/core/end2end/generate_tests.bzl b/test/core/end2end/generate_tests.bzl index 94f9f98a2a..b9a42bdb88 100755 --- a/test/core/end2end/generate_tests.bzl +++ b/test/core/end2end/generate_tests.bzl @@ -193,7 +193,7 @@ def grpc_end2end_tests(): 'tests/cancel_test_helpers.h', 'end2end_tests.h' ], - language = "C", + language = "C++", deps = [ ':cq_verifier', ':ssl_test_data', @@ -206,7 +206,7 @@ def grpc_end2end_tests(): grpc_cc_binary( name = '%s_test' % f, srcs = ['fixtures/%s.cc' % f], - language = "C", + language = "C++", deps = [ ':end2end_tests', '//test/core/util:grpc_test_util', diff --git a/test/core/fling/BUILD b/test/core/fling/BUILD index beacae7a75..268e94aacc 100644 --- a/test/core/fling/BUILD +++ b/test/core/fling/BUILD @@ -24,7 +24,7 @@ grpc_cc_binary( name = "client", testonly = 1, srcs = ["client.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -38,7 +38,7 @@ grpc_cc_binary( name = "server", testonly = 1, srcs = ["server.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index a2ac501927..aea4a27e99 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -21,7 +21,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "client_ssl", srcs = ["client_ssl.cc"], - language = "C", + language = "C++", data = [ "//src/core/tsi/test_creds:ca.pem", "//src/core/tsi/test_creds:server1.key", @@ -38,7 +38,7 @@ grpc_cc_test( grpc_cc_test( name = "server_ssl", srcs = ["server_ssl.cc"], - language = "C", + language = "C++", data = [ "//src/core/tsi/test_creds:ca.pem", "//src/core/tsi/test_creds:server1.key", diff --git a/test/core/http/BUILD b/test/core/http/BUILD index 4dbba73f31..a5ae6272db 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "response_fuzzer", srcs = ["response_fuzzer.cc"], - language = "C", + language = "C++", corpus = "response_corpus", deps = [ "//:gpr", @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_fuzzer( name = "request_fuzzer", srcs = ["request_fuzzer.cc"], - language = "C", + language = "C++", corpus = "request_corpus", deps = [ "//:gpr", @@ -65,7 +65,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_cc_test( name = "httpcli_test", srcs = ["httpcli_test.cc"], - language = "C", + language = "C++", data = ["test_server.py"], deps = [ "//:gpr", @@ -79,7 +79,7 @@ grpc_cc_test( grpc_cc_test( name = "httpscli_test", srcs = ["httpscli_test.cc"], - language = "C", + language = "C++", data = ["test_server.py"], deps = [ "//:gpr", @@ -93,7 +93,7 @@ grpc_cc_test( grpc_cc_test( name = "parser_test", srcs = ["parser_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index b4490e7a5f..41e2607646 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -24,7 +24,7 @@ grpc_cc_library( name = "endpoint_tests", srcs = ["endpoint_tests.cc"], hdrs = ["endpoint_tests.h"], - language = "C", + language = "C++", visibility = ["//test:__subpackages__"], deps = [ "//:gpr", @@ -37,7 +37,7 @@ grpc_cc_library( grpc_cc_test( name = "combiner_test", srcs = ["combiner_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -49,7 +49,7 @@ grpc_cc_test( grpc_cc_test( name = "endpoint_pair_test", srcs = ["endpoint_pair_test.cc"], - language = "C", + language = "C++", deps = [ ":endpoint_tests", "//:gpr", @@ -68,13 +68,13 @@ grpc_cc_test( "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", ], - language = "C", + language = "C++", ) grpc_cc_test( name = "fd_conservation_posix_test", srcs = ["fd_conservation_posix_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -86,7 +86,7 @@ grpc_cc_test( grpc_cc_test( name = "fd_posix_test", srcs = ["fd_posix_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -98,7 +98,7 @@ grpc_cc_test( grpc_cc_test( name = "load_file_test", srcs = ["load_file_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -110,7 +110,7 @@ grpc_cc_test( grpc_cc_test( name = "pollset_set_test", srcs = ["pollset_set_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -122,7 +122,7 @@ grpc_cc_test( grpc_cc_test( name = "resolve_address_posix_test", srcs = ["resolve_address_posix_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -134,7 +134,7 @@ grpc_cc_test( grpc_cc_test( name = "resolve_address_test", srcs = ["resolve_address_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -146,7 +146,7 @@ grpc_cc_test( grpc_cc_test( name = "resource_quota_test", srcs = ["resource_quota_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -158,7 +158,7 @@ grpc_cc_test( grpc_cc_test( name = "sockaddr_utils_test", srcs = ["sockaddr_utils_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -170,7 +170,7 @@ grpc_cc_test( grpc_cc_test( name = "socket_utils_test", srcs = ["socket_utils_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -182,7 +182,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_client_posix_test", srcs = ["tcp_client_posix_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -194,7 +194,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_posix_test", srcs = ["tcp_posix_test.cc"], - language = "C", + language = "C++", deps = [ ":endpoint_tests", "//:gpr", @@ -207,7 +207,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_server_posix_test", srcs = ["tcp_server_posix_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -219,7 +219,7 @@ grpc_cc_test( grpc_cc_test( name = "time_averaged_stats_test", srcs = ["time_averaged_stats_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -231,7 +231,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -243,7 +243,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_list_test", srcs = ["timer_list_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -255,7 +255,7 @@ grpc_cc_test( grpc_cc_test( name = "udp_server_test", srcs = ["udp_server_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -267,7 +267,7 @@ grpc_cc_test( grpc_cc_test( name = "wakeup_fd_cv_test", srcs = ["wakeup_fd_cv_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/json/BUILD b/test/core/json/BUILD index 6e92fdc069..b8b36c0652 100644 --- a/test/core/json/BUILD +++ b/test/core/json/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "json_fuzzer", srcs = ["fuzzer.cc"], - language = "C", + language = "C++", corpus = "corpus", deps = [ "//:gpr", @@ -36,7 +36,7 @@ grpc_cc_binary( name = "json_rewrite", testonly = 1, srcs = ["json_rewrite.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -48,7 +48,7 @@ grpc_cc_binary( grpc_cc_test( name = "json_rewrite_test", srcs = ["json_rewrite_test.cc"], - language = "C", + language = "C++", data = [ "rewrite_test_input.json", "rewrite_test_output_condensed.json", @@ -66,7 +66,7 @@ grpc_cc_test( grpc_cc_test( name = "json_stream_error_test", srcs = ["json_stream_error_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -78,7 +78,7 @@ grpc_cc_test( grpc_cc_test( name = "json_test", srcs = ["json_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/nanopb/BUILD b/test/core/nanopb/BUILD index a814cd3411..1497f829ab 100644 --- a/test/core/nanopb/BUILD +++ b/test/core/nanopb/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "fuzzer_response", srcs = ["fuzzer_response.cc"], - language = "C", + language = "C++", corpus = "corpus_response", deps = [ "//:gpr", @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_fuzzer( name = "fuzzer_serverlist", srcs = ["fuzzer_serverlist.cc"], - language = "C", + language = "C++", corpus = "corpus_serverlist", deps = [ "//:gpr", diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD index 0db3ad7940..e1b4953608 100644 --- a/test/core/network_benchmarks/BUILD +++ b/test/core/network_benchmarks/BUILD @@ -23,7 +23,7 @@ licenses(["notice"]) # Apache v2 grpc_cc_binary( name = "low_level_ping_pong", srcs = ["low_level_ping_pong.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/security/BUILD b/test/core/security/BUILD index e771465be2..7cd3ae58da 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "ssl_server_fuzzer", srcs = ["ssl_server_fuzzer.cc"], - language = "C", + language = "C++", corpus = "corpus", deps = [ "//:gpr", @@ -37,7 +37,7 @@ grpc_cc_library( name = "oauth2_utils", srcs = ["oauth2_utils.cc"], hdrs = ["oauth2_utils.h"], - language = "C", + language = "C++", deps = ["//:grpc"], visibility = ["//test/cpp:__subpackages__"], ) @@ -45,7 +45,7 @@ grpc_cc_library( grpc_cc_test( name = "auth_context_test", srcs = ["auth_context_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -57,7 +57,7 @@ grpc_cc_test( grpc_cc_test( name = "credentials_test", srcs = ["credentials_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -69,7 +69,7 @@ grpc_cc_test( grpc_cc_test( name = "secure_endpoint_test", srcs = ["secure_endpoint_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -82,7 +82,7 @@ grpc_cc_test( grpc_cc_test( name = "security_connector_test", srcs = ["security_connector_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -94,7 +94,7 @@ grpc_cc_test( grpc_cc_test( name = "ssl_credentials_test", srcs = ["ssl_credentials_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -106,7 +106,7 @@ grpc_cc_test( grpc_cc_binary( name = "create_jwt", srcs = ["create_jwt.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -116,7 +116,7 @@ grpc_cc_binary( grpc_cc_binary( name = "fetch_oauth2", srcs = ["fetch_oauth2.cc"], - language = "C", + language = "C++", deps = [ ":oauth2_utils", "//:gpr", @@ -127,7 +127,7 @@ grpc_cc_binary( grpc_cc_binary( name = "verify_jwt", srcs = ["verify_jwt.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index d7bcc37f6b..ba2b553e0b 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -23,7 +23,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "percent_encode_fuzzer", srcs = ["percent_encode_fuzzer.cc"], - language = "C", + language = "C++", corpus = "percent_encode_corpus", deps = [ "//:gpr", @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_fuzzer( name = "percent_decode_fuzzer", srcs = ["percent_decode_fuzzer.cc"], - language = "C", + language = "C++", corpus = "percent_decode_corpus", deps = [ "//:gpr", @@ -47,7 +47,7 @@ grpc_fuzzer( grpc_cc_test( name = "percent_encoding_test", srcs = ["percent_encoding_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -60,13 +60,13 @@ grpc_cc_test( name = "slice_test", 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.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -79,20 +79,20 @@ grpc_cc_test( name = "slice_buffer_test", 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.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.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/support/BUILD b/test/core/support/BUILD index c1edb7ee8a..9d042fdc9f 100644 --- a/test/core/support/BUILD +++ b/test/core/support/BUILD @@ -21,7 +21,7 @@ grpc_package(name = "test/core/support") grpc_cc_test( name = "alloc_test", srcs = ["alloc_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -31,7 +31,7 @@ grpc_cc_test( grpc_cc_test( name = "avl_test", srcs = ["avl_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -41,7 +41,7 @@ grpc_cc_test( grpc_cc_test( name = "cmdline_test", srcs = ["cmdline_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -51,7 +51,7 @@ grpc_cc_test( grpc_cc_test( name = "cpu_test", srcs = ["cpu_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -61,7 +61,7 @@ grpc_cc_test( grpc_cc_test( name = "env_test", srcs = ["env_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -71,7 +71,7 @@ grpc_cc_test( grpc_cc_test( name = "histogram_test", srcs = ["histogram_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -81,7 +81,7 @@ grpc_cc_test( grpc_cc_test( name = "host_port_test", srcs = ["host_port_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -91,7 +91,7 @@ grpc_cc_test( grpc_cc_test( name = "log_test", srcs = ["log_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -101,7 +101,7 @@ grpc_cc_test( grpc_cc_test( name = "mpscq_test", srcs = ["mpscq_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -111,7 +111,7 @@ grpc_cc_test( grpc_cc_test( name = "murmur_hash_test", srcs = ["murmur_hash_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -121,7 +121,7 @@ grpc_cc_test( grpc_cc_test( name = "stack_lockfree_test", srcs = ["stack_lockfree_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -131,7 +131,7 @@ grpc_cc_test( grpc_cc_test( name = "string_test", srcs = ["string_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -141,7 +141,7 @@ grpc_cc_test( grpc_cc_test( name = "spinlock_test", srcs = ["spinlock_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -151,7 +151,7 @@ grpc_cc_test( grpc_cc_test( name = "sync_test", srcs = ["sync_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -161,7 +161,7 @@ grpc_cc_test( grpc_cc_test( name = "thd_test", srcs = ["thd_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -171,7 +171,7 @@ grpc_cc_test( grpc_cc_test( name = "time_test", srcs = ["time_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -181,7 +181,7 @@ grpc_cc_test( grpc_cc_test( name = "tls_test", srcs = ["tls_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", @@ -191,7 +191,7 @@ grpc_cc_test( grpc_cc_test( name = "useful_test", srcs = ["useful_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//test/core/util:gpr_test_util", diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD index 3514278113..6cec7feabc 100644 --- a/test/core/surface/BUILD +++ b/test/core/surface/BUILD @@ -21,7 +21,7 @@ grpc_package(name = "test/core/surface") grpc_cc_test( name = "alarm_test", srcs = ["alarm_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -33,7 +33,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_byte_buffer_reader_test", srcs = ["byte_buffer_reader_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "channel_create_test", srcs = ["channel_create_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -57,7 +57,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_completion_queue_test", srcs = ["completion_queue_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -69,7 +69,7 @@ grpc_cc_test( grpc_cc_test( name = "concurrent_connectivity_test", srcs = ["concurrent_connectivity_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -81,7 +81,7 @@ grpc_cc_test( grpc_cc_test( name = "init_test", srcs = ["init_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -93,7 +93,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_invalid_channel_args_test", srcs = ["invalid_channel_args_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -105,7 +105,7 @@ grpc_cc_test( grpc_cc_test( name = "lame_client_test", srcs = ["lame_client_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -130,7 +130,7 @@ grpc_cc_test( grpc_cc_test( name = "secure_channel_create_test", srcs = ["secure_channel_create_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -142,7 +142,7 @@ grpc_cc_test( grpc_cc_test( name = "sequential_connectivity_test", srcs = ["sequential_connectivity_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -155,7 +155,7 @@ grpc_cc_test( grpc_cc_test( name = "server_chttp2_test", srcs = ["server_chttp2_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -167,7 +167,7 @@ grpc_cc_test( grpc_cc_test( name = "server_test", srcs = ["server_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index d49731a765..b31d4ff899 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -36,7 +36,7 @@ grpc_cc_test( grpc_cc_test( name = "byte_stream_test", srcs = ["byte_stream_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -48,7 +48,7 @@ grpc_cc_test( grpc_cc_test( name = "connectivity_state_test", srcs = ["connectivity_state_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -60,7 +60,7 @@ grpc_cc_test( grpc_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -87,7 +87,7 @@ grpc_cc_test( grpc_cc_test( name = "status_conversion_test", srcs = ["status_conversion_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -99,7 +99,7 @@ grpc_cc_test( grpc_cc_test( name = "stream_owned_slice_test", srcs = ["stream_owned_slice_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -111,7 +111,7 @@ grpc_cc_test( grpc_cc_test( name = "timeout_encoding_test", srcs = ["timeout_encoding_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index dbb3670856..1ea7d0341d 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -33,7 +33,7 @@ grpc_fuzzer( grpc_cc_test( name = "alpn_test", srcs = ["alpn_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -45,7 +45,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_decoder_test", srcs = ["bin_decoder_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -57,7 +57,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_encoder_test", srcs = ["bin_encoder_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -69,7 +69,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_encoder_test", srcs = ["hpack_encoder_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -81,7 +81,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_parser_test", srcs = ["hpack_parser_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -93,7 +93,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_table_test", srcs = ["hpack_table_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -105,7 +105,7 @@ grpc_cc_test( grpc_cc_test( name = "stream_map_test", srcs = ["stream_map_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -117,7 +117,7 @@ grpc_cc_test( grpc_cc_test( name = "varint_test", srcs = ["varint_test.cc"], - language = "C", + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD index 84878be0dc..e28c0b5f84 100644 --- a/test/core/tsi/BUILD +++ b/test/core/tsi/BUILD @@ -31,7 +31,7 @@ grpc_cc_library( grpc_cc_test( name = "fake_transport_security_test", srcs = ["fake_transport_security_test.cc"], - language = "C", + language = "C++", deps = [ ":transport_security_test_lib", "//:grpc", @@ -58,7 +58,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - language = "C", + language = "C++", deps = [ ":transport_security_test_lib", "//:grpc", @@ -71,7 +71,7 @@ grpc_cc_test( grpc_cc_test( name = "transport_security_test", srcs = ["transport_security_test.cc"], - language = "C", + language = "C++", deps = [ "//:grpc", "//:gpr", diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 7d8d7ded75..bc6fe9dd64 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -71,7 +71,7 @@ grpc_cc_library( "test_tcp_server.h", "trickle_endpoint.h", ], - language = "C", + language = "C++", deps = [ ":gpr_test_util", "//:grpc_common", @@ -83,7 +83,7 @@ grpc_cc_library( name = "grpc_test_util", srcs = [], hdrs = [], - language = "C", + language = "C++", deps = [ ":grpc_test_util_base", "//:grpc", @@ -94,7 +94,7 @@ grpc_cc_library( name = "grpc_test_util_unsecure", srcs = [], hdrs = [], - language = "C", + language = "C++", deps = [ ":grpc_test_util_base", "//:grpc_unsecure", diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 7067fdf350..41bccc1d41 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -7450,28 +7450,7 @@ }, { "deps": [], - "headers": [ - "third_party/benchmark/include/benchmark/benchmark.h", - "third_party/benchmark/include/benchmark/benchmark_api.h", - "third_party/benchmark/include/benchmark/reporter.h", - "third_party/benchmark/src/arraysize.h", - "third_party/benchmark/src/benchmark_api_internal.h", - "third_party/benchmark/src/check.h", - "third_party/benchmark/src/colorprint.h", - "third_party/benchmark/src/commandlineflags.h", - "third_party/benchmark/src/complexity.h", - "third_party/benchmark/src/counter.h", - "third_party/benchmark/src/cycleclock.h", - "third_party/benchmark/src/internal_macros.h", - "third_party/benchmark/src/log.h", - "third_party/benchmark/src/mutex.h", - "third_party/benchmark/src/re.h", - "third_party/benchmark/src/sleep.h", - "third_party/benchmark/src/stat.h", - "third_party/benchmark/src/string_util.h", - "third_party/benchmark/src/sysinfo.h", - "third_party/benchmark/src/timers.h" - ], + "headers": [], "is_filegroup": false, "language": "c++", "name": "benchmark", -- cgit v1.2.3