Skip to content

Replace EDITION_UNSTABLE with EDITION_2026 in naming style tests. #27054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
copybara-service wants to merge 1 commit into from
Closed

Replace EDITION_UNSTABLE with EDITION_2026 in naming style tests. #27054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions editions/defaults_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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(),
Expand All @@ -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);

Expand All @@ -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(),
Expand Down
28 changes: 0 additions & 28 deletions src/google/protobuf/compiler/command_line_interface_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/java/java_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/google/protobuf/descriptor.pb.cc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/google/protobuf/descriptor.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
17 changes: 0 additions & 17 deletions src/google/protobuf/feature_resolver_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading