From dcba5d81b226a5269ac33ae5057bc32c51878fd9 Mon Sep 17 00:00:00 2001
From: Alex Konradi <akonradi@google.com>
Date: Fri, 8 Jan 2021 09:52:16 -0500
Subject: [PATCH 1/2] Print test parameters meaningfully

Signed-off-by: Alex Konradi <akonradi@google.com>
---
 test/common/config/subscription_impl_test.cc     | 14 ++++++++++++++
 test/common/upstream/health_checker_impl_test.cc | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/test/common/config/subscription_impl_test.cc b/test/common/config/subscription_impl_test.cc
index 84bc88f6cea6b..34274ddd5fa9c 100644
--- a/test/common/config/subscription_impl_test.cc
+++ b/test/common/config/subscription_impl_test.cc
@@ -19,6 +19,20 @@ enum class SubscriptionType {
   Http,
   Filesystem,
 };
+void PrintTo(const SubscriptionType sub, std::ostream* os) {
+  (*os) << ([sub]() -> absl::string_view {
+    switch (sub) {
+    case SubscriptionType::Grpc:
+      return "Grpc";
+    case SubscriptionType::DeltaGrpc:
+      return "DeltaGrpc";
+    case SubscriptionType::Http:
+      return "Http";
+    case SubscriptionType::Filesystem:
+      return "Filesystem";
+    }
+  })();
+}
 
 class SubscriptionImplTest : public testing::TestWithParam<SubscriptionType> {
 public:
diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc
index 4c97ea1dd7dd6..a87c530c58d29 100644
--- a/test/common/upstream/health_checker_impl_test.cc
+++ b/test/common/upstream/health_checker_impl_test.cc
@@ -1,5 +1,6 @@
 #include <chrono>
 #include <memory>
+#include <ostream>
 #include <string>
 
 #include "envoy/config/core/v3/base.pb.h"
@@ -3951,6 +3952,20 @@ class GrpcHealthCheckerImplTestBase : public Event::TestUsingSimulatedTime,
   std::list<uint32_t> codec_index_{};
 };
 
+void PrintTo(const GrpcHealthCheckerImplTestBase::ResponseSpec& spec, std::ostream* os) {
+  (*os) << "(headers{" << absl::StrJoin(spec.response_headers, ",", absl::PairFormatter(":"))
+        << "},";
+  (*os) << "body{" << absl::StrJoin(spec.body_chunks, ",", [](std::string* out, const auto& spec) {
+    absl::StrAppend(out, spec.valid ? "valid" : "invalid", ",{",
+                    absl::StrJoin(spec.data, "-",
+                                  [](std::string* out, uint8_t byte) {
+                                    absl::StrAppend(out, absl::Hex(byte, absl::kZeroPad2));
+                                  }),
+                    "}");
+  }) << "}";
+  (*os) << "trailers{" << absl::StrJoin(spec.trailers, ",", absl::PairFormatter(":")) << "})";
+}
+
 class GrpcHealthCheckerImplTest : public testing::Test, public GrpcHealthCheckerImplTestBase {};
 
 // Test single host check success.

From ef8d9405ce82103eecf8c8a7ad278a37124b34a2 Mon Sep 17 00:00:00 2001
From: Alex Konradi <akonradi@google.com>
Date: Thu, 14 Jan 2021 15:03:29 -0500
Subject: [PATCH 2/2] Fix test failures

Signed-off-by: Alex Konradi <akonradi@google.com>
---
 test/common/config/subscription_impl_test.cc     | 4 ++++
 test/common/upstream/health_checker_impl_test.cc | 1 +
 2 files changed, 5 insertions(+)

diff --git a/test/common/config/subscription_impl_test.cc b/test/common/config/subscription_impl_test.cc
index 34274ddd5fa9c..321f81ecdca9e 100644
--- a/test/common/config/subscription_impl_test.cc
+++ b/test/common/config/subscription_impl_test.cc
@@ -19,6 +19,8 @@ enum class SubscriptionType {
   Http,
   Filesystem,
 };
+
+// NOLINTNEXTLINE(readability-identifier-naming)
 void PrintTo(const SubscriptionType sub, std::ostream* os) {
   (*os) << ([sub]() -> absl::string_view {
     switch (sub) {
@@ -30,6 +32,8 @@ void PrintTo(const SubscriptionType sub, std::ostream* os) {
       return "Http";
     case SubscriptionType::Filesystem:
       return "Filesystem";
+    default:
+      return "unknown";
     }
   })();
 }
diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc
index 90fb5c59fddae..d42cc90578d22 100644
--- a/test/common/upstream/health_checker_impl_test.cc
+++ b/test/common/upstream/health_checker_impl_test.cc
@@ -4286,6 +4286,7 @@ class GrpcHealthCheckerImplTestBase : public Event::TestUsingSimulatedTime,
   std::list<uint32_t> codec_index_{};
 };
 
+// NOLINTNEXTLINE(readability-identifier-naming)
 void PrintTo(const GrpcHealthCheckerImplTestBase::ResponseSpec& spec, std::ostream* os) {
   (*os) << "(headers{" << absl::StrJoin(spec.response_headers, ",", absl::PairFormatter(":"))
         << "},";