diff --git a/CMakeLists.txt b/CMakeLists.txt index 358cdd0eb3b..2cfda948510 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -777,7 +777,6 @@ protobuf_generate_grpc_cpp_with_import_path_correction( if(gRPC_BUILD_TESTS) add_custom_target(buildtests_c) add_dependencies(buildtests_c alloc_test) - add_dependencies(buildtests_c alpn_test) add_dependencies(buildtests_c b64_test) add_dependencies(buildtests_c bad_server_response_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -786,8 +785,6 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_c bad_ssl_cert_test) endif() - add_dependencies(buildtests_c bin_decoder_test) - add_dependencies(buildtests_c bin_encoder_test) add_dependencies(buildtests_c buffer_list_test) add_dependencies(buildtests_c c_slice_buffer_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -816,7 +813,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_c format_request_test) add_dependencies(buildtests_c goaway_server_test) add_dependencies(buildtests_c grpc_ipv6_loopback_available_test) - add_dependencies(buildtests_c hpack_encoder_test) add_dependencies(buildtests_c inproc_callback_test) add_dependencies(buildtests_c invalid_call_argument_test) add_dependencies(buildtests_c load_file_test) @@ -839,8 +835,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_c socket_utils_test) endif() add_dependencies(buildtests_c spinlock_test) - add_dependencies(buildtests_c status_conversion_test) - add_dependencies(buildtests_c stream_map_test) add_dependencies(buildtests_c string_test) add_dependencies(buildtests_c sync_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -856,7 +850,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_c test_core_iomgr_time_averaged_stats_test) add_dependencies(buildtests_c test_core_iomgr_timer_heap_test) add_dependencies(buildtests_c test_core_iomgr_timer_list_test) - add_dependencies(buildtests_c varint_test) add_custom_target(buildtests_cxx) add_dependencies(buildtests_cxx activity_test) @@ -870,6 +863,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx alarm_test) endif() + add_dependencies(buildtests_cxx alpn_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx alts_concurrent_connectivity_test) endif() @@ -900,6 +894,8 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx bdp_estimator_test) endif() + add_dependencies(buildtests_cxx bin_decoder_test) + add_dependencies(buildtests_cxx bin_encoder_test) add_dependencies(buildtests_cxx binder_resolver_test) add_dependencies(buildtests_cxx binder_server_test) add_dependencies(buildtests_cxx binder_transport_test) @@ -1024,6 +1020,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx health_service_end2end_test) add_dependencies(buildtests_cxx histogram_test) add_dependencies(buildtests_cxx host_port_test) + add_dependencies(buildtests_cxx hpack_encoder_test) add_dependencies(buildtests_cxx hpack_parser_table_test) add_dependencies(buildtests_cxx hpack_parser_test) add_dependencies(buildtests_cxx http2_client) @@ -1156,11 +1153,13 @@ if(gRPC_BUILD_TESTS) endif() add_dependencies(buildtests_cxx stat_test) add_dependencies(buildtests_cxx stats_test) + add_dependencies(buildtests_cxx status_conversion_test) add_dependencies(buildtests_cxx status_helper_test) add_dependencies(buildtests_cxx status_util_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx stranded_event_test) endif() + add_dependencies(buildtests_cxx stream_map_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx streaming_throughput_test) endif() @@ -1207,6 +1206,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx unknown_frame_bad_client_test) add_dependencies(buildtests_cxx uri_parser_test) add_dependencies(buildtests_cxx useful_test) + add_dependencies(buildtests_cxx varint_test) add_dependencies(buildtests_cxx window_overflow_bad_client_test) add_dependencies(buildtests_cxx wire_reader_test) add_dependencies(buildtests_cxx wire_writer_test) @@ -4304,33 +4304,6 @@ target_link_libraries(alloc_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(alpn_test - test/core/transport/chttp2/alpn_test.cc -) - -target_include_directories(alpn_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(alpn_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -4449,60 +4422,6 @@ endif() endif() if(gRPC_BUILD_TESTS) -add_executable(bin_decoder_test - test/core/transport/chttp2/bin_decoder_test.cc -) - -target_include_directories(bin_decoder_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(bin_decoder_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(bin_encoder_test - test/core/transport/chttp2/bin_encoder_test.cc -) - -target_include_directories(bin_encoder_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(bin_encoder_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - add_executable(buffer_list_test test/core/iomgr/buffer_list_test.cc ) @@ -4961,33 +4880,6 @@ target_link_libraries(grpc_ipv6_loopback_available_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(hpack_encoder_test - test/core/transport/chttp2/hpack_encoder_test.cc -) - -target_include_directories(hpack_encoder_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(hpack_encoder_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -5438,60 +5330,6 @@ target_link_libraries(spinlock_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(status_conversion_test - test/core/transport/status_conversion_test.cc -) - -target_include_directories(status_conversion_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(status_conversion_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(stream_map_test - test/core/transport/chttp2/stream_map_test.cc -) - -target_include_directories(stream_map_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(stream_map_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -5742,33 +5580,6 @@ target_link_libraries(test_core_iomgr_timer_list_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(varint_test - test/core/transport/chttp2/varint_test.cc -) - -target_include_directories(varint_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(varint_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -6037,6 +5848,41 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() +endif() +if(gRPC_BUILD_TESTS) + +add_executable(alpn_test + test/core/transport/chttp2/alpn_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(alpn_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(alpn_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) @@ -7036,6 +6882,76 @@ endif() endif() if(gRPC_BUILD_TESTS) +add_executable(bin_decoder_test + test/core/transport/chttp2/bin_decoder_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(bin_decoder_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(bin_decoder_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + +endif() +if(gRPC_BUILD_TESTS) + +add_executable(bin_encoder_test + test/core/transport/chttp2/bin_encoder_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(bin_encoder_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(bin_encoder_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + +endif() +if(gRPC_BUILD_TESTS) + add_executable(binder_resolver_test test/core/client_channel/resolvers/binder_resolver_test.cc third_party/googletest/googletest/src/gtest-all.cc @@ -11674,6 +11590,41 @@ target_link_libraries(host_port_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(hpack_encoder_test + test/core/transport/chttp2/hpack_encoder_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(hpack_encoder_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(hpack_encoder_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -16232,6 +16183,41 @@ target_link_libraries(stats_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(status_conversion_test + test/core/transport/status_conversion_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(status_conversion_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(status_conversion_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -16340,6 +16326,41 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() +endif() +if(gRPC_BUILD_TESTS) + +add_executable(stream_map_test + test/core/transport/chttp2/stream_map_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(stream_map_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(stream_map_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -18167,6 +18188,41 @@ target_link_libraries(useful_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(varint_test + test/core/transport/chttp2/varint_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(varint_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(varint_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 30526091835..7d5a7f5c603 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -3201,14 +3201,6 @@ targets: deps: - grpc_test_util uses_polling: false -- name: alpn_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/alpn_test.cc - deps: - - grpc_test_util - name: b64_test build: test language: c @@ -3256,24 +3248,6 @@ targets: - linux - posix - mac -- name: bin_decoder_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/bin_decoder_test.cc - deps: - - grpc_test_util - uses_polling: false -- name: bin_encoder_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/bin_encoder_test.cc - deps: - - grpc_test_util - uses_polling: false - name: buffer_list_test build: test language: c @@ -3455,15 +3429,6 @@ targets: - test/core/iomgr/grpc_ipv6_loopback_available_test.cc deps: - grpc_test_util -- name: hpack_encoder_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/hpack_encoder_test.cc - deps: - - grpc_test_util - uses_polling: false - name: inproc_callback_test build: test language: c @@ -3640,23 +3605,6 @@ targets: deps: - grpc_test_util uses_polling: false -- name: status_conversion_test - build: test - language: c - headers: [] - src: - - test/core/transport/status_conversion_test.cc - deps: - - grpc_test_util - uses_polling: false -- name: stream_map_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/stream_map_test.cc - deps: - - grpc_test_util - name: string_test build: test language: c @@ -3748,15 +3696,6 @@ targets: deps: - grpc_test_util uses_polling: false -- name: varint_test - build: test - language: c - headers: [] - src: - - test/core/transport/chttp2/varint_test.cc - deps: - - grpc_test_util - uses_polling: false - name: activity_test gtest: true build: test @@ -3940,6 +3879,15 @@ targets: - linux - posix - mac +- name: alpn_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/alpn_test.cc + deps: + - grpc_test_util - name: alts_concurrent_connectivity_test gtest: true build: test @@ -4311,6 +4259,26 @@ targets: - posix - mac uses_polling: false +- name: bin_decoder_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/bin_decoder_test.cc + deps: + - grpc_test_util + uses_polling: false +- name: bin_encoder_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/bin_encoder_test.cc + deps: + - grpc_test_util + uses_polling: false - name: binder_resolver_test gtest: true build: test @@ -6186,6 +6154,16 @@ targets: deps: - grpc_test_util uses_polling: false +- name: hpack_encoder_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/hpack_encoder_test.cc + deps: + - grpc_test_util + uses_polling: false - name: hpack_parser_table_test gtest: true build: test @@ -8163,6 +8141,16 @@ targets: deps: - grpc_test_util uses_polling: false +- name: status_conversion_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/status_conversion_test.cc + deps: + - grpc_test_util + uses_polling: false - name: status_helper_test gtest: true build: test @@ -8198,6 +8186,15 @@ targets: - linux - posix - mac +- name: stream_map_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/stream_map_test.cc + deps: + - grpc_test_util - name: streaming_throughput_test gtest: true build: test @@ -9178,6 +9175,16 @@ targets: - test/core/gpr/useful_test.cc deps: [] uses_polling: false +- name: varint_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/transport/chttp2/varint_test.cc + deps: + - grpc_test_util + uses_polling: false - name: window_overflow_bad_client_test gtest: true build: test diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index 94264237979..3dc85145aeb 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -108,6 +108,7 @@ grpc_cc_test( grpc_cc_test( name = "status_conversion_test", srcs = ["status_conversion_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index 215fd619314..aa2a932e70c 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -51,6 +51,7 @@ grpc_proto_fuzzer( grpc_cc_test( name = "alpn_test", srcs = ["alpn_test.cc"], + external_deps = ["gtest"], language = "C++", deps = [ "//:gpr", @@ -62,6 +63,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_decoder_test", srcs = ["bin_decoder_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, @@ -75,6 +77,7 @@ grpc_cc_test( grpc_cc_test( name = "bin_encoder_test", srcs = ["bin_encoder_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, @@ -133,6 +136,7 @@ grpc_cc_test( grpc_cc_test( name = "hpack_encoder_test", srcs = ["hpack_encoder_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, @@ -174,6 +178,7 @@ grpc_cc_test( grpc_cc_test( name = "stream_map_test", srcs = ["stream_map_test.cc"], + external_deps = ["gtest"], language = "C++", deps = [ "//:gpr", @@ -229,6 +234,7 @@ grpc_cc_test( grpc_cc_test( name = "varint_test", srcs = ["varint_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/transport/chttp2/alpn_test.cc b/test/core/transport/chttp2/alpn_test.cc index 305b90d7406..d5afeb4420b 100644 --- a/test/core/transport/chttp2/alpn_test.cc +++ b/test/core/transport/chttp2/alpn_test.cc @@ -18,18 +18,20 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" +#include + #include #include "test/core/util/test_config.h" -static void test_alpn_success(void) { - GPR_ASSERT(grpc_chttp2_is_alpn_version_supported("h2", 2)); - GPR_ASSERT(grpc_chttp2_is_alpn_version_supported("grpc-exp", 8)); +TEST(AlpnTest, TestAlpnSuccess) { + ASSERT_TRUE(grpc_chttp2_is_alpn_version_supported("h2", 2)); + ASSERT_TRUE(grpc_chttp2_is_alpn_version_supported("grpc-exp", 8)); } -static void test_alpn_failure(void) { - GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h2-155", 6)); - GPR_ASSERT(!grpc_chttp2_is_alpn_version_supported("h1-15", 5)); +TEST(AlpnTest, TestAlpnFailure) { + ASSERT_FALSE(grpc_chttp2_is_alpn_version_supported("h2-155", 6)); + ASSERT_FALSE(grpc_chttp2_is_alpn_version_supported("h1-15", 5)); } // First index in ALPN supported version list of a given protocol. Returns a @@ -44,15 +46,13 @@ static size_t alpn_version_index(const char* version, size_t size) { return i; } -static void test_alpn_grpc_before_h2(void) { +TEST(AlpnTest, TestAlpnGrpcBeforeH2) { // grpc-exp is preferred over h2. - GPR_ASSERT(alpn_version_index("grpc-exp", 8) < alpn_version_index("h2", 2)); + ASSERT_LT(alpn_version_index("grpc-exp", 8), alpn_version_index("h2", 2)); } int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); - test_alpn_success(); - test_alpn_failure(); - test_alpn_grpc_before_h2(); - return 0; + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc index 56968f5122c..0280d9bb21d 100644 --- a/test/core/transport/chttp2/bin_decoder_test.cc +++ b/test/core/transport/chttp2/bin_decoder_test.cc @@ -20,6 +20,8 @@ #include +#include + #include #include #include @@ -78,7 +80,7 @@ static size_t base64_infer_length(const char* s) { } #define EXPECT_DECODED_LENGTH(s, expected) \ - GPR_ASSERT((expected) == base64_infer_length((s))); + ASSERT_EQ((expected), base64_infer_length((s))); #define EXPECT_SLICE_EQ(expected, slice) \ expect_slice_eq( \ @@ -89,83 +91,84 @@ static size_t base64_infer_length(const char* s) { EXPECT_SLICE_EQ( \ s, grpc_chttp2_base64_decode_with_length(base64_encode(s), strlen(s))); +TEST(BinDecoderTest, MainTest) { + grpc_core::ExecCtx exec_ctx; + + /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which + takes encoded base64 strings without pad chars, but output length is + required. */ + /* Base64 test vectors from RFC 4648 */ + ENCODE_AND_DECODE(""); + ENCODE_AND_DECODE("f"); + ENCODE_AND_DECODE("foo"); + ENCODE_AND_DECODE("fo"); + ENCODE_AND_DECODE("foob"); + ENCODE_AND_DECODE("fooba"); + ENCODE_AND_DECODE("foobar"); + + ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); + + /* Base64 test vectors from RFC 4648, with pad chars */ + /* BASE64("") = "" */ + EXPECT_SLICE_EQ("", base64_decode("")); + /* BASE64("f") = "Zg==" */ + EXPECT_SLICE_EQ("f", base64_decode("Zg==")); + /* BASE64("fo") = "Zm8=" */ + EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); + /* BASE64("foo") = "Zm9v" */ + EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); + /* BASE64("foob") = "Zm9vYg==" */ + EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); + /* BASE64("fooba") = "Zm9vYmE=" */ + EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); + /* BASE64("foobar") = "Zm9vYmFy" */ + EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); + + EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); + + // Test illegal input length in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("a")); + EXPECT_SLICE_EQ("", base64_decode("ab")); + EXPECT_SLICE_EQ("", base64_decode("abc")); + + // Test illegal charactors in grpc_chttp2_base64_decode + EXPECT_SLICE_EQ("", base64_decode("Zm:v")); + EXPECT_SLICE_EQ("", base64_decode("Zm=v")); + + // Test output_length longer than max possible output length in + // grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); + + // Test illegal charactors in grpc_chttp2_base64_decode_with_length + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); + EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); + + EXPECT_DECODED_LENGTH("", 0); + EXPECT_DECODED_LENGTH("ab", 1); + EXPECT_DECODED_LENGTH("abc", 2); + EXPECT_DECODED_LENGTH("abcd", 3); + EXPECT_DECODED_LENGTH("abcdef", 4); + EXPECT_DECODED_LENGTH("abcdefg", 5); + EXPECT_DECODED_LENGTH("abcdefgh", 6); + + EXPECT_DECODED_LENGTH("ab==", 1); + EXPECT_DECODED_LENGTH("abc=", 2); + EXPECT_DECODED_LENGTH("abcd", 3); + EXPECT_DECODED_LENGTH("abcdef==", 4); + EXPECT_DECODED_LENGTH("abcdefg=", 5); + EXPECT_DECODED_LENGTH("abcdefgh", 6); + + EXPECT_DECODED_LENGTH("a", 0); + EXPECT_DECODED_LENGTH("a===", 0); + EXPECT_DECODED_LENGTH("abcde", 0); + EXPECT_DECODED_LENGTH("abcde===", 0); +} + int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - { - grpc_core::ExecCtx exec_ctx; - - /* ENCODE_AND_DECODE tests grpc_chttp2_base64_decode_with_length(), which - takes encoded base64 strings without pad chars, but output length is - required. */ - /* Base64 test vectors from RFC 4648 */ - ENCODE_AND_DECODE(""); - ENCODE_AND_DECODE("f"); - ENCODE_AND_DECODE("foo"); - ENCODE_AND_DECODE("fo"); - ENCODE_AND_DECODE("foob"); - ENCODE_AND_DECODE("fooba"); - ENCODE_AND_DECODE("foobar"); - - ENCODE_AND_DECODE("\xc0\xc1\xc2\xc3\xc4\xc5"); - - /* Base64 test vectors from RFC 4648, with pad chars */ - /* BASE64("") = "" */ - EXPECT_SLICE_EQ("", base64_decode("")); - /* BASE64("f") = "Zg==" */ - EXPECT_SLICE_EQ("f", base64_decode("Zg==")); - /* BASE64("fo") = "Zm8=" */ - EXPECT_SLICE_EQ("fo", base64_decode("Zm8=")); - /* BASE64("foo") = "Zm9v" */ - EXPECT_SLICE_EQ("foo", base64_decode("Zm9v")); - /* BASE64("foob") = "Zm9vYg==" */ - EXPECT_SLICE_EQ("foob", base64_decode("Zm9vYg==")); - /* BASE64("fooba") = "Zm9vYmE=" */ - EXPECT_SLICE_EQ("fooba", base64_decode("Zm9vYmE=")); - /* BASE64("foobar") = "Zm9vYmFy" */ - EXPECT_SLICE_EQ("foobar", base64_decode("Zm9vYmFy")); - - EXPECT_SLICE_EQ("\xc0\xc1\xc2\xc3\xc4\xc5", base64_decode("wMHCw8TF")); - - // Test illegal input length in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("a")); - EXPECT_SLICE_EQ("", base64_decode("ab")); - EXPECT_SLICE_EQ("", base64_decode("abc")); - - // Test illegal charactors in grpc_chttp2_base64_decode - EXPECT_SLICE_EQ("", base64_decode("Zm:v")); - EXPECT_SLICE_EQ("", base64_decode("Zm=v")); - - // Test output_length longer than max possible output length in - // grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zg", 2)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm8", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm9v", 4)); - - // Test illegal charactors in grpc_chttp2_base64_decode_with_length - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm:v", 3)); - EXPECT_SLICE_EQ("", base64_decode_with_length("Zm=v", 3)); - - EXPECT_DECODED_LENGTH("", 0); - EXPECT_DECODED_LENGTH("ab", 1); - EXPECT_DECODED_LENGTH("abc", 2); - EXPECT_DECODED_LENGTH("abcd", 3); - EXPECT_DECODED_LENGTH("abcdef", 4); - EXPECT_DECODED_LENGTH("abcdefg", 5); - EXPECT_DECODED_LENGTH("abcdefgh", 6); - - EXPECT_DECODED_LENGTH("ab==", 1); - EXPECT_DECODED_LENGTH("abc=", 2); - EXPECT_DECODED_LENGTH("abcd", 3); - EXPECT_DECODED_LENGTH("abcdef==", 4); - EXPECT_DECODED_LENGTH("abcdefg=", 5); - EXPECT_DECODED_LENGTH("abcdefgh", 6); - - EXPECT_DECODED_LENGTH("a", 0); - EXPECT_DECODED_LENGTH("a===", 0); - EXPECT_DECODED_LENGTH("abcde", 0); - EXPECT_DECODED_LENGTH("abcde===", 0); - } - grpc_shutdown(); - return all_ok ? 0 : 1; + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc index 4f90545cfcb..e0007a9678f 100644 --- a/test/core/transport/chttp2/bin_encoder_test.cc +++ b/test/core/transport/chttp2/bin_encoder_test.cc @@ -23,6 +23,8 @@ /* This is here for grpc_is_binary_header * TODO(murgatroid99): Remove this */ +#include + #include #include #include @@ -100,10 +102,7 @@ static void expect_binary_header(const char* hdr, int binary) { } } -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - +TEST(BinEncoderTest, MainTest) { /* Base64 test vectors from RFC 4648, with padding removed */ /* BASE64("") = "" */ EXPECT_SLICE_EQ("", B64("")); @@ -173,7 +172,11 @@ int main(int argc, char** argv) { expect_binary_header("foo-bin", 1); expect_binary_header("foo-bar", 0); expect_binary_header("-bin", 0); +} - grpc_shutdown(); - return all_ok ? 0 : 1; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index f75f282bb11..8623f90e7ba 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -23,6 +23,8 @@ #include +#include + #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -39,14 +41,11 @@ #include "test/core/util/slice_splitter.h" #include "test/core/util/test_config.h" -#define TEST(x) run_test(x, #x) - static auto* g_memory_allocator = new grpc_core::MemoryAllocator( grpc_core::ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator( "test")); grpc_core::HPackCompressor* g_compressor; -int g_failure = 0; typedef struct { bool eof; @@ -101,35 +100,35 @@ static void verify_frames(grpc_slice_buffer& output, bool header_is_eof) { gpr_log(GPR_ERROR, "expected first frame to be of type header"); gpr_log(GPR_ERROR, "EXPECT: 0x%x", GRPC_CHTTP2_FRAME_HEADER); gpr_log(GPR_ERROR, "GOT: 0x%x", type); - g_failure = 1; + EXPECT_TRUE(false); } else if (first_frame && header_is_eof && !(flags & GRPC_CHTTP2_DATA_FLAG_END_STREAM)) { gpr_log(GPR_ERROR, "missing END_STREAM flag in HEADER frame"); - g_failure = 1; + EXPECT_TRUE(false); } if (is_closed && (type == GRPC_CHTTP2_FRAME_DATA || type == GRPC_CHTTP2_FRAME_HEADER)) { gpr_log(GPR_ERROR, "stream is closed; new frame headers and data are not allowed"); - g_failure = 1; + EXPECT_TRUE(false); } if (end_header && (type == GRPC_CHTTP2_FRAME_HEADER || type == GRPC_CHTTP2_FRAME_CONTINUATION)) { gpr_log(GPR_ERROR, "frame header is ended; new headers and continuations are not " "allowed"); - g_failure = 1; + EXPECT_TRUE(false); } if (in_header && (type == GRPC_CHTTP2_FRAME_DATA || type == GRPC_CHTTP2_FRAME_HEADER)) { gpr_log(GPR_ERROR, "parsing frame header; new headers and data are not allowed"); - g_failure = 1; + EXPECT_TRUE(false); } if (flags & ~(GRPC_CHTTP2_DATA_FLAG_END_STREAM | GRPC_CHTTP2_DATA_FLAG_END_HEADERS)) { gpr_log(GPR_ERROR, "unexpected frame flags: 0x%x", flags); - g_failure = 1; + EXPECT_TRUE(false); } // Update state @@ -143,7 +142,7 @@ static void verify_frames(grpc_slice_buffer& output, bool header_is_eof) { is_closed = true; if (type == GRPC_CHTTP2_FRAME_CONTINUATION) { gpr_log(GPR_ERROR, "unexpected END_STREAM flag in CONTINUATION frame"); - g_failure = 1; + EXPECT_TRUE(false); } } } @@ -198,14 +197,17 @@ static void verify(const verify_params params, const char* expected, gpr_log(GPR_ERROR, "GOT: %s", got_str); gpr_free(expect_str); gpr_free(got_str); - g_failure = 1; + EXPECT_TRUE(false); } grpc_slice_unref_internal(merged); grpc_slice_unref_internal(expect); } -static void test_basic_headers() { +TEST(HpackEncoderTest, TestBasicHeaders) { + grpc_core::ExecCtx exec_ctx; + g_compressor = new grpc_core::HPackCompressor(); + verify_params params = { false, false, @@ -213,6 +215,8 @@ static void test_basic_headers() { verify(params, "000005 0104 deadbeef 00 0161 0161", 1, "a", "a"); verify(params, "00000a 0104 deadbeef 00 0161 0161 00 0162 0163", 2, "a", "a", "b", "c"); + + delete g_compressor; } static void verify_continuation_headers(const char* key, const char* value, @@ -236,7 +240,10 @@ static void verify_continuation_headers(const char* key, const char* value, grpc_slice_buffer_destroy_internal(&output); } -static void test_continuation_headers() { +TEST(HpackEncoderTest, TestContinuationHeaders) { + grpc_core::ExecCtx exec_ctx; + g_compressor = new grpc_core::HPackCompressor(); + char value[200]; memset(value, 'a', 200); value[199] = 0; // null terminator @@ -246,22 +253,14 @@ static void test_continuation_headers() { memset(value2, 'b', 400); value2[399] = 0; // null terminator verify_continuation_headers("key2", value2, true); -} -static void run_test(void (*test)(), const char* name) { - gpr_log(GPR_INFO, "RUN TEST: %s", name); - grpc_core::ExecCtx exec_ctx; - g_compressor = new grpc_core::HPackCompressor(); - test(); delete g_compressor; } int main(int argc, char** argv) { - grpc_test_only_set_slice_hash_seed(0); grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - TEST(test_basic_headers); - TEST(test_continuation_headers); - grpc_shutdown(); - return g_failure; + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + grpc_test_only_set_slice_hash_seed(0); + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/chttp2/stream_map_test.cc b/test/core/transport/chttp2/stream_map_test.cc index acad04e3d89..ef8c21586e0 100644 --- a/test/core/transport/chttp2/stream_map_test.cc +++ b/test/core/transport/chttp2/stream_map_test.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/stream_map.h" +#include + #include #include "test/core/util/test_config.h" @@ -41,7 +43,7 @@ static void test_empty_find(void) { LOG_TEST("test_empty_find"); grpc_chttp2_stream_map_init(&map, 8); - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(&map, 39128)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(&map, 39128)); grpc_chttp2_stream_map_destroy(&map); } @@ -55,16 +57,16 @@ static void test_basic_add_find(uint32_t n) { gpr_log(GPR_INFO, "n = %d", n); grpc_chttp2_stream_map_init(&map, 8); - GPR_ASSERT(0 == grpc_chttp2_stream_map_size(&map)); + ASSERT_EQ(0, grpc_chttp2_stream_map_size(&map)); for (i = 1; i <= n; i++) { grpc_chttp2_stream_map_add(&map, i, reinterpret_cast(i)); } - GPR_ASSERT(n == grpc_chttp2_stream_map_size(&map)); - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(&map, 0)); - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(&map, n + 1)); + ASSERT_EQ(n, grpc_chttp2_stream_map_size(&map)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(&map, 0)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(&map, n + 1)); for (i = 1; i <= n; i++) { got = reinterpret_cast(grpc_chttp2_stream_map_find(&map, i)); - GPR_ASSERT(i == got); + ASSERT_EQ(i, got); } grpc_chttp2_stream_map_destroy(&map); } @@ -72,8 +74,8 @@ static void test_basic_add_find(uint32_t n) { /* verify that for_each gets the right values during test_delete_evens_XXX */ static void verify_for_each(void* user_data, uint32_t stream_id, void* ptr) { uint32_t* for_each_check = static_cast(user_data); - GPR_ASSERT(ptr); - GPR_ASSERT(*for_each_check == stream_id); + ASSERT_TRUE(ptr); + ASSERT_EQ(*for_each_check, stream_id); *for_each_check += 2; } @@ -82,22 +84,22 @@ static void check_delete_evens(grpc_chttp2_stream_map* map, uint32_t n) { uint32_t i; size_t got; - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(map, 0)); - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(map, n + 1)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(map, 0)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(map, n + 1)); for (i = 1; i <= n; i++) { if (i & 1) { got = reinterpret_cast(grpc_chttp2_stream_map_find(map, i)); - GPR_ASSERT(i == got); + ASSERT_EQ(i, got); } else { - GPR_ASSERT(nullptr == grpc_chttp2_stream_map_find(map, i)); + ASSERT_EQ(nullptr, grpc_chttp2_stream_map_find(map, i)); } } grpc_chttp2_stream_map_for_each(map, verify_for_each, &for_each_check); if (n & 1) { - GPR_ASSERT(for_each_check == n + 2); + ASSERT_EQ(for_each_check, n + 2); } else { - GPR_ASSERT(for_each_check == n + 1); + ASSERT_EQ(for_each_check, n + 1); } } @@ -116,7 +118,7 @@ static void test_delete_evens_sweep(uint32_t n) { } for (i = 1; i <= n; i++) { if ((i & 1) == 0) { - GPR_ASSERT((void*)(uintptr_t)i == grpc_chttp2_stream_map_delete(&map, i)); + ASSERT_EQ((void*)(uintptr_t)i, grpc_chttp2_stream_map_delete(&map, i)); } } check_delete_evens(&map, n); @@ -154,26 +156,24 @@ static void test_periodic_compaction(uint32_t n) { gpr_log(GPR_INFO, "n = %d", n); grpc_chttp2_stream_map_init(&map, 16); - GPR_ASSERT(map.capacity == 16); + ASSERT_EQ(map.capacity, 16); for (i = 1; i <= n; i++) { grpc_chttp2_stream_map_add(&map, i, reinterpret_cast(i)); if (i > 8) { del = i - 8; - GPR_ASSERT((void*)(uintptr_t)del == - grpc_chttp2_stream_map_delete(&map, del)); + ASSERT_EQ((void*)(uintptr_t)del, + grpc_chttp2_stream_map_delete(&map, del)); } } - GPR_ASSERT(map.capacity == 16); + ASSERT_EQ(map.capacity, 16); grpc_chttp2_stream_map_destroy(&map); } -int main(int argc, char** argv) { +TEST(StreamMapTest, MainTest) { uint32_t n = 1; uint32_t prev = 1; uint32_t tmp; - grpc::testing::TestEnvironment env(&argc, argv); - test_no_op(); test_empty_find(); @@ -187,6 +187,10 @@ int main(int argc, char** argv) { n += prev; prev = tmp; } +} - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc index d4f9e3440f8..6253772d3bc 100644 --- a/test/core/transport/chttp2/varint_test.cc +++ b/test/core/transport/chttp2/varint_test.cc @@ -18,6 +18,8 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" +#include + #include #include #include @@ -32,10 +34,10 @@ static void test_varint(uint32_t value, uint8_t prefix_or, grpc_slice_from_copied_buffer(expect_bytes, expect_length); grpc_slice slice; gpr_log(GPR_DEBUG, "Test: 0x%08x", value); - GPR_ASSERT(w.length() == expect_length); + ASSERT_EQ(w.length(), expect_length); slice = grpc_slice_malloc(w.length()); w.Write(prefix_or, GRPC_SLICE_START_PTR(slice)); - GPR_ASSERT(grpc_slice_eq(expect, slice)); + ASSERT_TRUE(grpc_slice_eq(expect, slice)); grpc_slice_unref(expect); grpc_slice_unref(slice); } @@ -43,15 +45,18 @@ static void test_varint(uint32_t value, uint8_t prefix_or, #define TEST_VARINT(value, prefix_bits, prefix_or, expect) \ test_varint(value, prefix_or, expect, sizeof(expect) - 1) -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); +TEST(VarintTest, MainTest) { TEST_VARINT(0, 1, 0, "\x00"); TEST_VARINT(128, 1, 0, "\x7f\x01"); TEST_VARINT(16384, 1, 0, "\x7f\x81\x7f"); TEST_VARINT(2097152, 1, 0, "\x7f\x81\xff\x7f"); TEST_VARINT(268435456, 1, 0, "\x7f\x81\xff\xff\x7f"); TEST_VARINT(0xffffffff, 1, 0, "\x7f\x80\xff\xff\xff\x0f"); - grpc_shutdown(); - return 0; +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc index 715edfcb68d..405785ce4ed 100644 --- a/test/core/transport/status_conversion_test.cc +++ b/test/core/transport/status_conversion_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/transport/status_conversion.h" +#include + #include #include @@ -25,19 +27,19 @@ #include "test/core/util/test_config.h" #define GRPC_STATUS_TO_HTTP2_ERROR(a, b) \ - GPR_ASSERT(grpc_status_to_http2_error(a) == (b)) -#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ - do { \ - grpc_core::ExecCtx exec_ctx; \ - GPR_ASSERT(grpc_http2_error_to_grpc_status(a, deadline) == (b)); \ - \ + ASSERT_EQ(grpc_status_to_http2_error(a), (b)) +#define HTTP2_ERROR_TO_GRPC_STATUS(a, deadline, b) \ + do { \ + grpc_core::ExecCtx exec_ctx; \ + ASSERT_EQ(grpc_http2_error_to_grpc_status(a, deadline), (b)); \ + \ } while (0) #define GRPC_STATUS_TO_HTTP2_STATUS(a, b) \ - GPR_ASSERT(grpc_status_to_http2_status(a) == (b)) + ASSERT_EQ(grpc_status_to_http2_status(a), (b)) #define HTTP2_STATUS_TO_GRPC_STATUS(a, b) \ - GPR_ASSERT(grpc_http2_status_to_grpc_status(a) == (b)) + ASSERT_EQ(grpc_http2_status_to_grpc_status(a), (b)) -static void test_grpc_status_to_http2_error() { +TEST(StatusConversionTest, TestGrpcStatusToHttp2Error) { GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_OK, GRPC_HTTP2_NO_ERROR); GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_CANCELLED, GRPC_HTTP2_CANCEL); GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_UNKNOWN, GRPC_HTTP2_INTERNAL_ERROR); @@ -66,7 +68,7 @@ static void test_grpc_status_to_http2_error() { GRPC_STATUS_TO_HTTP2_ERROR(GRPC_STATUS_DATA_LOSS, GRPC_HTTP2_INTERNAL_ERROR); } -static void test_grpc_status_to_http2_status() { +TEST(StatusConversionTest, TestGrpcStatusToHttp2Status) { GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_OK, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_CANCELLED, 200); GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_UNKNOWN, 200); @@ -86,7 +88,7 @@ static void test_grpc_status_to_http2_status() { GRPC_STATUS_TO_HTTP2_STATUS(GRPC_STATUS_DATA_LOSS, 200); } -static void test_http2_error_to_grpc_status() { +TEST(StatusConversionTest, TestHttp2ErrorToGrpcStatus) { const grpc_core::Timestamp before_deadline = grpc_core::Timestamp::InfFuture(); HTTP2_ERROR_TO_GRPC_STATUS(GRPC_HTTP2_NO_ERROR, before_deadline, @@ -150,7 +152,7 @@ static void test_http2_error_to_grpc_status() { GRPC_STATUS_PERMISSION_DENIED); } -static void test_http2_status_to_grpc_status() { +TEST(StatusConversionTest, TestHttp2StatusToGrpcStatus) { HTTP2_STATUS_TO_GRPC_STATUS(200, GRPC_STATUS_OK); HTTP2_STATUS_TO_GRPC_STATUS(400, GRPC_STATUS_INTERNAL); HTTP2_STATUS_TO_GRPC_STATUS(401, GRPC_STATUS_UNAUTHENTICATED); @@ -166,21 +168,16 @@ static void test_http2_status_to_grpc_status() { HTTP2_STATUS_TO_GRPC_STATUS(504, GRPC_STATUS_UNAVAILABLE); } -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - - test_grpc_status_to_http2_error(); - test_grpc_status_to_http2_status(); - test_http2_error_to_grpc_status(); - test_http2_status_to_grpc_status(); - +TEST(StatusConversionTest, TestGrpcHttp2StatusToGrpcStatusAll) { /* check all status values can be converted */ for (int i = 0; i <= 999; i++) { grpc_http2_status_to_grpc_status(i); } +} - grpc_shutdown(); - - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 0fed3d15a1b..e69cc6e2e90 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -25,30 +25,6 @@ ], "uses_polling": false }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "alpn_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -141,54 +117,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "bin_decoder_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "bin_encoder_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -561,30 +489,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "hpack_encoder_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -967,54 +871,6 @@ ], "uses_polling": false }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "status_conversion_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "stream_map_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -1236,9 +1092,9 @@ "exclude_configs": [], "exclude_iomgrs": [], "flaky": false, - "gtest": false, - "language": "c", - "name": "varint_test", + "gtest": true, + "language": "c++", + "name": "activity_test", "platforms": [ "linux", "mac", @@ -1253,8 +1109,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -1262,14 +1117,13 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "activity_test", + "name": "address_sorting_test", "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], - "uses_polling": false + "uses_polling": true }, { "args": [], @@ -1285,7 +1139,7 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "address_sorting_test", + "name": "address_sorting_test_unsecure", "platforms": [ "linux", "mac", @@ -1299,7 +1153,8 @@ "ci_platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -1307,11 +1162,12 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "address_sorting_test_unsecure", + "name": "admin_services_end2end_test", "platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ], "uses_polling": true }, @@ -1321,8 +1177,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -1330,12 +1185,11 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "admin_services_end2end_test", + "name": "alarm_test", "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "uses_polling": true }, @@ -1345,7 +1199,8 @@ "ci_platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -1353,11 +1208,12 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "alarm_test", + "name": "alpn_test", "platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ], "uses_polling": true }, @@ -1979,6 +1835,54 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "bin_decoder_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "bin_encoder_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -4215,6 +4119,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "hpack_encoder_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -6563,6 +6491,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "status_conversion_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -6633,6 +6585,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "stream_map_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -7565,6 +7541,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "varint_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false,