From db06cd9449be81aa0ba76dc47424e12622611a0f Mon Sep 17 00:00:00 2001
From: Jonathan Tatum <jdtatum@google.com>
Date: Mon, 27 Jul 2026 15:10:44 -0700
Subject: [PATCH] Test fix: use hermetic descriptor pool

PiperOrigin-RevId: 954852824
---
 eval/public/structs/BUILD                                   | 2 ++
 .../structs/protobuf_descriptor_type_provider_test.cc       | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eval/public/structs/BUILD b/eval/public/structs/BUILD
index 2c7d7ed16..4e4d5481c 100644
--- a/eval/public/structs/BUILD
+++ b/eval/public/structs/BUILD
@@ -371,6 +371,8 @@ cc_test(
         "//eval/public/testing:matchers",
         "//extensions/protobuf:memory_manager",
         "//internal:testing",
+        "//internal:testing_descriptor_pool",
+        "//internal:testing_message_factory",
         "@com_google_absl//absl/status:status_matchers",
         "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
         "@com_google_protobuf//:protobuf",
diff --git a/eval/public/structs/protobuf_descriptor_type_provider_test.cc b/eval/public/structs/protobuf_descriptor_type_provider_test.cc
index aabdc38c4..1d07fd657 100644
--- a/eval/public/structs/protobuf_descriptor_type_provider_test.cc
+++ b/eval/public/structs/protobuf_descriptor_type_provider_test.cc
@@ -24,6 +24,8 @@
 #include "eval/public/testing/matchers.h"
 #include "extensions/protobuf/memory_manager.h"
 #include "internal/testing.h"
+#include "internal/testing_descriptor_pool.h"
+#include "internal/testing_message_factory.h"
 #include "cel/expr/conformance/proto3/test_all_types.pb.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/descriptor.h"
@@ -101,8 +103,8 @@ TEST(ProtobufDescriptorProvider, NotFound) {
 
 TEST(ProtobufDescriptorProvider, FindType) {
   ProtobufDescriptorProvider provider(
-      google::protobuf::DescriptorPool::generated_pool(),
-      google::protobuf::MessageFactory::generated_factory());
+      cel::internal::GetTestingDescriptorPool(),
+      cel::internal::GetTestingMessageFactory());
   ASSERT_OK_AND_ASSIGN(std::optional<cel::Type> wrapper_type,
                        provider.FindType("google.protobuf.Int64Value"));
   ASSERT_TRUE(wrapper_type.has_value());