From 473233fd07398601da3e11b618c7868ae6d48164 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 22 Apr 2026 20:46:32 -0700 Subject: [PATCH] Replace EDITION_UNSTABLE with EDITION_2026 in naming style tests. PiperOrigin-RevId: 904196741 --- editions/defaults_test.cc | 30 +++++++++---------- .../command_line_interface_unittest.cc | 28 ----------------- .../protobuf/compiler/java/java_features.pb.h | 2 +- src/google/protobuf/descriptor.pb.cc | 2 +- src/google/protobuf/descriptor.proto | 2 +- src/google/protobuf/feature_resolver_test.cc | 17 ----------- 6 files changed, 18 insertions(+), 63 deletions(-) diff --git a/editions/defaults_test.cc b/editions/defaults_test.cc index 83e00c6abdef8..457108725e62d 100644 --- a/editions/defaults_test.cc +++ b/editions/defaults_test.cc @@ -97,7 +97,7 @@ TEST(DefaultsTest, Check2024) { TEST(DefaultsTest, CheckFuture) { auto defaults = ReadDefaults("test_defaults_future"); ASSERT_OK(defaults); - ASSERT_EQ(defaults->defaults().size(), 7); + ASSERT_EQ(defaults->defaults().size(), 6); ASSERT_EQ(defaults->minimum_edition(), EDITION_2023); ASSERT_EQ(defaults->maximum_edition(), EDITION_99997_TEST_ONLY); @@ -119,16 +119,16 @@ TEST(DefaultsTest, CheckFuture) { .GetExtension(pb::test) .file_feature(), pb::VALUE3); - EXPECT_EQ(defaults->defaults()[5].edition(), EDITION_UNSTABLE); - EXPECT_EQ(defaults->defaults()[5] + EXPECT_EQ(defaults->defaults()[4].edition(), EDITION_UNSTABLE); + EXPECT_EQ(defaults->defaults()[4] .overridable_features() .GetExtension(pb::test) .new_unstable_feature(), pb::UNSTABLE2); - EXPECT_EQ(defaults->defaults()[6].edition(), EDITION_99997_TEST_ONLY); - EXPECT_EQ(defaults->defaults()[6].overridable_features().field_presence(), + EXPECT_EQ(defaults->defaults()[5].edition(), EDITION_99997_TEST_ONLY); + EXPECT_EQ(defaults->defaults()[5].overridable_features().field_presence(), FeatureSet::EXPLICIT); - EXPECT_EQ(defaults->defaults()[6] + EXPECT_EQ(defaults->defaults()[5] .overridable_features() .GetExtension(pb::test) .file_feature(), @@ -138,7 +138,7 @@ TEST(DefaultsTest, CheckFuture) { TEST(DefaultsTest, CheckFarFuture) { auto defaults = ReadDefaults("test_defaults_far_future"); ASSERT_OK(defaults); - ASSERT_EQ(defaults->defaults().size(), 9); + ASSERT_EQ(defaults->defaults().size(), 8); ASSERT_EQ(defaults->minimum_edition(), EDITION_99997_TEST_ONLY); ASSERT_EQ(defaults->maximum_edition(), EDITION_99999_TEST_ONLY); @@ -160,24 +160,24 @@ TEST(DefaultsTest, CheckFarFuture) { .GetExtension(pb::test) .file_feature(), pb::VALUE3); - EXPECT_EQ(defaults->defaults()[5].edition(), EDITION_UNSTABLE); - EXPECT_EQ(defaults->defaults()[5] + EXPECT_EQ(defaults->defaults()[4].edition(), EDITION_UNSTABLE); + EXPECT_EQ(defaults->defaults()[4] .overridable_features() .GetExtension(pb::test) .new_unstable_feature(), pb::UNSTABLE2); - EXPECT_EQ(defaults->defaults()[6].edition(), EDITION_99997_TEST_ONLY); - EXPECT_EQ(defaults->defaults()[6].overridable_features().field_presence(), + EXPECT_EQ(defaults->defaults()[5].edition(), EDITION_99997_TEST_ONLY); + EXPECT_EQ(defaults->defaults()[5].overridable_features().field_presence(), FeatureSet::EXPLICIT); - EXPECT_EQ(defaults->defaults()[6] + EXPECT_EQ(defaults->defaults()[5] .overridable_features() .GetExtension(pb::test) .file_feature(), pb::VALUE4); - EXPECT_EQ(defaults->defaults()[7].edition(), EDITION_99998_TEST_ONLY); - EXPECT_EQ(defaults->defaults()[7].overridable_features().field_presence(), + EXPECT_EQ(defaults->defaults()[6].edition(), EDITION_99998_TEST_ONLY); + EXPECT_EQ(defaults->defaults()[6].overridable_features().field_presence(), FeatureSet::EXPLICIT); - EXPECT_EQ(defaults->defaults()[7] + EXPECT_EQ(defaults->defaults()[6] .overridable_features() .GetExtension(pb::test) .file_feature(), diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 7a8f1c68e7e6d..f864f39150f2f 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -2491,20 +2491,6 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMaximum) { } fixed_features {} } - defaults { - edition: EDITION_2026 - overridable_features { - field_presence: EXPLICIT - enum_type: OPEN - repeated_field_encoding: PACKED - utf8_validation: VERIFY - message_encoding: LENGTH_PREFIXED - json_format: ALLOW - enforce_naming_style: STYLE2026 - default_symbol_visibility: EXPORT_TOP_LEVEL - } - fixed_features {} - } minimum_edition: EDITION_PROTO2 maximum_edition: EDITION_99997_TEST_ONLY )pb")); @@ -2604,20 +2590,6 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMinimum) { } fixed_features {} } - defaults { - edition: EDITION_2026 - overridable_features { - field_presence: EXPLICIT - enum_type: OPEN - repeated_field_encoding: PACKED - utf8_validation: VERIFY - message_encoding: LENGTH_PREFIXED - json_format: ALLOW - enforce_naming_style: STYLE2026 - default_symbol_visibility: EXPORT_TOP_LEVEL - } - fixed_features {} - } minimum_edition: EDITION_99997_TEST_ONLY maximum_edition: EDITION_99999_TEST_ONLY )pb")); diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 43fe3254b3328..5c4894667865d 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -89,7 +89,7 @@ internal::EnumTraitsT<::pb::JavaFeatures_Utf8Validation_internal_data_> namespace internal { template <> inline ::absl::string_view GetFeatureSetDefaultsData<::pb::JavaFeatures>() { - static constexpr char kDefaults[] = "CicYhAciA8o+ACodCAEQAhgCIAMoATACOAJAAco+CggBEAEYACABKAMKJxjnByIDyj4AKh0IAhABGAEgAigBMAE4AkAByj4KCAAQARgAIAEoAwonGOgHIhMIARABGAEgAigBMAHKPgQIABABKg04AkAByj4GGAAgASgDCicY6QciGwgBEAEYASACKAEwATgBQALKPggIABABGAAoASoFyj4CIAAg5gco6Qc="; + static constexpr char kDefaults[] = "CicYhAciA8o+ACodCAEQAhgCIAMoATACOAJAAco+CggBEAEYACABKAMKJxjnByIDyj4AKh0IAhABGAEgAigBMAE4AkAByj4KCAAQARgAIAEoAwonGOgHIhMIARABGAEgAigBMAHKPgQIABABKg04AkAByj4GGAAgASgDCicY6QciGwgBEAEYASACKAEwATgBQALKPggIABABGAAoASoFyj4CIAAKJxiPTiIbCAEQARgBIAIoATABOANAAso+CAgAEAEYACgBKgXKPgIgACDmByjpBw=="; return kDefaults; } } // namespace internal diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 6ac12a668cdd8..7596a92ca0a88 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -7434,7 +7434,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB "yle\030\007 \001(\0162..google.protobuf.FeatureSet.E" "nforceNamingStyleBZ\210\001\002\230\001\001\230\001\002\230\001\003\230\001\004\230\001\005\230\001\006" "\230\001\007\230\001\010\230\001\t\242\001\021\022\014STYLE_LEGACY\030\204\007\242\001\016\022\tSTYLE2" - "024\030\351\007\242\001\016\022\tSTYLE2026\030\352\007\262\001\003\010\351\007\022\240\001\n\031defaul" + "024\030\351\007\242\001\016\022\tSTYLE2026\030\217N\262\001\003\010\351\007\022\240\001\n\031defaul" "t_symbol_visibility\030\010 \001(\0162E.google.proto" "buf.FeatureSet.VisibilityFeature.Default" "SymbolVisibilityB6\210\001\002\230\001\001\242\001\017\022\nEXPORT_ALL\030" diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index d1978932c0b5c..25dddc0999917 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -1168,7 +1168,7 @@ message FeatureSet { }, edition_defaults = { edition: EDITION_LEGACY, value: "STYLE_LEGACY" }, edition_defaults = { edition: EDITION_2024, value: "STYLE2024" }, - edition_defaults = { edition: EDITION_2026, value: "STYLE2026" } + edition_defaults = { edition: EDITION_UNSTABLE, value: "STYLE2026" } ]; message VisibilityFeature { diff --git a/src/google/protobuf/feature_resolver_test.cc b/src/google/protobuf/feature_resolver_test.cc index 9eae40c37a1c3..829f8545c2eba 100644 --- a/src/google/protobuf/feature_resolver_test.cc +++ b/src/google/protobuf/feature_resolver_test.cc @@ -2290,23 +2290,6 @@ TEST_F(FeatureResolverPoolTest, CompileDefaultsMinimumCovered) { [pb.test] {} } } - defaults { - edition: EDITION_2026 - overridable_features { - field_presence: EXPLICIT - enum_type: OPEN - repeated_field_encoding: PACKED - utf8_validation: VERIFY - message_encoding: LENGTH_PREFIXED - json_format: ALLOW - enforce_naming_style: STYLE2026 - default_symbol_visibility: EXPORT_TOP_LEVEL - [pb.test] { file_feature: VALUE2 } - } - fixed_features { - [pb.test] {} - } - } defaults { edition: EDITION_99998_TEST_ONLY overridable_features {