From a10a8c6c0e299f07e95f5473f1ea1af16da3599b Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Wed, 10 Apr 2024 01:15:34 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASERT (#36224) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT Replacing GPR_ASSERT with absl CHECK Will not be replacing CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only a few - which fit into single - line regex will be changed. This would be small in number just to reduce the load later. Replacing CHECK with CHECK_EQ , CHECK_NE etc could be done using Cider-V once these changes are submitted if we want to clean up later. Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer. Closes #36224 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36224 from tanvi-jagtap:assert_end2end_general 0b0e940f5dbb27b1807f7160f523ce86a87db3cf PiperOrigin-RevId: 623410297 --- CMakeLists.txt | 33 +++++++++++++++++++ build_autogenerated.yaml | 33 +++++++++++++++++++ test/cpp/end2end/BUILD | 30 ++++++++++++++++- test/cpp/end2end/async_end2end_test.cc | 33 +++++++++---------- test/cpp/end2end/cfstream_test.cc | 8 +++-- test/cpp/end2end/channelz_service_test.cc | 3 +- .../end2end/client_callback_end2end_test.cc | 11 ++++--- test/cpp/end2end/client_crash_test.cc | 3 +- .../client_interceptors_end2end_test.cc | 15 ++++----- test/cpp/end2end/client_lb_end2end_test.cc | 7 ++-- .../end2end/connection_attempt_injector.cc | 11 ++++--- .../end2end/context_allocator_end2end_test.cc | 6 ++-- test/cpp/end2end/crl_provider_test.cc | 3 +- test/cpp/end2end/end2end_test.cc | 7 ++-- test/cpp/end2end/grpclb_end2end_test.cc | 13 ++++---- test/cpp/end2end/hybrid_end2end_test.cc | 28 ++++++++-------- test/cpp/end2end/interceptors_util.cc | 1 + test/cpp/end2end/interceptors_util.h | 3 +- .../end2end/message_allocator_end2end_test.cc | 8 +++-- test/cpp/end2end/nonblocking_test.cc | 3 +- test/cpp/end2end/port_sharing_end2end_test.cc | 4 ++- test/cpp/end2end/raw_end2end_test.cc | 4 ++- test/cpp/end2end/rls_end2end_test.cc | 3 +- test/cpp/end2end/server_crash_test.cc | 7 ++-- test/cpp/end2end/server_crash_test_client.cc | 9 ++--- .../end2end/service_config_end2end_test.cc | 5 +-- test/cpp/end2end/shutdown_test.cc | 10 +++--- test/cpp/end2end/test_service_impl.cc | 4 ++- test/cpp/end2end/test_service_impl.h | 4 ++- test/cpp/end2end/time_change_test.cc | 27 +++++++-------- test/cpp/end2end/tls_key_export_test.cc | 7 ++-- 31 files changed, 235 insertions(+), 108 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f31ae0474a2..5c1b05eba65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7111,6 +7111,7 @@ target_include_directories(async_end2end_test target_link_libraries(async_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -8140,6 +8141,7 @@ target_include_directories(binder_server_test target_link_libraries(binder_server_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -9636,6 +9638,7 @@ target_include_directories(cfstream_test target_link_libraries(cfstream_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -10053,6 +10056,7 @@ target_include_directories(channelz_service_test target_link_libraries(channelz_service_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpcpp_channelz grpc++_test_util ) @@ -10471,6 +10475,7 @@ target_include_directories(client_callback_end2end_test target_link_libraries(client_callback_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -10726,6 +10731,7 @@ target_include_directories(client_interceptors_end2end_test target_link_libraries(client_interceptors_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -10798,6 +10804,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_lb_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -11590,6 +11597,7 @@ target_include_directories(context_allocator_end2end_test target_link_libraries(context_allocator_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -11809,6 +11817,7 @@ target_include_directories(crl_provider_test target_link_libraries(crl_provider_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -12019,6 +12028,7 @@ target_include_directories(delegating_channel_test target_link_libraries(delegating_channel_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -12550,6 +12560,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(end2end_binder_transport_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -12615,6 +12626,7 @@ target_include_directories(end2end_test target_link_libraries(end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} + absl::check grpc++_test grpc++_test_util ) @@ -14168,6 +14180,7 @@ target_include_directories(flaky_network_test target_link_libraries(flaky_network_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -15199,6 +15212,7 @@ target_include_directories(grpc_authz_end2end_test target_link_libraries(grpc_authz_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_authorization_provider grpc++_test_util ) @@ -16210,6 +16224,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(grpclb_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_config grpc++_test_util ) @@ -16592,6 +16607,7 @@ target_include_directories(health_service_end2end_test target_link_libraries(health_service_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -17321,6 +17337,7 @@ target_include_directories(hybrid_end2end_test target_link_libraries(hybrid_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -19519,6 +19536,7 @@ target_include_directories(message_allocator_end2end_test target_link_libraries(message_allocator_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -20315,6 +20333,7 @@ target_include_directories(nonblocking_test target_link_libraries(nonblocking_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -20685,6 +20704,7 @@ target_include_directories(otel_plugin_test target_link_libraries(otel_plugin_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check opentelemetry-cpp::api opentelemetry-cpp::metrics grpc++_test_util @@ -21774,6 +21794,7 @@ target_include_directories(port_sharing_end2end_test target_link_libraries(port_sharing_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -22517,6 +22538,7 @@ target_include_directories(proto_server_reflection_test target_link_libraries(proto_server_reflection_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_reflection grpc++_test_util ) @@ -22960,6 +22982,7 @@ target_include_directories(raw_end2end_test target_link_libraries(raw_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -26093,6 +26116,7 @@ target_include_directories(rls_end2end_test target_link_libraries(rls_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_config grpc++_test_util ) @@ -26524,6 +26548,7 @@ target_include_directories(server_builder_plugin_test target_link_libraries(server_builder_plugin_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -27018,6 +27043,7 @@ target_include_directories(server_interceptors_end2end_test target_link_libraries(server_interceptors_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -27347,6 +27373,7 @@ target_include_directories(service_config_end2end_test target_link_libraries(service_config_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -27629,6 +27656,7 @@ target_include_directories(shutdown_test target_link_libraries(shutdown_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -30156,6 +30184,7 @@ target_include_directories(test_cpp_end2end_ssl_credentials_test target_link_libraries(test_cpp_end2end_ssl_credentials_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -31022,6 +31051,7 @@ target_include_directories(tls_credentials_test target_link_libraries(tls_credentials_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -31081,6 +31111,7 @@ target_include_directories(tls_key_export_test target_link_libraries(tls_key_export_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -33756,6 +33787,7 @@ target_include_directories(xds_credentials_end2end_test target_link_libraries(xds_credentials_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) @@ -34425,6 +34457,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_fallback_end2end_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc++_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 65bcd711ef9..4543ad07023 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5644,6 +5644,7 @@ targets: - test/cpp/end2end/async_end2end_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: auth_context_test gtest: true @@ -6126,6 +6127,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: binder_transport_test gtest: true @@ -7471,6 +7473,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: channel_args_test gtest: true @@ -7600,6 +7603,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpcpp_channelz - grpc++_test_util - name: check_gcp_environment_linux_test @@ -7872,6 +7876,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: client_channel_service_config_test gtest: true @@ -7943,6 +7948,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: client_lb_end2end_test gtest: true @@ -7967,6 +7973,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util platforms: - linux @@ -8380,6 +8387,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: context_test gtest: true @@ -8444,6 +8452,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: crl_ssl_transport_security_test gtest: true @@ -8549,6 +8558,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: destroy_grpclb_channel_with_active_connect_stress_test gtest: true @@ -8790,6 +8800,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util platforms: - linux @@ -8812,6 +8823,7 @@ targets: - test/cpp/end2end/interceptors_util.cc - test/cpp/end2end/test_service_impl.cc deps: + - absl/log:check - grpc++_test - grpc++_test_util - name: endpoint_addresses_test @@ -9786,6 +9798,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: flow_control_test gtest: true @@ -10447,6 +10460,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc_authorization_provider - grpc++_test_util - name: grpc_authz_test @@ -10877,6 +10891,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_config - grpc++_test_util platforms: @@ -11012,6 +11027,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: high_initial_seqno_test gtest: true @@ -11426,6 +11442,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: idle_filter_state_test gtest: true @@ -12768,6 +12785,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: message_compress_test gtest: true @@ -13175,6 +13193,7 @@ targets: - test/cpp/end2end/nonblocking_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: notification_test gtest: true @@ -13315,6 +13334,7 @@ targets: - test/cpp/ext/otel/otel_test_library.cc deps: - gtest + - absl/log:check - opentelemetry-cpp::api - opentelemetry-cpp::metrics - grpc++_test_util @@ -13916,6 +13936,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: posix_endpoint_test gtest: true @@ -14218,6 +14239,7 @@ targets: - test/cpp/util/proto_reflection_descriptor_database.cc deps: - gtest + - absl/log:check - grpc++_reflection - grpc++_test_util - name: proto_utils_test @@ -14427,6 +14449,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: rbac_service_config_parser_test gtest: true @@ -17126,6 +17149,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_config - grpc++_test_util - name: rls_lb_config_parser_test @@ -17289,6 +17313,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: server_builder_test gtest: true @@ -17504,6 +17529,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: server_registered_method_bad_client_test gtest: true @@ -17663,6 +17689,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: service_config_test gtest: true @@ -17844,6 +17871,7 @@ targets: - test/cpp/end2end/shutdown_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: simple_delayed_request_test gtest: true @@ -19048,6 +19076,7 @@ targets: - test/cpp/end2end/test_service_impl.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: test_cpp_ext_chaotic_good_test gtest: true @@ -19391,6 +19420,7 @@ targets: - test/cpp/end2end/tls_credentials_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: tls_key_export_test gtest: true @@ -19405,6 +19435,7 @@ targets: - test/cpp/end2end/tls_key_export_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: tls_security_connector_test gtest: true @@ -20692,6 +20723,7 @@ targets: - test/cpp/end2end/xds/xds_credentials_end2end_test.cc deps: - gtest + - absl/log:check - grpc++_test_util - name: xds_credentials_test gtest: true @@ -20922,6 +20954,7 @@ targets: - test/cpp/util/tls_test_utils.cc deps: - gtest + - absl/log:check - grpc++_test_util platforms: - linux diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 3e6c43ea53a..d8a09d6d3c0 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -28,6 +28,7 @@ grpc_cc_library( hdrs = ["test_service_impl.h"], external_deps = [ "gtest", + "absl/log:check", "absl/synchronization", ], deps = [ @@ -62,6 +63,9 @@ grpc_cc_library( testonly = True, srcs = ["connection_attempt_injector.cc"], hdrs = ["connection_attempt_injector.h"], + external_deps = [ + "absl/log:check", + ], deps = [ "//:grpc", ], @@ -73,6 +77,7 @@ grpc_cc_library( srcs = ["interceptors_util.cc"], hdrs = ["interceptors_util.h"], external_deps = [ + "absl/log:check", "gtest", ], deps = [ @@ -100,6 +105,7 @@ grpc_cc_test( name = "async_end2end_test", srcs = ["async_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], shard_count = 10, @@ -127,6 +133,7 @@ grpc_cc_test( ":client_crash_test_server", ], external_deps = [ + "absl/log:check", "gtest", ], tags = [ @@ -154,6 +161,7 @@ grpc_cc_test( ":client_crash_test_server", ], external_deps = [ + "absl/log:check", "gtest", ], tags = [ @@ -223,6 +231,7 @@ grpc_cc_test( name = "client_callback_end2end_test", srcs = ["client_callback_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -263,6 +272,7 @@ grpc_cc_test( name = "client_interceptors_end2end_test", srcs = ["client_interceptors_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -284,6 +294,7 @@ grpc_cc_library( testonly = True, srcs = ["end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], linkstatic = True, @@ -314,6 +325,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], external_deps = [ + "absl/log:check", "gtest", ], # TODO(yulin-liang): The test is not able to load the certificate files on @@ -435,6 +447,7 @@ grpc_cc_test( name = "hybrid_end2end_test", srcs = ["hybrid_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -455,6 +468,7 @@ grpc_cc_test( name = "raw_end2end_test", srcs = ["raw_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -495,6 +509,7 @@ grpc_cc_test( name = "nonblocking_test", srcs = ["nonblocking_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -513,6 +528,7 @@ grpc_cc_test( name = "client_lb_end2end_test", srcs = ["client_lb_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], flaky = True, # TODO(b/151315347) @@ -547,8 +563,9 @@ grpc_cc_test( name = "rls_end2end_test", srcs = ["rls_end2end_test.cc"], external_deps = [ - "gtest", + "absl/log:check", "absl/types:optional", + "gtest", ], flaky = True, tags = [ @@ -579,6 +596,7 @@ grpc_cc_test( name = "service_config_end2end_test", srcs = ["service_config_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -600,6 +618,7 @@ grpc_cc_test( name = "grpclb_end2end_test", srcs = ["grpclb_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], flaky = True, # TODO(b/150567713) @@ -676,6 +695,7 @@ grpc_cc_test( ":server_crash_test_client", ], external_deps = [ + "absl/log:check", "gtest", ], tags = [ @@ -701,6 +721,7 @@ grpc_cc_binary( srcs = ["server_crash_test_client.cc"], external_deps = [ "absl/flags:flag", + "absl/log:check", "gtest", ], deps = [ @@ -784,6 +805,7 @@ grpc_cc_test( name = "shutdown_test", srcs = ["shutdown_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -849,6 +871,7 @@ grpc_cc_test( name = "cfstream_test", srcs = ["cfstream_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = [ @@ -877,6 +900,7 @@ grpc_cc_test( name = "message_allocator_end2end_test", srcs = ["message_allocator_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -897,6 +921,7 @@ grpc_cc_test( name = "context_allocator_end2end_test", srcs = ["context_allocator_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -917,6 +942,7 @@ grpc_cc_test( name = "port_sharing_end2end_test", srcs = ["port_sharing_end2end_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -987,6 +1013,7 @@ grpc_cc_test( "//src/core/tsi/test_creds:server0.pem", ], external_deps = [ + "absl/log:check", "gtest", ], tags = ["cpp_end2end_test"], @@ -1103,6 +1130,7 @@ grpc_cc_test( "//test/core/tsi/test_creds/crl_data/crls:current.crl", ], external_deps = [ + "absl/log:check", "gtest", ], tags = ["crl_provider_test"], diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 22da0ecd6d3..14f22aa662b 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -20,6 +20,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -128,7 +129,7 @@ class Verifier { // This version of Verify allows optionally ignoring the // outcome of the expectation void Verify(CompletionQueue* cq, bool ignore_ok) { - GPR_ASSERT(!expectations_.empty() || !maybe_expectations_.empty()); + CHECK(!expectations_.empty() || !maybe_expectations_.empty()); while (!expectations_.empty()) { Next(cq, ignore_ok); } @@ -1476,7 +1477,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { // just added int got_tag = verif.Expect(tag_idx, expected_server_cq_result) .Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == tag_idx) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag == tag_idx) || (got_tag == 11 && want_done_tag)); if (got_tag == 11) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; @@ -1626,7 +1627,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { // just added int got_tag = verif.Expect(tag_idx, expected_cq_result) .Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == tag_idx) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag == tag_idx) || (got_tag == 11 && want_done_tag)); if (got_tag == 11) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; @@ -1738,7 +1739,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { do { got_tag = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT(((got_tag == 3) && !tag_3_done) || (got_tag == 11)); + CHECK(((got_tag == 3) && !tag_3_done) || (got_tag == 11)); if (got_tag == 3) { tag_3_done = true; } @@ -1766,17 +1767,16 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { verif.Expect(4, expected_cq_result); got_tag = tag_3_done ? 3 : verif.Next(cq_.get(), ignore_cq_result); got_tag2 = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == 3) || (got_tag == 4) || - (got_tag == 11 && want_done_tag)); - GPR_ASSERT((got_tag2 == 3) || (got_tag2 == 4) || - (got_tag2 == 11 && want_done_tag)); + CHECK((got_tag == 3) || (got_tag == 4) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag2 == 3) || (got_tag2 == 4) || + (got_tag2 == 11 && want_done_tag)); // If we get 3 and 4, we don't need to wait for 11, but if // we get 11, we should also clear 3 and 4 if (got_tag + got_tag2 != 7) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; got_tag = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == 3) || (got_tag == 4)); + CHECK((got_tag == 3) || (got_tag == 4)); } send_response.set_message("Pong"); @@ -1787,17 +1787,16 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { verif.Expect(6, expected_cq_result); got_tag = verif.Next(cq_.get(), ignore_cq_result); got_tag2 = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == 5) || (got_tag == 6) || - (got_tag == 11 && want_done_tag)); - GPR_ASSERT((got_tag2 == 5) || (got_tag2 == 6) || - (got_tag2 == 11 && want_done_tag)); + CHECK((got_tag == 5) || (got_tag == 6) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag2 == 5) || (got_tag2 == 6) || + (got_tag2 == 11 && want_done_tag)); // If we get 5 and 6, we don't need to wait for 11, but if // we get 11, we should also clear 5 and 6 if (got_tag + got_tag2 != 11) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; got_tag = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == 5) || (got_tag == 6)); + CHECK((got_tag == 5) || (got_tag == 6)); } // This is expected to succeed in all cases @@ -1808,7 +1807,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { bool ignore_cq_wd_result = ignore_cq_result || (server_try_cancel == CANCEL_BEFORE_PROCESSING); got_tag = verif.Next(cq_.get(), ignore_cq_wd_result); - GPR_ASSERT((got_tag == 7) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag == 7) || (got_tag == 11 && want_done_tag)); if (got_tag == 11) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; @@ -1823,7 +1822,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { srv_stream.Read(&recv_request, tag(8)); verif.Expect(8, false); got_tag = verif.Next(cq_.get(), ignore_cq_result); - GPR_ASSERT((got_tag == 8) || (got_tag == 11 && want_done_tag)); + CHECK((got_tag == 8) || (got_tag == 11 && want_done_tag)); if (got_tag == 11) { EXPECT_TRUE(srv_ctx.IsCancelled()); want_done_tag = false; @@ -1918,7 +1917,7 @@ std::vector CreateTestScenarios(bool /*test_secure*/, for (auto sec = sec_list.begin(); sec != sec_list.end(); sec++) { credentials_types.push_back(*sec); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); messages.push_back("Hello"); if (test_message_size_limit) { diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index 61627febc88..8dcde8c44eb 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -24,6 +24,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -188,7 +190,7 @@ class CFStreamTest : public ::testing::TestWithParam { } else if (ret == grpc::CompletionQueue::SHUTDOWN) { return false; } else { - GPR_ASSERT(ret == grpc::CompletionQueue::TIMEOUT); + CHECK(ret == grpc::CompletionQueue::TIMEOUT); // This can happen if we hit the Apple CFStream bug which results in the // read stream freezing. We are ignoring hangs and timeouts, but these // tests are still useful as they can catch memory memory corruptions, @@ -375,7 +377,7 @@ TEST_P(CFStreamTest, NetworkFlapRpcsInFlight) { while (CQNext(&got_tag, &ok)) { ++total_completions; - GPR_ASSERT(ok); + CHECK(ok); AsyncClientCall* call = static_cast(got_tag); if (!call->status.ok()) { gpr_log(GPR_DEBUG, "RPC failed with error: %s", @@ -422,7 +424,7 @@ TEST_P(CFStreamTest, ConcurrentRpc) { while (CQNext(&got_tag, &ok)) { ++total_completions; - GPR_ASSERT(ok); + CHECK(ok); AsyncClientCall* call = static_cast(got_tag); if (!call->status.ok()) { gpr_log(GPR_DEBUG, "RPC failed with error: %s", diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 2a707af9243..520c59f5c15 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -19,6 +19,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -94,7 +95,7 @@ class Proxy : public grpc::testing::EchoTestService::Service { std::unique_ptr client_context = ClientContext::FromServerContext(*server_context); size_t idx = request->param().backend_channel_idx(); - GPR_ASSERT(idx < stubs_.size()); + CHECK(idx < stubs_.size()); return stubs_[idx]->Echo(client_context.get(), *request, response); } diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index 3e0eddf1526..63cd0b86d85 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -25,6 +25,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -196,7 +197,7 @@ class ClientCallbackEnd2endTest &cli_ctx, &request, &response, [&cli_ctx, &request, &response, &done, &mu, &cv, val, with_binary_metadata](Status s) { - GPR_ASSERT(s.ok()); + CHECK(s.ok()); EXPECT_EQ(request.message(), response.message()); if (with_binary_metadata) { @@ -238,7 +239,7 @@ class ClientCallbackEnd2endTest generic_stub_->UnaryCall( &cli_ctx, kMethodName, options, send_buf.get(), &recv_buf, [&request, &recv_buf, &done, &mu, &cv, maybe_except](Status s) { - GPR_ASSERT(s.ok()); + CHECK(s.ok()); EchoResponse response; EXPECT_TRUE(ParseFromByteBuffer(&recv_buf, &response)); @@ -251,7 +252,7 @@ class ClientCallbackEnd2endTest throw -1; } #else - GPR_ASSERT(!maybe_except); + CHECK(!maybe_except); #endif }); std::unique_lock l(mu); @@ -486,7 +487,7 @@ TEST_P(ClientCallbackEnd2endTest, SendClientInitialMetadata) { bool done = false; stub_->async()->CheckClientInitialMetadata( &cli_ctx, &request, &response, [&done, &mu, &cv](Status s) { - GPR_ASSERT(s.ok()); + CHECK(s.ok()); std::lock_guard l(mu); done = true; @@ -1539,7 +1540,7 @@ std::vector CreateTestScenarios(bool test_insecure) { if (test_insecure && insec_ok()) { credentials_types.push_back(kInsecureCredentialsType); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); bool barr[]{false, true}; Protocol parr[]{Protocol::INPROC, Protocol::TCP}; diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index b24b2f06b51..b69a7556a0d 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -57,7 +58,7 @@ class CrashTest : public ::testing::Test { g_root + "/client_crash_test_server", "--address=" + addr, })); - GPR_ASSERT(server_); + CHECK(server_); return grpc::testing::EchoTestService::NewStub( grpc::CreateChannel(addr, InsecureChannelCredentials())); } diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc index c99e4d65cdc..3b453cef930 100644 --- a/test/cpp/end2end/client_interceptors_end2end_test.cc +++ b/test/cpp/end2end/client_interceptors_end2end_test.cc @@ -21,6 +21,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -759,15 +760,13 @@ class ParameterizedClientInterceptorsEnd2endTest #ifdef GRPC_POSIX_SOCKET else if (GetParam().channel_type() == ChannelType::kFdChannel) { int flags; - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv_) == 0); + CHECK_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv_), 0); flags = fcntl(sv_[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv_[0], F_SETFL, flags | O_NONBLOCK) == 0); + CHECK_EQ(fcntl(sv_[0], F_SETFL, flags | O_NONBLOCK), 0); flags = fcntl(sv_[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv_[1], F_SETFL, flags | O_NONBLOCK) == 0); - GPR_ASSERT(grpc_set_socket_no_sigpipe_if_possible(sv_[0]) == - absl::OkStatus()); - GPR_ASSERT(grpc_set_socket_no_sigpipe_if_possible(sv_[1]) == - absl::OkStatus()); + CHECK_EQ(fcntl(sv_[1], F_SETFL, flags | O_NONBLOCK), 0); + CHECK(grpc_set_socket_no_sigpipe_if_possible(sv_[0]) == absl::OkStatus()); + CHECK(grpc_set_socket_no_sigpipe_if_possible(sv_[1]) == absl::OkStatus()); server_ = builder.BuildAndStart(); AddInsecureChannelFromFd(server_.get(), sv_[1]); } @@ -1262,6 +1261,6 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); // Make sure that gRPC shuts down cleanly - GPR_ASSERT(grpc_wait_until_shutdown(10)); + CHECK(grpc_wait_until_shutdown(10)); return ret; } diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 366c933dfea..cc86a350eba 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -25,6 +25,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -238,9 +239,9 @@ class FakeResolverResponseGeneratorWrapper { for (const int& port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - GPR_ASSERT(lb_uri.ok()); + CHECK(lb_uri.ok()); grpc_resolved_address address; - GPR_ASSERT(grpc_parse_uri(*lb_uri, &address)); + CHECK(grpc_parse_uri(*lb_uri, &address)); result.addresses->emplace_back(address, per_address_args); } if (result.addresses->empty()) { @@ -3061,7 +3062,7 @@ class WeightedRoundRobinTest : public ClientLbEnd2endTest { const std::unique_ptr& stub, const std::vector& expected_weights, size_t total_passes = 3, EchoRequest* request_ptr = nullptr, int timeout_ms = 15000) { - GPR_ASSERT(expected_weights.size() == servers_.size()); + CHECK(expected_weights.size() == servers_.size()); size_t total_picks_per_pass = 0; for (size_t picks : expected_weights) { total_picks_per_pass += picks; diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index 58cf8bde631..bacfd15e1be 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -16,6 +16,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/utility/utility.h" @@ -89,9 +90,9 @@ bool ConnectionAttemptInjector::TcpConnectCancel( ConnectionAttemptInjector::ConnectionAttemptInjector() { // Fail if ConnectionAttemptInjector::Init() was not called after // grpc_init() to inject the vtable. - GPR_ASSERT(grpc_tcp_client_impl == &kDelayedConnectVTable); + CHECK(grpc_tcp_client_impl == &kDelayedConnectVTable); grpc_core::MutexLock lock(g_mu); - GPR_ASSERT(g_injector == nullptr); + CHECK_EQ(g_injector, nullptr); g_injector = this; } @@ -168,18 +169,18 @@ ConnectionAttemptInjector::QueuedAttempt::QueuedAttempt( } ConnectionAttemptInjector::QueuedAttempt::~QueuedAttempt() { - GPR_ASSERT(closure_ == nullptr); + CHECK_EQ(closure_, nullptr); } void ConnectionAttemptInjector::QueuedAttempt::Resume() { - GPR_ASSERT(closure_ != nullptr); + CHECK_NE(closure_, nullptr); g_original_vtable->connect(closure_, endpoint_, interested_parties_, config_, &address_, deadline_); closure_ = nullptr; } void ConnectionAttemptInjector::QueuedAttempt::Fail(grpc_error_handle error) { - GPR_ASSERT(closure_ != nullptr); + CHECK_NE(closure_, nullptr); grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure_, error); closure_ = nullptr; } diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc index 57c4c568e91..ae3222f7395 100644 --- a/test/cpp/end2end/context_allocator_end2end_test.cc +++ b/test/cpp/end2end/context_allocator_end2end_test.cc @@ -27,6 +27,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -148,7 +150,7 @@ class ContextAllocatorEnd2endTestBase stub_->async()->Echo( &cli_ctx, &request, &response, [&request, &response, &done, &mu, &cv, val](Status s) { - GPR_ASSERT(s.ok()); + CHECK(s.ok()); EXPECT_EQ(request.message(), response.message()); std::lock_guard l(mu); @@ -292,7 +294,7 @@ std::vector CreateTestScenarios(bool test_insecure) { if (test_insecure && insec_ok()) { credentials_types.push_back(kInsecureCredentialsType); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); Protocol parr[]{Protocol::INPROC, Protocol::TCP}; for (Protocol p : parr) { diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc index 28dabae37d3..cebc07ea8c6 100644 --- a/test/cpp/end2end/crl_provider_test.cc +++ b/test/cpp/end2end/crl_provider_test.cc @@ -21,6 +21,7 @@ #include +#include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -101,7 +102,7 @@ class CrlProviderTest : public ::testing::Test { options.set_cert_request_type( GRPC_SSL_REQUEST_AND_REQUIRE_CLIENT_CERTIFICATE_AND_VERIFY); auto server_credentials = grpc::experimental::TlsServerCredentials(options); - GPR_ASSERT(server_credentials.get() != nullptr); + CHECK_NE(server_credentials.get(), nullptr); grpc::ServerBuilder builder; TestServiceImpl service_; diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 5e3b44bfaf8..ac00660b84b 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -19,6 +19,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/ascii.h" #include "absl/strings/match.h" @@ -1746,8 +1747,8 @@ TEST_P(ProxyEnd2endTest, Peer) { class SecureEnd2endTest : public End2endTest { protected: SecureEnd2endTest() { - GPR_ASSERT(!GetParam().use_proxy()); - GPR_ASSERT(GetParam().credentials_type() != kInsecureCredentialsType); + CHECK(!GetParam().use_proxy()); + CHECK(GetParam().credentials_type() != kInsecureCredentialsType); } }; @@ -2279,7 +2280,7 @@ std::vector CreateTestScenarios(bool use_proxy, } // Test callback with inproc or if the event-engine allows it - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); for (const auto& cred : credentials_types) { scenarios.emplace_back(false, false, false, cred, false); scenarios.emplace_back(true, false, false, cred, false); diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 5f90950902e..408f45c794b 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -26,6 +26,7 @@ #include #include "absl/cleanup/cleanup.h" +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -162,13 +163,13 @@ class BackendServiceImpl : public BackendService { std::string Ip4ToPackedString(const char* ip_str) { struct in_addr ip4; - GPR_ASSERT(inet_pton(AF_INET, ip_str, &ip4) == 1); + CHECK_EQ(inet_pton(AF_INET, ip_str, &ip4), 1); return std::string(reinterpret_cast(&ip4), sizeof(ip4)); } std::string Ip6ToPackedString(const char* ip_str) { struct in6_addr ip6; - GPR_ASSERT(inet_pton(AF_INET6, ip_str, &ip6) == 1); + CHECK_EQ(inet_pton(AF_INET6, ip_str, &ip6), 1); return std::string(reinterpret_cast(&ip6), sizeof(ip6)); } @@ -450,7 +451,7 @@ class GrpclbEnd2endTest : public ::testing::Test { void Start() { gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_); - GPR_ASSERT(!running_); + CHECK(!running_); running_ = true; service_.Start(); grpc_core::Mutex mu; @@ -707,9 +708,9 @@ class GrpclbEnd2endTest : public ::testing::Test { for (int port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - GPR_ASSERT(lb_uri.ok()); + CHECK(lb_uri.ok()); grpc_resolved_address address; - GPR_ASSERT(grpc_parse_uri(*lb_uri, &address)); + CHECK(grpc_parse_uri(*lb_uri, &address)); grpc_core::ChannelArgs args; if (!balancer_name.empty()) { args = args.Set(GRPC_ARG_DEFAULT_AUTHORITY, balancer_name); @@ -728,7 +729,7 @@ class GrpclbEnd2endTest : public ::testing::Test { result.addresses = std::move(backends); result.service_config = grpc_core::ServiceConfigImpl::Create( grpc_core::ChannelArgs(), service_config_json); - GPR_ASSERT(result.service_config.ok()); + CHECK(result.service_config.ok()); result.args = grpc_core::SetGrpcLbBalancerAddresses( grpc_core::ChannelArgs(), std::move(balancers)); response_generator_->SetResponseSynchronously(std::move(result)); diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index d9c3d75da28..d1567786feb 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -21,6 +21,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -212,7 +214,7 @@ void HandleGenericCall(AsyncGenericService* service, HandleGenericRequestStream(&stream, cq); } else { // other methods not handled yet. gpr_log(GPR_ERROR, "method: %s", srv_ctx.method().c_str()); - GPR_ASSERT(0); + CHECK(0); } } @@ -571,9 +573,9 @@ class StreamedUnaryDupPkg uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); return Status::OK; } }; @@ -609,9 +611,9 @@ class FullyStreamedUnaryDupPkg uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); return Status::OK; } }; @@ -648,10 +650,10 @@ class SplitResponseStreamDupPkg uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); } return Status::OK; } @@ -688,10 +690,10 @@ class FullySplitStreamedDupPkg uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); } return Status::OK; } @@ -727,9 +729,9 @@ class FullyStreamedDupPkg : public duplicate::EchoTestService::StreamedService { uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); return Status::OK; } Status StreamedResponseStream( @@ -740,10 +742,10 @@ class FullyStreamedDupPkg : public duplicate::EchoTestService::StreamedService { uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); - GPR_ASSERT(stream->Read(&req)); + CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); - GPR_ASSERT(stream->Write(resp)); + CHECK(stream->Write(resp)); } return Status::OK; } diff --git a/test/cpp/end2end/interceptors_util.cc b/test/cpp/end2end/interceptors_util.cc index 58a26b0950a..f2c9d65c9d9 100644 --- a/test/cpp/end2end/interceptors_util.cc +++ b/test/cpp/end2end/interceptors_util.cc @@ -18,6 +18,7 @@ #include "test/cpp/end2end/interceptors_util.h" +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h index a2e096e6e8a..73e443a46b3 100644 --- a/test/cpp/end2end/interceptors_util.h +++ b/test/cpp/end2end/interceptors_util.h @@ -23,6 +23,7 @@ #include +#include "absl/log/check.h" #include "absl/strings/str_format.h" #include @@ -293,7 +294,7 @@ class Verifier { // This version of Verify allows optionally ignoring the // outcome of the expectation void Verify(CompletionQueue* cq, bool ignore_ok) { - GPR_ASSERT(!expectations_.empty() || !maybe_expectations_.empty()); + CHECK(!expectations_.empty() || !maybe_expectations_.empty()); while (!expectations_.empty()) { Next(cq, ignore_ok); } diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc index 530ec6daf60..dac562b7532 100644 --- a/test/cpp/end2end/message_allocator_end2end_test.cc +++ b/test/cpp/end2end/message_allocator_end2end_test.cc @@ -28,6 +28,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -173,7 +175,7 @@ class MessageAllocatorEnd2endTestBase stub_->async()->Echo( &cli_ctx, &request, &response, [&request, &response, &done, &mu, &cv, val](Status s) { - GPR_ASSERT(s.ok()); + CHECK(s.ok()); EXPECT_EQ(request.message(), response.message()); std::lock_guard l(mu); @@ -330,7 +332,7 @@ class ArenaAllocatorTest : public MessageAllocatorEnd2endTestBase { google::protobuf::Arena::CreateMessage(&arena_)); } void Release() override { delete this; } - void FreeRequest() override { GPR_ASSERT(0); } + void FreeRequest() override { CHECK(0); } private: google::protobuf::Arena arena_; @@ -365,7 +367,7 @@ std::vector CreateTestScenarios(bool test_insecure) { if (test_insecure && insec_ok()) { credentials_types.push_back(kInsecureCredentialsType); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); Protocol parr[]{Protocol::INPROC, Protocol::TCP}; for (Protocol p : parr) { diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc index c3636058bbe..79c79463618 100644 --- a/test/cpp/end2end/nonblocking_test.cc +++ b/test/cpp/end2end/nonblocking_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -52,7 +53,7 @@ int maybe_assert_non_blocking_poll(struct pollfd* pfds, nfds_t nfds, // Only assert that this poll should have zero timeout if we're in the // middle of a zero-timeout CQ Next. if (g_is_nonblocking_poll) { - GPR_ASSERT(timeout == 0); + CHECK_EQ(timeout, 0); } return poll(pfds, nfds, timeout); } diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index a02e174b5cd..1de11fb2baf 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -21,6 +21,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -325,7 +327,7 @@ std::vector CreateTestScenarios() { credentials_types.push_back(kInsecureCredentialsType); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); for (const auto& cred : credentials_types) { for (auto server_has_port : {true, false}) { for (auto queue_pending_data : {true, false}) { diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index 2b883d0d4c0..0e76355d80e 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -22,6 +22,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -77,7 +79,7 @@ class Verifier { // Verify keeps calling Next until all currently set // expected tags are complete void Verify(CompletionQueue* cq) { - GPR_ASSERT(!expectations_.empty()); + CHECK(!expectations_.empty()); while (!expectations_.empty()) { Next(cq, false); } diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 07d9359b95b..942c183b890 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -28,6 +28,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" @@ -413,7 +414,7 @@ class RlsEnd2endTest : public ::testing::Test { void Start() { gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_); - GPR_ASSERT(!running_); + CHECK(!running_); running_ = true; service_.Start(); grpc::internal::Mutex mu; diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index 20a673e5467..a42f2168967 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -104,7 +105,7 @@ class CrashTest : public ::testing::Test { client_ = std::make_unique( std::vector({g_root + "/server_crash_test_client", "--address=" + addr, "--mode=" + mode})); - GPR_ASSERT(client_); + CHECK(client_); ServerBuilder builder; builder.AddListeningPort(addr, grpc::InsecureServerCredentials()); @@ -130,7 +131,7 @@ TEST_F(CrashTest, ResponseStream) { gpr_time_from_seconds(60, GPR_TIMESPAN))); KillClient(); server->Shutdown(); - GPR_ASSERT(HadOneResponseStream()); + CHECK(HadOneResponseStream()); } TEST_F(CrashTest, BidiStream) { @@ -140,7 +141,7 @@ TEST_F(CrashTest, BidiStream) { gpr_time_from_seconds(60, GPR_TIMESPAN))); KillClient(); server->Shutdown(); - GPR_ASSERT(HadOneBidiStream()); + CHECK(HadOneBidiStream()); } } // namespace diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index db1760d393a..29f4f1bddb0 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -22,6 +22,7 @@ #include #include "absl/flags/flag.h" +#include "absl/log/check.h" #include #include @@ -54,16 +55,16 @@ int main(int argc, char** argv) { std::ostringstream msg; msg << "Hello " << i; request.set_message(msg.str()); - GPR_ASSERT(stream->Write(request)); - GPR_ASSERT(stream->Read(&response)); - GPR_ASSERT(response.message() == request.message()); + CHECK(stream->Write(request)); + CHECK(stream->Read(&response)); + CHECK(response.message() == request.message()); } } else if (absl::GetFlag(FLAGS_mode) == "response") { EchoRequest request; request.set_message("Hello"); auto stream = stub->ResponseStream(&context, request); for (;;) { - GPR_ASSERT(stream->Read(&response)); + CHECK(stream->Read(&response)); } } else { gpr_log(GPR_ERROR, "invalid test mode '%s'", diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 966097015ac..9a002aea033 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -27,6 +27,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" @@ -174,9 +175,9 @@ class ServiceConfigEnd2endTest : public ::testing::Test { for (const int& port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - GPR_ASSERT(lb_uri.ok()); + CHECK(lb_uri.ok()); grpc_resolved_address address; - GPR_ASSERT(grpc_parse_uri(*lb_uri, &address)); + CHECK(grpc_parse_uri(*lb_uri, &address)); result.addresses->emplace_back(address, grpc_core::ChannelArgs()); } return result; diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index ec623e8b135..3a146242b8b 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -20,6 +20,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -77,7 +79,7 @@ class ShutdownTest : public ::testing::TestWithParam { return server; } - void TearDown() override { GPR_ASSERT(shutdown_); } + void TearDown() override { CHECK(shutdown_); } void ResetStub() { string target = "dns:localhost:" + to_string(port_); @@ -99,9 +101,9 @@ class ShutdownTest : public ::testing::TestWithParam { EchoResponse response; request.set_message("Hello"); ClientContext context; - GPR_ASSERT(!shutdown_); + CHECK(!shutdown_); Status s = stub_->Echo(&context, request, &response); - GPR_ASSERT(shutdown_); + CHECK(shutdown_); } protected: @@ -124,7 +126,7 @@ std::vector GetAllCredentialsTypeList() { for (auto sec = sec_list.begin(); sec != sec_list.end(); sec++) { credentials_types.push_back(*sec); } - GPR_ASSERT(!credentials_types.empty()); + CHECK(!credentials_types.empty()); std::string credentials_type_list("credentials types:"); for (const string& type : credentials_types) { diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc index 6ba40dae6a9..b721ed5382a 100644 --- a/test/cpp/end2end/test_service_impl.cc +++ b/test/cpp/end2end/test_service_impl.cc @@ -23,6 +23,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -210,7 +212,7 @@ ServerUnaryReactor* CallbackTestServiceImpl::Echo( } if (req_->has_param() && req_->param().server_die()) { gpr_log(GPR_ERROR, "The request should not reach application handler."); - GPR_ASSERT(0); + CHECK(0); } if (req_->has_param() && req_->param().has_expected_error()) { const auto& error = req_->param().expected_error(); diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h index 9415b88c199..a9e138b7467 100644 --- a/test/cpp/end2end/test_service_impl.h +++ b/test/cpp/end2end/test_service_impl.h @@ -27,6 +27,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -169,7 +171,7 @@ class TestMultipleServiceImpl : public RpcService { if (request->has_param() && request->param().server_die()) { gpr_log(GPR_ERROR, "The request should not reach application handler."); - GPR_ASSERT(0); + CHECK(0); } if (request->has_param() && request->param().has_expected_error()) { const auto& error = request->param().expected_error(); diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index 11dced76405..00a396318ef 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -22,6 +22,7 @@ #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -56,8 +57,8 @@ static gpr_timespec now_impl(gpr_clock_type clock) { if (clock != GPR_CLOCK_REALTIME) { return ts; } - GPR_ASSERT(ts.tv_nsec >= 0); - GPR_ASSERT(ts.tv_nsec < GPR_NS_PER_SEC); + CHECK_GE(ts.tv_nsec, 0); + CHECK(ts.tv_nsec < GPR_NS_PER_SEC); gpr_mu_lock(&g_mu); ts.tv_sec += g_time_shift_sec; ts.tv_nsec += g_time_shift_nsec; @@ -123,9 +124,9 @@ TEST(TimespecTest, GrpcNegativeMillisToTimespec) { gpr_timespec ts = grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch(-1500) .as_timespec(GPR_CLOCK_MONOTONIC); - GPR_ASSERT(ts.tv_sec = -2); - GPR_ASSERT(ts.tv_nsec = 5e8); - GPR_ASSERT(ts.clock_type == GPR_CLOCK_MONOTONIC); + CHECK(ts.tv_sec = -2); + CHECK(ts.tv_nsec = 5e8); + CHECK(ts.clock_type == GPR_CLOCK_MONOTONIC); } class TimeChangeTest : public ::testing::Test { @@ -141,11 +142,11 @@ class TimeChangeTest : public ::testing::Test { g_root + "/client_crash_test_server", "--address=" + server_address_, })); - GPR_ASSERT(server_); + CHECK(server_); // connect to server and make sure it's reachable. auto channel = grpc::CreateChannel(server_address_, InsecureChannelCredentials()); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE(channel->WaitForConnected( grpc_timeout_milliseconds_to_deadline(30000))); } @@ -155,7 +156,7 @@ class TimeChangeTest : public ::testing::Test { void SetUp() override { channel_ = grpc::CreateChannel(server_address_, InsecureChannelCredentials()); - GPR_ASSERT(channel_); + CHECK(channel_); stub_ = grpc::testing::EchoTestService::NewStub(channel_); } @@ -188,7 +189,7 @@ TEST_F(TimeChangeTest, TimeJumpForwardBeforeStreamCreated) { context.AddMetadata(kServerResponseStreamsToSend, "1"); auto channel = GetChannel(); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE( channel->WaitForConnected(grpc_timeout_milliseconds_to_deadline(5000))); auto stub = CreateStub(); @@ -215,7 +216,7 @@ TEST_F(TimeChangeTest, TimeJumpBackBeforeStreamCreated) { context.AddMetadata(kServerResponseStreamsToSend, "1"); auto channel = GetChannel(); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE( channel->WaitForConnected(grpc_timeout_milliseconds_to_deadline(5000))); auto stub = CreateStub(); @@ -243,7 +244,7 @@ TEST_F(TimeChangeTest, TimeJumpForwardAfterStreamCreated) { context.AddMetadata(kServerResponseStreamsToSend, "2"); auto channel = GetChannel(); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE( channel->WaitForConnected(grpc_timeout_milliseconds_to_deadline(5000))); auto stub = CreateStub(); @@ -275,7 +276,7 @@ TEST_F(TimeChangeTest, TimeJumpBackAfterStreamCreated) { context.AddMetadata(kServerResponseStreamsToSend, "2"); auto channel = GetChannel(); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE( channel->WaitForConnected(grpc_timeout_milliseconds_to_deadline(5000))); auto stub = CreateStub(); @@ -307,7 +308,7 @@ TEST_F(TimeChangeTest, TimeJumpForwardAndBackDuringCall) { context.AddMetadata(kServerResponseStreamsToSend, "2"); auto channel = GetChannel(); - GPR_ASSERT(channel); + CHECK(channel); EXPECT_TRUE( channel->WaitForConnected(grpc_timeout_milliseconds_to_deadline(5000))); diff --git a/test/cpp/end2end/tls_key_export_test.cc b/test/cpp/end2end/tls_key_export_test.cc index 67e3e9de900..261f7969784 100644 --- a/test/cpp/end2end/tls_key_export_test.cc +++ b/test/cpp/end2end/tls_key_export_test.cc @@ -17,6 +17,7 @@ #include // NOLINT #include +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" @@ -128,9 +129,9 @@ class TlsKeyLoggingEnd2EndTest : public ::testing::TestWithParam { std::string CreateTmpFile() { char* name = nullptr; FILE* file_descriptor = gpr_tmpfile("GrpcTlsKeyLoggerTest", &name); - GPR_ASSERT(fclose(file_descriptor) == 0); - GPR_ASSERT(file_descriptor != nullptr); - GPR_ASSERT(name != nullptr); + CHECK_EQ(fclose(file_descriptor), 0); + CHECK_NE(file_descriptor, nullptr); + CHECK_NE(name, nullptr); std::string name_to_return = name; gpr_free(name); return name_to_return;