commit 73a75ff992d068c5af2bf07280f998c4f466865f
author Hong Shin <hongshin@google.com> Wed Sep 17 07:23:10 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 17 07:28:38 2025 -0700
tree ee1e1c01435629e8a32a06909e6c4a3cc4581d7a
parent a739f21b54ebd342dba3a2823bccc5c1850c5922

hpb/oss: replace trigraph test with escaped string test

This allows us to remove trigraph enabling in hpb ci as well :)

PiperOrigin-RevId: 808144179

.github/workflows/test_hpb.yml

diff --git a/.github/workflows/test_hpb.yml b/.github/workflows/test_hpb.yml
index 1bd6bf6..e8bc9b4 100644
--- a/.github/workflows/test_hpb.yml
+++ b/.github/workflows/test_hpb.yml
@@ -39,5 +39,5 @@
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: hpb_linux
           bazel: >-
-            ${{ matrix.bazel_cmd }} --cxxopt=-Wno-trigraphs
+            ${{ matrix.bazel_cmd }}
             ${{ matrix.targets }} ${{ matrix.config.flags }}

hpb_generator/tests/extension_test.cc

diff --git a/hpb_generator/tests/extension_test.cc b/hpb_generator/tests/extension_test.cc
index 3342dc3..82cb0c8 100644
--- a/hpb_generator/tests/extension_test.cc
+++ b/hpb_generator/tests/extension_test.cc
@@ -39,8 +39,8 @@
 using ::hpb_unittest::someotherpackage::protos::repeated_int32_ext;
 using ::hpb_unittest::someotherpackage::protos::repeated_int64_ext;
 using ::hpb_unittest::someotherpackage::protos::repeated_string_ext;
+using ::hpb_unittest::someotherpackage::protos::string_escape_ext;
 using ::hpb_unittest::someotherpackage::protos::string_ext;
-using ::hpb_unittest::someotherpackage::protos::string_trigraph_ext;
 using ::hpb_unittest::someotherpackage::protos::uint32_ext;
 using ::hpb_unittest::someotherpackage::protos::uint64_ext;
 
@@ -392,11 +392,11 @@
   EXPECT_THAT(res, IsOkAndHolds("mishpacha"));
 }
 
-TEST(CppGeneratedCode, GetExtensionStringWithDefaultAndTrigraph) {
+TEST(CppGeneratedCode, GetExtensionStringWithDefaultAndTestEscaping) {
   TestModel model;
-  auto res = hpb::GetExtension(&model, string_trigraph_ext);
+  auto res = hpb::GetExtension(&model, string_escape_ext);
   EXPECT_TRUE(res.ok());
-  EXPECT_THAT(res, IsOkAndHolds("bseder??!bseder"));
+  EXPECT_THAT(res, IsOkAndHolds("bseder\"bseder"));
 }
 
 TEST(CppGeneratedCode, GetExtensionOnMutableChild) {

hpb_generator/tests/test_extension.proto

diff --git a/hpb_generator/tests/test_extension.proto b/hpb_generator/tests/test_extension.proto
index f45d61c..c4a6490 100644
--- a/hpb_generator/tests/test_extension.proto
+++ b/hpb_generator/tests/test_extension.proto
@@ -34,5 +34,5 @@
   bool bool_ext = 13011 [default = true];
 
   string string_ext = 13012 [default = "mishpacha"];
-  string string_trigraph_ext = 13013 [default = "bseder??!bseder"];
+  string string_escape_ext = 13013 [default = "bseder\"bseder"];
 }