Add generated message reflection unittest for import option and option_deps test proto in edition 2024.

zhangskz · zhangskz · commit c51df7365055 · 2025-08-14T01:22:44.000Z
PiperOrigin-RevId: 788038187
diff --git a/bazel/tests/protobuf_test_proto_library.bzl b/bazel/tests/protobuf_test_proto_library.bzl
@@ -0,0 +1,20 @@
+"""This module defines a wrapper around proto_library for Bazel versions that do not support certain attributes yet."""
+
+load("//bazel:proto_library.bzl", "proto_library")
+
+def protobuf_test_proto_library(**kwattrs):
+    """
+    Creates a proto library, handling any attributes that are not supported by the proto_library rule.
+
+    Args:
+        **kwattrs: Additional arguments to pass to the proto_library rule.
+    """
+    kwargs = dict(kwattrs)
+
+    # TODO: Bazel 7's proto_library rule does not support option_deps, so we handle it by putting it in deps instead.
+    if "option_deps" in kwargs and hasattr(native, "proto_library"):
+        deps = kwargs.pop("deps", [])
+        option_deps = kwargs.pop("option_deps")
+        kwargs["deps"] = deps + option_deps
+
+    proto_library(**kwargs)
diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
@@ -9,6 +9,10 @@ load("//bazel:proto_library.bzl", "proto_library")
 load("//bazel:upb_c_proto_library.bzl", "upb_c_proto_library")
 load("//bazel:upb_minitable_proto_library.bzl", "upb_minitable_proto_library")
 load("//bazel:upb_proto_reflection_library.bzl", "upb_proto_reflection_library")
+load(
+    "//bazel/tests:protobuf_test_proto_library.bzl",
+    "protobuf_test_proto_library",
+)
 load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
 load("//upb/cmake:build_defs.bzl", "staleness_test")
 
@@ -980,11 +984,13 @@ filegroup(
         "map_unittest.proto",
         "unittest.proto",
         "unittest_custom_options.proto",
+        "unittest_custom_options_unlinked.proto",
         "unittest_embed_optimize_for.proto",
         "unittest_empty.proto",
         "unittest_enormous_descriptor.proto",
         "unittest_features.proto",
         "unittest_import.proto",
+        "unittest_import_option.proto",
         "unittest_import_public.proto",
         "unittest_invalid_features.proto",
         "unittest_lite_imports_nonlite.proto",
@@ -1300,6 +1306,31 @@ cc_proto_library(
     deps = [":unittest_string_view_proto"],
 )
 
+proto_library(
+    name = "unittest_custom_options_unlinked_proto",
+    srcs = ["unittest_custom_options_unlinked.proto"],
+    strip_import_prefix = "/src",
+    deps = [
+        "//:any_proto",
+        "//:descriptor_proto",
+    ],
+)
+
+protobuf_test_proto_library(
+    name = "unittest_import_option_proto",
+    srcs = ["unittest_import_option.proto"],
+    option_deps = [
+        ":test_protos",
+        ":unittest_custom_options_unlinked_proto",
+    ],
+    strip_import_prefix = "/src",
+)
+
+cc_proto_library(
+    name = "unittest_import_option_cc_proto",
+    deps = [":unittest_import_option_proto"],
+)
+
 cc_test(
     name = "string_view_test",
     srcs = ["string_view_test.cc"],
@@ -1755,6 +1786,7 @@ cc_test(
         ":port",
         ":protobuf",
         ":test_util",
+        ":unittest_import_option_cc_proto",
         ":unittest_proto3_cc_proto",
         "//src/google/protobuf/stubs",
         "//src/google/protobuf/testing",
diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc
@@ -40,7 +40,9 @@
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
+#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/unittest_import.pb.h"
+#include "google/protobuf/unittest_import_option.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/unittest_proto3.pb.h"
@@ -1825,6 +1827,23 @@ TEST(GeneratedMessageReflection, UnvalidatedStringsAreDowngradedToBytes) {
       msg.mutable_optional_extension());
 }
 
+TEST(GeneratedMessageReflection, ImportOption) {
+  proto2_unittest_import_option::TestMessage message;
+  google::protobuf::FileDescriptor const* file_descriptor =
+      message.GetDescriptor()->file();
+  google::protobuf::Descriptor const* message_descriptor = message.GetDescriptor();
+  google::protobuf::FieldDescriptor const* field_descriptor =
+      message_descriptor->FindFieldByName("field1");
+
+  EXPECT_EQ(
+      1, file_descriptor->options().GetExtension(proto2_unittest::file_opt1));
+  EXPECT_EQ(2, message_descriptor->options().GetExtension(
+                   proto2_unittest::message_opt1));
+  EXPECT_EQ(
+      3, field_descriptor->options().GetExtension(proto2_unittest::field_opt1));
+
+}
+
 }  // namespace
 }  // namespace protobuf
 }  // namespace google
diff --git a/src/google/protobuf/unittest_custom_options_unlinked.proto b/src/google/protobuf/unittest_custom_options_unlinked.proto
@@ -0,0 +1,37 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Author: benjy@google.com (Benjy Weinberger)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+//
+// A proto file used to test the "custom options" feature when not linked in.
+
+edition = "2024";
+
+// A custom file option (defined below).
+option (file_opt1) = 9876543210;
+
+import "google/protobuf/descriptor.proto";
+
+// We don't put this in a package within proto2 because we need to make sure
+// that the generated code doesn't depend on being in the proto2 namespace.
+package proto2_unittest_unlinked;
+
+// Some simple test custom options of various types.
+
+extend google.protobuf.FileOptions {
+  uint64 file_opt1 = 7736975;
+}
+
+extend google.protobuf.MessageOptions {
+  int32 message_opt1 = 7739037;
+}
+
+extend google.protobuf.FieldOptions {
+  fixed64 field_opt1 = 7740937;
+}
diff --git a/src/google/protobuf/unittest_import_option.proto b/src/google/protobuf/unittest_import_option.proto
@@ -0,0 +1,31 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+// Author: kenton@google.com (Kenton Varda)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+//
+// A proto file to test options importing.
+edition = "2024";
+
+package proto2_unittest_import_option;
+
+// Test option import
+import option "google/protobuf/unittest_custom_options.proto";
+import option "google/protobuf/unittest_custom_options_unlinked.proto";
+
+option (proto2_unittest.file_opt1) = 1;
+option (proto2_unittest_unlinked.file_opt1) = 1;
+
+message TestMessage {
+  option (proto2_unittest.message_opt1) = 2;
+  option (proto2_unittest_unlinked.message_opt1) = 2;
+
+  int32 field1 = 1 [
+    (proto2_unittest.field_opt1) = 3,
+    (proto2_unittest_unlinked.field_opt1) = 3
+  ];
+}
