From 6cd912b31a639c4cfd8b0d7b626993ef74191a47 Mon Sep 17 00:00:00 2001 From: Dhi Aurrahman Date: Wed, 14 Feb 2018 07:10:03 +0700 Subject: [PATCH 1/2] Add const to host value Signed-off-by: Dhi Aurrahman --- test/common/upstream/health_checker_impl_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index 6d51725096e28..4fe21b8794c0d 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -475,7 +475,7 @@ TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheck) { } TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheckWithCustomHostValue) { - std::string host = "www.envoyproxy.io"; + const std::string host = "www.envoyproxy.io"; setupServiceValidationWithCustomHostValueHC(host); // requires non-empty `service_name` in config. EXPECT_CALL(runtime_.snapshot_, featureEnabled("health_check.verify_cluster", 100)) @@ -495,7 +495,7 @@ TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheckWithCustomHostValue) { EXPECT_TRUE(headers.Path()); EXPECT_NE(nullptr, headers.Host()); EXPECT_NE(nullptr, headers.Path()); - EXPECT_EQ(headers.Host()->value().c_str(), std::string(host)); + EXPECT_EQ(headers.Host()->value().c_str(), host); EXPECT_EQ(headers.Path()->value().c_str(), std::string("/healthcheck")); })); health_checker_->start(); From 4bc395fe2983565062ecab6bc220fdc52ec682a2 Mon Sep 17 00:00:00 2001 From: Dhi Aurrahman Date: Thu, 15 Feb 2018 04:29:14 +0700 Subject: [PATCH 2/2] Add more consts Signed-off-by: Dhi Aurrahman --- test/common/upstream/health_checker_impl_test.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index 4fe21b8794c0d..beac596ab998e 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -441,6 +441,8 @@ TEST_F(HttpHealthCheckerImplTest, SuccessWithMultipleHostSets) { } TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheck) { + const std::string host = "fake_cluster"; + const std::string path = "/healthcheck"; setupServiceValidationHC(); EXPECT_CALL(runtime_.snapshot_, featureEnabled("health_check.verify_cluster", 100)) .WillOnce(Return(true)); @@ -459,8 +461,8 @@ TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheck) { EXPECT_TRUE(headers.Path()); EXPECT_NE(nullptr, headers.Host()); EXPECT_NE(nullptr, headers.Path()); - EXPECT_EQ(headers.Host()->value().c_str(), std::string("fake_cluster")); - EXPECT_EQ(headers.Path()->value().c_str(), std::string("/healthcheck")); + EXPECT_EQ(headers.Host()->value().c_str(), host); + EXPECT_EQ(headers.Path()->value().c_str(), path); })); health_checker_->start(); @@ -476,6 +478,7 @@ TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheck) { TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheckWithCustomHostValue) { const std::string host = "www.envoyproxy.io"; + const std::string path = "/healthcheck"; setupServiceValidationWithCustomHostValueHC(host); // requires non-empty `service_name` in config. EXPECT_CALL(runtime_.snapshot_, featureEnabled("health_check.verify_cluster", 100)) @@ -496,7 +499,7 @@ TEST_F(HttpHealthCheckerImplTest, SuccessServiceCheckWithCustomHostValue) { EXPECT_NE(nullptr, headers.Host()); EXPECT_NE(nullptr, headers.Path()); EXPECT_EQ(headers.Host()->value().c_str(), host); - EXPECT_EQ(headers.Path()->value().c_str(), std::string("/healthcheck")); + EXPECT_EQ(headers.Path()->value().c_str(), path); })); health_checker_->start();