From 2a538483ab3ce7b82eff4d71666bc2a4c3ed2272 Mon Sep 17 00:00:00 2001
From: Lawrence Wolf-Sonkin <lawrencews@google.com>
Date: Wed, 5 Aug 2026 09:05:39 -0700
Subject: [PATCH] Internal cleanup

PiperOrigin-RevId: 959693117
---
 gloop/util/gtl/extend/debug_printing_test.cc  | 36 ++++++++++---------
 gloop/util/gtl/extend/stream_printing_test.cc | 32 +++++++++--------
 gloop/util/gtl/extend/stringification_tests.h |  2 +-
 gloop/util/gtl/extend/stringify_test.cc       | 32 +++++++++--------
 4 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/gloop/util/gtl/extend/debug_printing_test.cc b/gloop/util/gtl/extend/debug_printing_test.cc
index a8f87d3c..8c13eee8 100644
--- a/gloop/util/gtl/extend/debug_printing_test.cc
+++ b/gloop/util/gtl/extend/debug_printing_test.cc
@@ -70,11 +70,12 @@ TYPED_TEST(DebugPrinting, ManyFields) {
   }
 
   TypeParam printer;
-  EXPECT_THAT(printer(ManyFields{}), MatchesFieldSpec({
-                                         {"num", "3"},
-                                         {"b", "true"},
-                                         {"message", R"("hello")"},
-                                     }));
+  EXPECT_THAT(printer(ManyFields{}),
+              MatchesFieldSpec({
+                  {"num", "3"},
+                  {"b", "true"},
+                  {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+              }));
   EXPECT_THAT(printer(ManyFields{{}, 3, true, "some-\"other\"-message"}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -95,15 +96,16 @@ TYPED_TEST(DebugPrinting, Nested) {
   }
 
   TypeParam printer;
-  EXPECT_THAT(printer(Nested{{}, 1, {}}), MatchesFieldSpec({
-                                              {"num", "1"},
-                                              {"fields",
-                                               std::vector<FieldSpec>{
-                                                   {"num", "3"},
-                                                   {"b", "true"},
-                                                   {"message", R"("hello")"},
-                                               }},
-                                          }));
+  EXPECT_THAT(printer(Nested{{}, 1, {}}),
+              MatchesFieldSpec({
+                  {"num", "1"},
+                  {"fields",
+                   std::vector<FieldSpec>{
+                       {"num", "3"},
+                       {"b", "true"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+                   }},
+              }));
   EXPECT_THAT(printer(Nested{{}, 3, {{}, 3, true}}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -111,18 +113,18 @@ TYPED_TEST(DebugPrinting, Nested) {
                    std::vector<FieldSpec>{
                        {"num", "3"},
                        {"b", "true"},
-                       {"message", R"("hello")"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
                    }},
               }));
 
-  EXPECT_THAT(printer(Nested{{}, 3, {{}, 4, false, "hello"}}),
+  EXPECT_THAT(printer(Nested{{}, 3, {{}, 4, false, "piñata"}}),
               MatchesFieldSpec({
                   {"num", "3"},
                   {"fields",
                    std::vector<FieldSpec>{
                        {"num", "4"},
                        {"b", "false"},
-                       {"message", R"("hello")"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
                    }},
               }));
 }
diff --git a/gloop/util/gtl/extend/stream_printing_test.cc b/gloop/util/gtl/extend/stream_printing_test.cc
index 66c47636..d282a489 100644
--- a/gloop/util/gtl/extend/stream_printing_test.cc
+++ b/gloop/util/gtl/extend/stream_printing_test.cc
@@ -65,11 +65,12 @@ TEST(StreamPrinting, ManyFields) {
   }
 
   Streamer printer;
-  EXPECT_THAT(printer(ManyFields{}), MatchesFieldSpec({
-                                         {"num", "3"},
-                                         {"b", "true"},
-                                         {"message", R"("hello")"},
-                                     }));
+  EXPECT_THAT(printer(ManyFields{}),
+              MatchesFieldSpec({
+                  {"num", "3"},
+                  {"b", "true"},
+                  {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+              }));
   EXPECT_THAT(printer(ManyFields{{}, 3, true, "some-\"other\"-message"}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -90,15 +91,16 @@ TEST(StreamPrinting, Nested) {
   }
 
   Streamer printer;
-  EXPECT_THAT(printer(Nested{{}, 1, {}}), MatchesFieldSpec({
-                                              {"num", "1"},
-                                              {"fields",
-                                               std::vector<FieldSpec>{
-                                                   {"num", "3"},
-                                                   {"b", "true"},
-                                                   {"message", R"("hello")"},
-                                               }},
-                                          }));
+  EXPECT_THAT(printer(Nested{{}, 1, {}}),
+              MatchesFieldSpec({
+                  {"num", "1"},
+                  {"fields",
+                   std::vector<FieldSpec>{
+                       {"num", "3"},
+                       {"b", "true"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+                   }},
+              }));
   EXPECT_THAT(printer(Nested{{}, 3, {{}, 3, true}}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -106,7 +108,7 @@ TEST(StreamPrinting, Nested) {
                    std::vector<FieldSpec>{
                        {"num", "3"},
                        {"b", "true"},
-                       {"message", R"("hello")"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
                    }},
               }));
 
diff --git a/gloop/util/gtl/extend/stringification_tests.h b/gloop/util/gtl/extend/stringification_tests.h
index 663be5db..be8bbf81 100644
--- a/gloop/util/gtl/extend/stringification_tests.h
+++ b/gloop/util/gtl/extend/stringification_tests.h
@@ -122,7 +122,7 @@ struct ManyFields
     : gtl::Extend<ManyFields<Extension>>::template With<Extension> {
   int num = 3;
   bool b = true;
-  std::string message = "hello";
+  std::string message = "piñata";
 };
 
 template <template <typename> typename Ext>
diff --git a/gloop/util/gtl/extend/stringify_test.cc b/gloop/util/gtl/extend/stringify_test.cc
index b53d9cc3..18a507b9 100644
--- a/gloop/util/gtl/extend/stringify_test.cc
+++ b/gloop/util/gtl/extend/stringify_test.cc
@@ -69,11 +69,12 @@ TYPED_TEST(Stringify, ManyFields) {
   }
 
   TypeParam printer;
-  EXPECT_THAT(printer(ManyFields{}), MatchesFieldSpec({
-                                         {"num", "3"},
-                                         {"b", "true"},
-                                         {"message", R"("hello")"},
-                                     }));
+  EXPECT_THAT(printer(ManyFields{}),
+              MatchesFieldSpec({
+                  {"num", "3"},
+                  {"b", "true"},
+                  {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+              }));
   EXPECT_THAT(printer(ManyFields{{}, 3, true, "some-\"other\"-message"}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -94,15 +95,16 @@ TYPED_TEST(Stringify, Nested) {
   }
 
   TypeParam printer;
-  EXPECT_THAT(printer(Nested{{}, 1, {}}), MatchesFieldSpec({
-                                              {"num", "1"},
-                                              {"fields",
-                                               std::vector<FieldSpec>{
-                                                   {"num", "3"},
-                                                   {"b", "true"},
-                                                   {"message", R"("hello")"},
-                                               }},
-                                          }));
+  EXPECT_THAT(printer(Nested{{}, 1, {}}),
+              MatchesFieldSpec({
+                  {"num", "1"},
+                  {"fields",
+                   std::vector<FieldSpec>{
+                       {"num", "3"},
+                       {"b", "true"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
+                   }},
+              }));
   EXPECT_THAT(printer(Nested{{}, 3, {{}, 3, true}}),
               MatchesFieldSpec({
                   {"num", "3"},
@@ -110,7 +112,7 @@ TYPED_TEST(Stringify, Nested) {
                    std::vector<FieldSpec>{
                        {"num", "3"},
                        {"b", "true"},
-                       {"message", R"("hello")"},
+                       {"message", R"("pi\\xc3\\xb1\\x61ta")"},
                    }},
               }));