Make changes to fix test failures

include/grpcpp/server.h

@@ -28,6 +28,7 @@
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/completion_queue.h>
+#include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/codegen/client_interceptor.h>
 #include <grpcpp/impl/codegen/grpc_library.h>

src/cpp/server/health/default_health_check_service.h

@@ -37,7 +37,7 @@ namespace grpc {
 
 // Default implementation of HealthCheckServiceInterface. Server will create and
 // own it.
-class DefaultHealthCheckService final : public HealthCheckServiceInterface {
+class DefaultHealthCheckService final : public grpc_impl::HealthCheckServiceInterface {
  public:
   enum ServingStatus { NOT_FOUND, SERVING, NOT_SERVING };
 

src/cpp/server/health/health_check_service.cc

@@ -16,9 +16,9 @@
  *
  */
 
-#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/health_check_service_interface_impl.h>
 
-namespace grpc {
+namespace grpc_impl {
 namespace {
 bool g_grpc_default_health_check_service_enabled = false;
 }  // namespace
@@ -31,4 +31,4 @@ void EnableDefaultHealthCheckService(bool enable) {
   g_grpc_default_health_check_service_enabled = enable;
 }
 
-}  // namespace grpc
+}  // namespace grpc_impl

src/cpp/server/server_cc.cc

@@ -802,7 +802,7 @@ Server::Server(
       if (channel_args.args[i].value.pointer.p == nullptr) {
         health_check_service_disabled_ = true;
       } else {
-        health_check_service_.reset(static_cast<HealthCheckServiceInterface*>(
+        health_check_service_.reset(static_cast<grpc_impl::HealthCheckServiceInterface*>(
             channel_args.args[i].value.pointer.p));
       }
       break;

test/cpp/end2end/client_lb_end2end_test.cc

@@ -1242,7 +1242,7 @@ TEST_F(ClientLbEnd2endTest,
 }
 
 TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthChecking) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::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.
-  EnableDefaultHealthCheckService(false);
+  grpc_impl::EnableDefaultHealthCheckService(false);
 }
 
 TEST_F(ClientLbEnd2endTest, RoundRobinWithHealthCheckingInhibitPerChannel) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::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.
-  EnableDefaultHealthCheckService(false);
+  grpc_impl::EnableDefaultHealthCheckService(false);
 }
 
 class ClientLbInterceptTrailingMetadataTest : public ClientLbEnd2endTest {

test/cpp/end2end/health_service_end2end_test.cc

@@ -285,8 +285,8 @@ class HealthServiceEnd2endTest : public ::testing::Test {
 };
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceDisabled) {
-  EnableDefaultHealthCheckService(false);
+  grpc_impl::EnableDefaultHealthCheckService(false);
-  EXPECT_FALSE(DefaultHealthCheckServiceEnabled());
+  EXPECT_FALSE(grpc_impl::DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   HealthCheckServiceInterface* default_service =
       server_->GetHealthCheckService();
@@ -298,8 +298,8 @@ TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceDisabled) {
 }
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthService) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
+  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   VerifyHealthCheckService();
   VerifyHealthCheckServiceStreaming();
@@ -311,19 +311,19 @@ TEST_F(HealthServiceEnd2endTest, DefaultHealthService) {
 }
 
 TEST_F(HealthServiceEnd2endTest, DefaultHealthServiceShutdown) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
+  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
   SetUpServer(true, false, false, nullptr);
   VerifyHealthCheckServiceShutdown();
 }
 
 // Provide an empty service to disable the default service.
 TEST_F(HealthServiceEnd2endTest, ExplicitlyDisableViaOverride) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
+  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
   std::unique_ptr<HealthCheckServiceInterface> empty_service;
   SetUpServer(true, false, true, std::move(empty_service));
-  HealthCheckServiceInterface* service = server_->GetHealthCheckService();
+  grpc_impl::HealthCheckServiceInterface* service = server_->GetHealthCheckService();
   EXPECT_TRUE(service == nullptr);
 
   ResetStubs();
@@ -333,8 +333,8 @@ TEST_F(HealthServiceEnd2endTest, ExplicitlyDisableViaOverride) {
 
 // Provide an explicit override of health checking service interface.
 TEST_F(HealthServiceEnd2endTest, ExplicitlyOverride) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
+  EXPECT_TRUE(grpc_impl::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) {
-  EnableDefaultHealthCheckService(true);
+  grpc_impl::EnableDefaultHealthCheckService(true);
-  EXPECT_TRUE(DefaultHealthCheckServiceEnabled());
+  EXPECT_TRUE(grpc_impl::DefaultHealthCheckServiceEnabled());
   std::unique_ptr<HealthCheckServiceInterface> override_service(
       new CustomHealthCheckService(&health_check_service_impl_));
   HealthCheckServiceInterface* underlying_service = override_service.get();