Migrate unittest_features.proto to edition 2024.

zhangskz · copybara-github · commit fee15f80c7a4 · 2025-08-06T15:31:45.000-07:00
Updates tests to avoid setting java features on this proto, since its used frequently in custom pools in unit tests (descriptor_unittest.cc, command_line_interface_unittest.cc) which would require adding the addl. dep in a bunch of places.

PiperOrigin-RevId: 791866799
diff --git a/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java b/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java
@@ -38,6 +38,7 @@
 import com.google.protobuf.test.UnittestImport.ImportEnum;
 import com.google.protobuf.test.UnittestImport.ImportEnumForMap;
 import legacy_features_unittest.UnittestLegacyFeatures;
+import pb.EnumFeature;
 import pb.UnittestFeatures;
 import proto2_unittest.TestCustomOptions;
 import proto2_unittest.UnittestCustomOptions;
@@ -1541,7 +1542,7 @@ void setTestFeature(DescriptorProtos.FeatureSet.Builder features, int value) {
       features.setExtension(
           UnittestFeatures.test,
           features.getExtension(UnittestFeatures.test).toBuilder()
-              .setMultipleFeature(UnittestFeatures.EnumFeature.forNumber(value))
+              .setMultipleFeature(EnumFeature.forNumber(value))
               .build());
     }
 
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc
@@ -1448,7 +1448,7 @@ TEST_F(CommandLineInterfaceTest, FeaturesEditionZero) {
 TEST_F(CommandLineInterfaceTest, FeatureExtensions) {
   CreateTempFile("google/protobuf/descriptor.proto",
                  google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
-  CreateTempFile("features.proto",
+  CreateTempFile("google/protobuf/unittest_features.proto",
                  R"schema(
     syntax = "proto2";
     package pb;
@@ -1466,7 +1466,7 @@ TEST_F(CommandLineInterfaceTest, FeatureExtensions) {
   CreateTempFile("foo.proto",
                  R"schema(
     edition = "2023";
-    import "features.proto";
+    import "google/protobuf/unittest_features.proto";
     message Foo {
       int32 bar = 1;
       int32 baz = 2 [features.(pb.test).int_feature = 5];
@@ -1539,12 +1539,12 @@ TEST_F(CommandLineInterfaceTest, FeatureTargetError) {
 TEST_F(CommandLineInterfaceTest, FeatureExtensionError) {
   CreateTempFile("google/protobuf/descriptor.proto",
                  google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
-  CreateTempFile("features.proto",
+  CreateTempFile("google/protobuf/unittest_features.proto",
                  pb::TestInvalidFeatures::descriptor()->file()->DebugString());
   CreateTempFile("foo.proto",
                  R"schema(
     edition = "2023";
-    import "features.proto";
+    import "google/protobuf/unittest_features.proto";
     message Foo {
       int32 bar = 1;
       int32 baz = 2 [features.(pb.test_invalid).repeated_feature = 5];
@@ -2280,12 +2280,13 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMinimum) {
 TEST_F(CommandLineInterfaceTest, EditionDefaultsWithExtension) {
   CreateTempFile("google/protobuf/descriptor.proto",
                  google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
-  CreateTempFile("features.proto",
+  CreateTempFile("google/protobuf/unittest_features.proto",
                  pb::TestFeatures::descriptor()->file()->DebugString());
   Run("protocol_compiler --proto_path=$tmpdir "
       "--edition_defaults_out=$tmpdir/defaults "
       "--edition_defaults_maximum=99999_TEST_ONLY "
-      "features.proto google/protobuf/descriptor.proto");
+      "google/protobuf/unittest_features.proto "
+      "google/protobuf/descriptor.proto");
   ExpectNoErrors();
 
   FeatureSetDefaults defaults = ReadEditionDefaults("defaults");
@@ -2328,30 +2329,30 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithExtension) {
 TEST_F(CommandLineInterfaceTest, EditionDefaultsDependencyManifest) {
   CreateTempFile("google/protobuf/descriptor.proto",
                  google::protobuf::DescriptorProto::descriptor()->file()->DebugString());
-  CreateTempFile("features.proto",
+  CreateTempFile("google/protobuf/unittest_features.proto",
                  pb::TestFeatures::descriptor()->file()->DebugString());
 
   Run("protocol_compiler --dependency_out=$tmpdir/manifest "
       "--edition_defaults_out=$tmpdir/defaults "
-      "--proto_path=$tmpdir features.proto");
+      "--proto_path=$tmpdir google/protobuf/unittest_features.proto");
 
   ExpectNoErrors();
 
-  ExpectFileContent(
-      "manifest",
-      "$tmpdir/defaults: "
-      "$tmpdir/google/protobuf/descriptor.proto\\\n $tmpdir/features.proto");
+  ExpectFileContent("manifest",
+                    "$tmpdir/defaults: "
+                    "$tmpdir/google/protobuf/descriptor.proto\\\n "
+                    "$tmpdir/google/protobuf/unittest_features.proto");
 }
 #endif  // _WIN32
 
 TEST_F(CommandLineInterfaceTest, EditionDefaultsInvalidMissingDescriptor) {
-  CreateTempFile("features.proto", R"schema(
+  CreateTempFile("google/protobuf/unittest_features.proto", R"schema(
     syntax = "proto2";
     message Foo {}
   )schema");
   Run("protocol_compiler --proto_path=$tmpdir "
       "--edition_defaults_out=$tmpdir/defaults "
-      "features.proto");
+      "google/protobuf/unittest_features.proto");
   ExpectErrorSubstring("Could not find FeatureSet in descriptor pool");
 }
 
diff --git a/src/google/protobuf/unittest_features.proto b/src/google/protobuf/unittest_features.proto
@@ -5,12 +5,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-edition = "2023";
+edition = "2024";
 
 package pb;
 
 import "google/protobuf/descriptor.proto";
 
+option java_outer_classname = "UnittestFeatures";
+
 extend google.protobuf.FeatureSet {
   TestFeatures test = 9999;
 }
