From 92bde3922f635d0354df2cc7177a210a4a8157d1 Mon Sep 17 00:00:00 2001
From: Karthik Ravi Shankar <karthikrs@google.com>
Date: Fri, 15 Mar 2019 16:16:53 -0700
Subject: [PATCH] Fix tests to use grpc namespace.

---
 .../grpcpp/health_check_service_interface.h   |  9 +++++++
 test/cpp/end2end/client_lb_end2end_test.cc    |  8 +++----
 .../end2end/health_service_end2end_test.cc    | 24 +++++++++----------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/include/grpcpp/health_check_service_interface.h b/include/grpcpp/health_check_service_interface.h
index 6dde0951768..13286728438 100644
--- a/include/grpcpp/health_check_service_interface.h
+++ b/include/grpcpp/health_check_service_interface.h
@@ -28,6 +28,15 @@ const char kHealthCheckServiceInterfaceArg[] =
 
 typedef ::grpc_impl::HealthCheckServiceInterface HealthCheckServiceInterface;
 
+static inline void EnableDefaultHealthCheckService(bool enable) {
+  ::grpc_impl::EnableDefaultHealthCheckService(enable);
+}
+
+static inline bool DefaultHealthCheckServiceEnabled() {
+  return ::grpc_impl::DefaultHealthCheckServiceEnabled();
+}
+
+
 }  // namespace grpc
 
 #endif  // GRPCPP_HEALTH_CHECK_SERVICE_INTERFACE_H
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index 6856883c2af..3cd06e9e28c 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -1242,7 +1242,7 @@ TEST_F(ClientLbEnd2endTest,
 }
 
 TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthChecking) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
+  EnableDefaultHealthCheckService(true);
   // Start servers.
   const int kNumServers = 3;
   StartServers(kNumServers);
@@ -1311,11 +1311,11 @@ TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthChecking) {
   EXPECT_TRUE(WaitForChannelNotReady(channel.get()));
   CheckRpcSendFailure(stub);
   // Clean up.
-  grpc_impl::EnableDefaultHealthCheckService(false);
+  EnableDefaultHealthCheckService(false);
 }
 
 TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthCheckingInhibitPerChannel) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
+  EnableDefaultHealthCheckService(true);
   // Start server.
   const int kNumServers = 1;
   StartServers(kNumServers);
@@ -1341,7 +1341,7 @@ TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthCheckingInhibitPerChannel) {
   EXPECT_TRUE(WaitForChannelReady(channel2.get(), 1));
   CheckRpcSendOk(stub2, DEBUG_LOCATION);
   // Clean up.
-  grpc_impl::EnableDefaultHealthCheckService(false);
+  EnableDefaultHealthCheckService(false);
 }
 
 class ClientLbInterceptTrailingMetadataTest : public ClientLbEnd2endTest {
diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc
index c36d6e4d296..a3a04b121c2 100644
--- a/test/cpp/end2end/health_service_end2end_test.cc
+++ b/test/cpp/end2end/health_service_end2end_test.cc
@@ -285,8 +285,8 @@ class HealthServiceEnd2endTest : public ::testing::Test {
 };
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceDisabled) {
-  grpc_impl::EnableDefaultHealthCheckService(false);
-  EXPECT_FALSE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(false);
+  EXPECT_FALSE(DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   HealthCheckServiceInterface* default_service =
       server_->GetHealthCheckService();
@@ -298,8 +298,8 @@ TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceDisabled) {
 }
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthService) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(true);
+  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   VerifyHealthCheckService();
   VerifyHealthCheckServiceStreaming();
@@ -311,16 +311,16 @@ TEST_F(HealthServiceEnd2endTest, DefaultHealthService) {
 }
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceShutdown) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(true);
+  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   VerifyHealthCheckServiceShutdown();
 }
 
 // Provide an empty service to disable the default service.
 TEST_F(HealthServiceEnd2endTest, ExplicitlyDisableViaOverride) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(true);
+  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
   std::unique_ptr<HealthCheckServiceInterface> empty_service;
   SetUpServer(true, false, true, std::move(empty_service));
   grpc_impl::HealthCheckServiceInterface* service = server_->GetHealthCheckService();
@@ -333,8 +333,8 @@ TEST_F(HealthServiceEnd2endTest, ExplicitlyDisableViaOverride) {
 
 // Provide an explicit override of health checking service interface.
 TEST_F(HealthServiceEnd2endTest, ExplicitlyOverride) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(true);
+  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
   std::unique_ptr<HealthCheckServiceInterface> override_service(
       new CustomHealthCheckService(&health_check_service_impl_));
   HealthCheckServiceInterface* underlying_service = override_service.get();
@@ -349,8 +349,8 @@ TEST_F(HealthServiceEnd2endTest, ExplicitlyOverride) {
 }
 
 TEST_F(HealthServiceEnd2endTest, ExplicitlyHealthServiceShutdown) {
-  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
+  EnableDefaultHealthCheckService(true);
+  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
   std::unique_ptr<HealthCheckServiceInterface> override_service(
       new CustomHealthCheckService(&health_check_service_impl_));
   HealthCheckServiceInterface* underlying_service = override_service.get();