diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 520c59f5c15..f95ffb21945 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -95,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(); - CHECK(idx < stubs_.size()); + CHECK_LT(idx, stubs_.size()); return stubs_[idx]->Echo(client_context.get(), *request, response); } diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index d6f95b4ad94..ad74d7f7f97 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -239,7 +239,7 @@ class FakeResolverResponseGeneratorWrapper { for (const int& port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - CHECK(lb_uri.ok()); + CHECK_OK(lb_uri); grpc_resolved_address address; CHECK(grpc_parse_uri(*lb_uri, &address)); result.addresses->emplace_back(address, per_address_args); @@ -3018,7 +3018,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) { - CHECK(expected_weights.size() == servers_.size()); + CHECK_EQ(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/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index 91be4134f12..bfad3551a83 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -709,7 +709,7 @@ class GrpclbEnd2endTest : public ::testing::Test { for (int port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - CHECK(lb_uri.ok()); + CHECK_OK(lb_uri); grpc_resolved_address address; CHECK(grpc_parse_uri(*lb_uri, &address)); grpc_core::ChannelArgs args; @@ -730,7 +730,7 @@ class GrpclbEnd2endTest : public ::testing::Test { result.addresses = std::move(backends); result.service_config = grpc_core::ServiceConfigImpl::Create( grpc_core::ChannelArgs(), service_config_json); - CHECK(result.service_config.ok()); + CHECK_OK(result.service_config); result.args = grpc_core::SetGrpcLbBalancerAddresses( grpc_core::ChannelArgs(), std::move(balancers)); response_generator_->SetResponseSynchronously(std::move(result)); diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 9a002aea033..2f75c77ec7a 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -175,7 +175,7 @@ class ServiceConfigEnd2endTest : public ::testing::Test { for (const int& port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - CHECK(lb_uri.ok()); + CHECK_OK(lb_uri); grpc_resolved_address address; CHECK(grpc_parse_uri(*lb_uri, &address)); result.addresses->emplace_back(address, grpc_core::ChannelArgs()); diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index 00a396318ef..17f7baec053 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -58,7 +58,7 @@ static gpr_timespec now_impl(gpr_clock_type clock) { return ts; } CHECK_GE(ts.tv_nsec, 0); - CHECK(ts.tv_nsec < GPR_NS_PER_SEC); + CHECK_LT(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; @@ -126,7 +126,7 @@ TEST(TimespecTest, GrpcNegativeMillisToTimespec) { .as_timespec(GPR_CLOCK_MONOTONIC); CHECK(ts.tv_sec = -2); CHECK(ts.tv_nsec = 5e8); - CHECK(ts.clock_type == GPR_CLOCK_MONOTONIC); + CHECK_EQ(ts.clock_type, GPR_CLOCK_MONOTONIC); } class TimeChangeTest : public ::testing::Test { diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index a66165dce63..096f3f6fc48 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -64,7 +64,7 @@ class ClusterTypeTest : public XdsEnd2endTest { for (int port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - CHECK(lb_uri.ok()); + CHECK_OK(lb_uri); grpc_resolved_address address; CHECK(grpc_parse_uri(*lb_uri, &address)); addresses.emplace_back(address, grpc_core::ChannelArgs()); diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index 99733eb1565..d0e2f55fd9c 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -243,7 +243,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam, virtual ~ServerThread() { // Shutdown should be called manually. Shutdown calls virtual methods and // can't be called from the base class destructor. - GPR_ASSERT(!running_); + CHECK(!running_); } void Start(); diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index b1dc03b3f9b..d8401484061 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -70,7 +70,7 @@ class RingHashTest : public XdsEnd2endTest { for (int port : ports) { absl::StatusOr lb_uri = grpc_core::URI::Parse(grpc_core::LocalIpUri(port)); - CHECK(lb_uri.ok()); + CHECK_OK(lb_uri); grpc_resolved_address address; CHECK(grpc_parse_uri(*lb_uri, &address)); addresses.emplace_back(address, grpc_core::ChannelArgs());