mmo-ref/dep-protobuf
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf synced 2026-08-26 02:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add conformance test for edition unstable

Browse source 
PiperOrigin-RevId: 850054867
This commit is contained in:
Rachel Goldfinger 2025-12-29 07:38:38 -08:00 • committed by Copybara-Service
parent 99187f1133
commit 0404e66d8b
27 changed files with 226 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake/conformance.cmake
View file

@ -38,12 +38,16 @@ add_custom_command(
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.h
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.cc
DEPENDS ${protobuf_PROTOC_EXE}
${protobuf_SOURCE_DIR}/conformance/conformance.proto
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition_unstable.proto
COMMAND ${protobuf_PROTOC_EXE}
${protobuf_SOURCE_DIR}/conformance/conformance.proto
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition_unstable.proto
--proto_path=${protobuf_SOURCE_DIR}
--cpp_out=${protobuf_BINARY_DIR}
)
@ -89,6 +93,8 @@ add_library(libconformance_common STATIC
${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.h
${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.cc
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.h
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.cc
${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.h

9
conformance/BUILD
View file

@ -138,6 +138,7 @@ cc_library(
"//:test_messages_proto2_cc_proto",
"//:test_messages_proto3_cc_proto",
"//conformance/test_protos:test_messages_edition2023_cc_proto",
"//conformance/test_protos:test_messages_edition_unstable_cc_proto",
"//editions:test_messages_proto2_editions_cc_proto",
"//editions:test_messages_proto3_editions_cc_proto",
"//src/google/protobuf",
@ -166,6 +167,7 @@ cc_library(
"//:test_messages_proto2_cc_proto",
"//:test_messages_proto3_cc_proto",
"//conformance/test_protos:test_messages_edition2023_cc_proto",
"//conformance/test_protos:test_messages_edition_unstable_cc_proto",
"//editions:test_messages_proto2_editions_cc_proto",
"//editions:test_messages_proto3_editions_cc_proto",
"//src/google/protobuf",
@ -249,6 +251,7 @@ cc_test(
"//:test_messages_proto2_cc_proto",
"//:test_messages_proto3_cc_proto",
"//conformance/test_protos:test_messages_edition2023_cc_proto",
"//conformance/test_protos:test_messages_edition_unstable_cc_proto",
"//editions:test_messages_proto2_editions_cc_proto",
"//editions:test_messages_proto3_editions_cc_proto",
"@googletest//:gtest",
@ -440,6 +443,7 @@ cc_binary(
"//:type_cc_proto",
"//:wrappers_cc_proto",
"//conformance/test_protos:test_messages_edition2023_cc_proto",
"//conformance/test_protos:test_messages_edition_unstable_cc_proto",
"//editions:test_messages_proto2_editions_cc_proto",
"//editions:test_messages_proto3_editions_cc_proto",
"//src/google/protobuf",
@ -472,6 +476,7 @@ java_binary(
"//:test_messages_proto2_java_proto",
"//:test_messages_proto3_java_proto",
"//conformance/test_protos:test_messages_edition2023_java_proto",
"//conformance/test_protos:test_messages_edition_unstable_java_proto",
"//editions:test_messages_proto2_editions_java_proto",
"//editions:test_messages_proto3_editions_java_proto",
],
@ -492,6 +497,7 @@ java_binary(
"//:test_messages_proto2_java_proto_lite",
"//:test_messages_proto3_java_proto_lite",
"//conformance/test_protos:test_messages_edition2023_java_proto_lite",
"//conformance/test_protos:test_messages_edition_unstable_java_proto_lite",
"//editions:test_messages_proto2_editions_java_proto_lite",
"//editions:test_messages_proto3_editions_java_proto_lite",
],
@ -511,6 +517,7 @@ py_binary(
":conformance_py_proto",
"//:protobuf_python",
"//conformance/test_protos:test_messages_edition2023_py_pb2",
"//conformance/test_protos:test_messages_edition_unstable_py_pb2",
"//editions:test_messages_proto2_editions_py_pb2",
"//editions:test_messages_proto3_editions_py_pb2",
"//python:_message", # Make upb visible if we need it.
@ -572,6 +579,7 @@ inline_sh_binary(
visibility = ["//csharp:__subpackages__"],
deps = [
"//conformance/test_protos:test_messages_edition2023_csharp_proto",
"//conformance/test_protos:test_messages_edition_unstable_csharp_proto",
"//csharp/src/Google.Protobuf.Conformance:conformance_runfiles",
],
)
@ -587,6 +595,7 @@ objc_library(
"//:test_messages_proto2_objc_proto",
"//:test_messages_proto3_objc_proto",
"//conformance/test_protos:test_messages_edition2023_objc_proto",
"//conformance/test_protos:test_messages_edition_unstable_objc_proto",
"//editions:test_messages_proto2_editions_objc_proto",
"//editions:test_messages_proto3_editions_objc_proto",
],

6
conformance/ConformanceJava.java
View file

@ -17,6 +17,8 @@ import com.google.protobuf.util.JsonFormat;
import com.google.protobuf.util.JsonFormat.TypeRegistry;
import com.google.protobuf_test_messages.edition2023.TestAllTypesEdition2023;
import com.google.protobuf_test_messages.edition2023.TestMessagesEdition2023;
import com.google.protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable;
import com.google.protobuf_test_messages.edition_unstable.TestMessagesEditionUnstableProto;
import com.google.protobuf_test_messages.editions.proto2.TestMessagesProto2Editions;
import com.google.protobuf_test_messages.editions.proto3.TestMessagesProto3Editions;
import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
@ -217,6 +219,8 @@ class ConformanceJava {
return TestAllTypesProto2.class;
case "protobuf_test_messages.editions.TestAllTypesEdition2023":
return TestAllTypesEdition2023.class;
case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
return TestAllTypesEditionUnstable.class;
case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
return TestMessagesProto3Editions.TestAllTypesProto3.class;
case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":
@ -235,6 +239,8 @@ class ConformanceJava {
return TestMessagesProto2.class;
case "protobuf_test_messages.editions.TestAllTypesEdition2023":
return TestMessagesEdition2023.class;
case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
return TestMessagesEditionUnstableProto.class;
case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
return TestMessagesProto3Editions.class;
case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":

6
conformance/ConformanceJavaLite.java
View file

@ -15,6 +15,8 @@ import com.google.protobuf.Parser;
import com.google.protobuf.conformance.Conformance;
import com.google.protobuf_test_messages.edition2023.TestAllTypesEdition2023;
import com.google.protobuf_test_messages.edition2023.TestMessagesEdition2023;
import com.google.protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable;
import com.google.protobuf_test_messages.edition_unstable.TestMessagesEditionUnstableProto;
import com.google.protobuf_test_messages.editions.proto2.TestMessagesProto2Editions;
import com.google.protobuf_test_messages.editions.proto3.TestMessagesProto3Editions;
import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
@ -216,6 +218,8 @@ class ConformanceJavaLite {
return TestAllTypesProto2.class;
case "protobuf_test_messages.editions.TestAllTypesEdition2023":
return TestAllTypesEdition2023.class;
case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
return TestAllTypesEditionUnstable.class;
case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
return TestMessagesProto3Editions.TestAllTypesProto3.class;
case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":
@ -234,6 +238,8 @@ class ConformanceJavaLite {
return TestMessagesProto2.class;
case "protobuf_test_messages.editions.TestAllTypesEdition2023":
return TestMessagesEdition2023.class;
case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
return TestMessagesEditionUnstableProto.class;
case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
return TestMessagesProto3Editions.class;
case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":

19
conformance/binary_json_conformance_suite.cc
View file

@ -33,6 +33,7 @@
#include "conformance/conformance.pb.h"
#include "conformance_test.h"
#include "conformance/test_protos/test_messages_edition2023.pb.h"
#include "conformance/test_protos/test_messages_edition_unstable.pb.h"
#include "editions/golden/test_messages_proto2_editions.pb.h"
#include "editions/golden/test_messages_proto3_editions.pb.h"
#include "google/protobuf/json/json.h"
@ -51,6 +52,7 @@ using google::protobuf::Descriptor;
using google::protobuf::FieldDescriptor;
using google::protobuf::internal::WireFormatLite;
using google::protobuf::util::NewTypeResolverForDescriptorPool;
using protobuf_test_messages::edition_unstable::TestAllTypesEditionUnstable;
using protobuf_test_messages::editions::TestAllTypesEdition2023;
using protobuf_test_messages::proto2::TestAllTypesProto2;
using protobuf_test_messages::proto3::TestAllTypesProto3;
@ -318,6 +320,7 @@ void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
BinaryAndJsonConformanceSuiteImpl<TestAllTypesProto2Editions>(
this, /*run_proto3_tests=*/false);
RunDelimitedFieldTests();
RunUnstableTests();
}
}
@ -374,6 +377,22 @@ void BinaryAndJsonConformanceSuite::RunDelimitedFieldTests() {
R"pb([protobuf_test_messages.editions.delimited_ext] { c: 99 })pb");
}
void BinaryAndJsonConformanceSuite::RunUnstableTests() {
SetTypeUrl(GetTypeUrl(TestAllTypesEditionUnstable::GetDescriptor()));
RunValidProtobufTest<TestAllTypesEditionUnstable>(
absl::StrCat("ValidInt32"), REQUIRED,
field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
R"pb(optional_int32: 99)pb");
RunValidProtobufTest<TestAllTypesEditionUnstable>(
absl::StrCat("ValidMap.Integer"), REQUIRED,
len(8,
absl::StrCat(field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
field(2, WireFormatLite::WIRETYPE_VARINT, varint(87)))),
R"pb(map_int32_int32 { key: 99 value: 87 })pb");
}
void BinaryAndJsonConformanceSuite::RunMessageSetTests() {
RunValidBinaryProtobufTest<TestAllTypesProto2>(
absl::StrCat("ValidMessageSetEncoding"), REQUIRED,

2
conformance/binary_json_conformance_suite.h
View file

@ -57,6 +57,8 @@ class BinaryAndJsonConformanceSuite : public ConformanceTestSuite {
void RunDelimitedFieldTests();
void RunUnstableTests();
void RunMessageSetTests();
template <typename MessageType>

3
conformance/conformance.proto
View file

@ -101,7 +101,8 @@ message ConformanceRequest {
// protobuf_test_messages.proto2.TestAllTypesProto2 or
// protobuf_test_messages.editions.proto2.TestAllTypesProto2 or
// protobuf_test_messages.editions.proto3.TestAllTypesProto3 or
// protobuf_test_messages.editions.TestAllTypesEdition2023.
// protobuf_test_messages.editions.TestAllTypesEdition2023 or
// protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable.
string message_type = 4;
// Each test is given a specific test category. Some category may need

3
conformance/conformance_cpp.cc
View file

@ -32,6 +32,7 @@
#include "absl/strings/str_cat.h"
#include "conformance/conformance.pb.h"
#include "conformance/test_protos/test_messages_edition2023.pb.h"
#include "conformance/test_protos/test_messages_edition_unstable.pb.h"
#include "editions/golden/test_messages_proto2_editions.pb.h"
#include "editions/golden/test_messages_proto3_editions.pb.h"
#include "google/protobuf/endian.h"
@ -58,6 +59,7 @@ using ::google::protobuf::util::JsonStringToMessage;
using ::google::protobuf::util::MessageToJsonString;
using ::google::protobuf::util::NewTypeResolverForDescriptorPool;
using ::google::protobuf::util::TypeResolver;
using ::protobuf_test_messages::edition_unstable::TestAllTypesEditionUnstable;
using ::protobuf_test_messages::editions::TestAllTypesEdition2023;
using ::protobuf_test_messages::proto2::TestAllTypesProto2;
using ::protobuf_test_messages::proto3::TestAllTypesProto3;
@ -97,6 +99,7 @@ class Harness {
google::protobuf::LinkMessageReflection<TestAllTypesProto2>();
google::protobuf::LinkMessageReflection<TestAllTypesProto3>();
google::protobuf::LinkMessageReflection<TestAllTypesEdition2023>();
google::protobuf::LinkMessageReflection<TestAllTypesEditionUnstable>();
google::protobuf::LinkMessageReflection<TestAllTypesProto2Editions>();
google::protobuf::LinkMessageReflection<TestAllTypesProto3Editions>();

6
conformance/conformance_objc.m
View file

@ -13,6 +13,7 @@
#import "google/protobuf/TestMessagesProto2.pbobjc.h"
#import "google/protobuf/TestMessagesProto3.pbobjc.h"
#import "test_protos/TestMessagesEdition2023.pbobjc.h"
#import "test_protos/TestMessagesEditionUnstable.pbobjc.h"
static void Die(NSString *format, ...) __dead2;
@ -65,6 +66,11 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
isEqual:@"protobuf_test_messages.editions.TestAllTypesEdition2023"]) {
msgClass = [EditionsTestAllTypesEdition2023 class];
registry = [EditionsTestMessagesEdition2023Root extensionRegistry];
} else if ([request.messageType
isEqual:
@"protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable"]) {
msgClass = [EditionUnstableTestAllTypesEditionUnstable class];
registry = [EditionUnstableTestMessagesEditionUnstableRoot extensionRegistry];
} else if ([request.messageType
isEqual:@"protobuf_test_messages.editions.proto2.TestAllTypesProto2"]) {
msgClass = [EditionsProto2TestAllTypesProto2 class];

3
conformance/conformance_php.php
View file

@ -63,6 +63,9 @@ function doTest($request)
case 'protobuf_test_messages.editions.TestAllTypesEdition2023':
$response->setSkipped('PHP doesn\'t support editions-specific features yet');
return $response;
case 'protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable':
$response->setSkipped('PHP doesn\'t support editions-specific features yet');
return $response;
case '':
trigger_error(
'Protobuf request doesn\'t have specific payload type',

6
conformance/conformance_python.py
View file

@ -20,6 +20,7 @@ from google.protobuf import test_messages_proto2_pb2
from google.protobuf import test_messages_proto3_pb2
from conformance import conformance_pb2
from conformance.test_protos import test_messages_edition2023_pb2
from conformance.test_protos import test_messages_edition_unstable_pb2
from editions.golden import test_messages_proto2_editions_pb2
from editions.golden import test_messages_proto3_editions_pb2
@ -42,6 +43,11 @@ def _create_test_message(type):
return test_messages_proto2_editions_pb2.TestAllTypesProto2()
if type == "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
return test_messages_proto3_editions_pb2.TestAllTypesProto3()
if (
type
== "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable"
):
return test_messages_edition_unstable_pb2.TestAllTypesEditionUnstable()
return None

4
conformance/conformance_rust.rs
View file

@ -12,6 +12,7 @@ use protobuf::{Message, ParseError};
use std::io::{self, ErrorKind, Read, Write};
use test_messages_edition2023_rust_proto::TestAllTypesEdition2023;
use test_messages_edition_unstable_rust_proto::TestAllTypesEditionUnstable;
use test_messages_proto2_editions_rust_proto::TestAllTypesProto2 as EditionsTestAllTypesProto2;
use test_messages_proto2_rust_proto::TestAllTypesProto2;
use test_messages_proto3_editions_rust_proto::TestAllTypesProto3 as EditionsTestAllTypesProto3;
@ -83,6 +84,9 @@ fn do_test(req: &ConformanceRequest) -> ConformanceResponse {
b"protobuf_test_messages.editions.TestAllTypesEdition2023" => {
roundtrip::<TestAllTypesEdition2023>(bytes)
}
b"protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable" => {
roundtrip::<TestAllTypesEditionUnstable>(bytes)
}
b"protobuf_test_messages.editions.proto2.TestAllTypesProto2" => {
roundtrip::<EditionsTestAllTypesProto2>(bytes)
}

2
conformance/conformance_test.cc
View file

@ -239,6 +239,8 @@ ConformanceTestSuite::ConformanceRequestSetting::GetSyntaxIdentifier() const {
return "Proto3";
case Edition::EDITION_PROTO2:
return "Proto2";
case Edition::EDITION_UNSTABLE:
return "EditionUnstable";
default: {
std::string id = "Editions";
if (prototype_message_.GetDescriptor()->name() == "TestAllTypesProto2") {

2
conformance/naming.h
View file

@ -26,6 +26,8 @@ inline std::string GetEditionIdentifier(const Descriptor& message) {
return "Proto3";
case Edition::EDITION_PROTO2:
return "Proto2";
case Edition::EDITION_UNSTABLE:
return "EditionUnstable";
default: {
std::string id = "Editions";
if (message.name() == "TestAllTypesProto2") {

4
conformance/naming_test.cc
View file

@ -2,6 +2,7 @@
#include <gtest/gtest.h>
#include "conformance/test_protos/test_messages_edition2023.pb.h"
#include "conformance/test_protos/test_messages_edition_unstable.pb.h"
#include "editions/golden/test_messages_proto2_editions.pb.h"
#include "editions/golden/test_messages_proto3_editions.pb.h"
#include "google/protobuf/test_messages_proto2.pb.h"
@ -12,6 +13,7 @@ namespace protobuf {
namespace conformance {
namespace {
using protobuf_test_messages::edition_unstable::TestAllTypesEditionUnstable;
using protobuf_test_messages::editions::TestAllTypesEdition2023;
using protobuf_test_messages::proto2::TestAllTypesProto2;
using protobuf_test_messages::proto3::TestAllTypesProto3;
@ -25,6 +27,8 @@ TEST(NamingTest, GetEditionIdentifier) {
EXPECT_EQ(GetEditionIdentifier(*TestAllTypesProto3::descriptor()), "Proto3");
EXPECT_EQ(GetEditionIdentifier(*TestAllTypesEdition2023::descriptor()),
"Editions");
EXPECT_EQ(GetEditionIdentifier(*TestAllTypesEditionUnstable::descriptor()),
"EditionUnstable");
EXPECT_EQ(GetEditionIdentifier(*TestAllTypesProto2Editions::descriptor()),
"Editions_Proto2");
EXPECT_EQ(GetEditionIdentifier(*TestAllTypesProto3Editions::descriptor()),

14
conformance/ruby/BUILD
View file

@ -25,6 +25,12 @@ internal_ruby_proto_library(
srcs = [":copied_test_messages_edition2023_proto"],
)
internal_ruby_proto_library(
name = "test_messages_edition_unstable_ruby_proto",
testonly = True,
srcs = [":copied_test_messages_edition_unstable_proto"],
)
rb_binary(
name = "conformance_ruby",
testonly = True,
@ -34,6 +40,7 @@ rb_binary(
deps = [
":conformance_ruby_proto",
":test_messages_edition2023_ruby_proto",
":test_messages_edition_unstable_ruby_proto",
"//ruby:conformance_editions_test_ruby_proto",
"//ruby:conformance_test_ruby_proto",
"//ruby:protobuf",
@ -55,3 +62,10 @@ internal_copy_files(
srcs = ["//conformance/test_protos:test_messages_edition2023.proto"],
strip_prefix = "conformance/test_protos",
)
internal_copy_files(
name = "copied_test_messages_edition_unstable_proto",
testonly = True,
srcs = ["//conformance/test_protos:test_messages_edition_unstable.proto"],
strip_prefix = "conformance/test_protos",
)

1
conformance/ruby/conformance_ruby.rb
View file

@ -14,6 +14,7 @@ $LOAD_PATH.unshift File.join(ENV['PWD'], 'ruby')
require 'conformance/ruby/conformance_pb'
require 'conformance/ruby/test_messages_edition2023_pb'
require 'conformance/ruby/test_messages_edition_unstable_pb'
require 'google/protobuf'
require 'google/protobuf/test_messages_proto3_pb'
require 'google/protobuf/test_messages_proto2_pb'

42
conformance/test_protos/BUILD
View file

@ -14,13 +14,21 @@ package(
default_visibility = ["//conformance:__subpackages__"],
)
exports_files(["test_messages_edition2023.proto"])
exports_files([
"test_messages_edition2023.proto",
"test_messages_edition_unstable.proto",
])
internal_csharp_proto_library(
name = "test_messages_edition2023_csharp_proto",
srcs = ["test_messages_edition2023.proto"],
)
internal_csharp_proto_library(
name = "test_messages_edition_unstable_csharp_proto",
srcs = ["test_messages_edition_unstable.proto"],
)
# Aliases for older monolithic conformance test protos defined elsewhere.
alias(
name = "test_messages_proto2_editions_proto",
@ -52,28 +60,60 @@ proto_library(
visibility = ["//visibility:public"],
)
proto_library(
name = "test_messages_edition_unstable_proto",
srcs = ["test_messages_edition_unstable.proto"],
visibility = ["//visibility:public"],
)
java_lite_proto_library(
name = "test_messages_edition2023_java_proto_lite",
deps = [":test_messages_edition2023_proto"],
)
java_lite_proto_library(
name = "test_messages_edition_unstable_java_proto_lite",
deps = [":test_messages_edition_unstable_proto"],
)
java_proto_library(
name = "test_messages_edition2023_java_proto",
deps = [":test_messages_edition2023_proto"],
)
java_proto_library(
name = "test_messages_edition_unstable_java_proto",
deps = [":test_messages_edition_unstable_proto"],
)
cc_proto_library(
name = "test_messages_edition2023_cc_proto",
deps = [":test_messages_edition2023_proto"],
)
cc_proto_library(
name = "test_messages_edition_unstable_cc_proto",
deps = [":test_messages_edition_unstable_proto"],
)
internal_py_proto_library(
name = "test_messages_edition2023_py_pb2",
srcs = [":test_messages_edition2023.proto"],
srcs_version = "PY2AND3",
)
internal_py_proto_library(
name = "test_messages_edition_unstable_py_pb2",
srcs = [":test_messages_edition_unstable.proto"],
srcs_version = "PY2AND3",
)
internal_objc_proto_library(
name = "test_messages_edition2023_objc_proto",
srcs = [":test_messages_edition2023.proto"],
)
internal_objc_proto_library(
name = "test_messages_edition_unstable_objc_proto",
srcs = [":test_messages_edition_unstable.proto"],
)

61
conformance/test_protos/test_messages_edition_unstable.proto Normal file
View file

@ -0,0 +1,61 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2024 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
edition = "UNSTABLE";
package protobuf_test_messages.edition_unstable;
option features.message_encoding = DELIMITED;
option java_package = "com.google.protobuf_test_messages.edition_unstable";
option objc_class_prefix = "EditionUnstable";
message ComplexMessage {
int32 d = 1;
}
message TestAllTypesEditionUnstable {
// Singular
int32 optional_int32 = 1;
ForeignMessageEditionUnstable optional_foreign_message = 2
[features.message_encoding = LENGTH_PREFIXED];
ForeignEnumEditionUnstable optional_foreign_enum = 3;
TestAllTypesEditionUnstable recursive_message = 4
[features.message_encoding = LENGTH_PREFIXED];
// Repeated
repeated int32 repeated_int32 = 5;
repeated ForeignMessageEditionUnstable repeated_foreign_message = 6
[features.message_encoding = LENGTH_PREFIXED];
repeated ForeignEnumEditionUnstable repeated_foreign_enum = 7;
// Map
map<int32, int32> map_int32_int32 = 8;
map<bool, bool> map_bool_bool = 9;
map<string, string> map_string_string = 10;
map<string, ForeignMessageEditionUnstable> map_string_foreign_message = 11;
map<string, ForeignEnumEditionUnstable> map_string_foreign_enum = 12;
// extensions
extensions 120 to 200;
}
message ForeignMessageEditionUnstable {
int32 c = 1;
}
enum ForeignEnumEditionUnstable {
FOREIGN_FOO = 0;
FOREIGN_BAR = 1;
FOREIGN_BAZ = 2;
}
extend TestAllTypesEditionUnstable {
int32 extension_int32 = 120;
}

5
conformance/text_format_conformance_suite.cc
View file

@ -18,6 +18,7 @@
#include "absl/strings/str_format.h"
#include "conformance_test.h"
#include "conformance/test_protos/test_messages_edition2023.pb.h"
#include "conformance/test_protos/test_messages_edition_unstable.pb.h"
#include "editions/golden/test_messages_proto2_editions.pb.h"
#include "editions/golden/test_messages_proto3_editions.pb.h"
#include "google/protobuf/test_messages_proto2.pb.h"
@ -143,6 +144,10 @@ TextFormatConformanceTestSuiteImpl<MessageType>::
// There are no editions-sensitive performance tests.
return;
}
if (MessageType::GetDescriptor()->name() == "TestAllTypesEditionUnstable") {
// There are no editions-sensitive performance tests.
return;
}
RunTextFormatPerformanceTests();
} else {
if (MessageType::GetDescriptor()->name() == "TestAllTypesProto2") {

1
csharp/generate_protos.sh
View file

@ -59,6 +59,7 @@ $PROTOC -Isrc -I. -Ijava/core/src/main/resources/ \
--include_source_info \
--include_imports \
conformance/test_protos/test_messages_edition2023.proto \
conformance/test_protos/test_messages_edition_unstable.proto \
csharp/protos/map_unittest_proto3.proto \
csharp/protos/unittest_issues.proto \
csharp/protos/unittest_custom_options_proto3.proto \

11
csharp/src/Google.Protobuf.Conformance/Program.cs
View file

@ -29,6 +29,7 @@ namespace Google.Protobuf.Conformance
ProtobufTestMessages.Proto3.TestAllTypesProto3.Descriptor,
ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor,
ProtobufTestMessages.Editions.TestAllTypesEdition2023.Descriptor,
ProtobufTestMessages.EditionUnstable.TestAllTypesEditionUnstable.Descriptor,
ProtobufTestMessages.Editions.Proto3.TestAllTypesProto3.Descriptor,
ProtobufTestMessages.Editions.Proto2.TestAllTypesProto2.Descriptor);
@ -83,6 +84,9 @@ namespace Google.Protobuf.Conformance
ProtobufTestMessages.Editions.TestMessagesEdition2023Extensions.DelimitedExt,
ProtobufTestMessages.Editions.TestMessagesEdition2023Extensions.GroupLikeType
};
ExtensionRegistry editionUnstableExtensionRegistry = new ExtensionRegistry {
ProtobufTestMessages.EditionUnstable.TestMessagesEditionUnstableExtensions.ExtensionInt32,
};
IMessage message;
try
{
@ -102,6 +106,9 @@ namespace Google.Protobuf.Conformance
"protobuf_test_messages.editions.TestAllTypesEdition2023" =>
parser.Parse<ProtobufTestMessages.Editions.TestAllTypesEdition2023>(
request.JsonPayload),
"protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable" =>
parser.Parse<ProtobufTestMessages.EditionUnstable.TestAllTypesEditionUnstable>(
request.JsonPayload),
"protobuf_test_messages.editions.proto2.TestAllTypesProto2" =>
parser.Parse<ProtobufTestMessages.Editions.Proto2.TestAllTypesProto2>(
request.JsonPayload),
@ -126,6 +133,10 @@ namespace Google.Protobuf.Conformance
ProtobufTestMessages.Editions.TestAllTypesEdition2023.Parser
.WithExtensionRegistry(edition2023ExtensionRegistry)
.ParseFrom(request.ProtobufPayload),
"protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable" =>
ProtobufTestMessages.EditionUnstable.TestAllTypesEditionUnstable.Parser
.WithExtensionRegistry(editionUnstableExtensionRegistry)
.ParseFrom(request.ProtobufPayload),
"protobuf_test_messages.editions.proto2.TestAllTypesProto2" =>
ProtobufTestMessages.Editions.Proto2.TestAllTypesProto2.Parser
.WithExtensionRegistry(editionsProto2ExtensionRegistry)

2
csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.cs
View file

@ -45,7 +45,7 @@ internal sealed partial class FeatureSetDescriptor
// based on that.
var supportedEditions = ((Edition[]) Enum.GetValues(typeof(Edition)))
.OrderBy(x => x)
.Where(e => e >= featureSetDefaults.MinimumEdition && e <= featureSetDefaults.MaximumEdition);
.Where(e => e >= featureSetDefaults.MinimumEdition && (e <= featureSetDefaults.MaximumEdition || e == Edition.Unstable));
// We assume the embedded defaults will always contain "legacy".
var currentDescriptor = MaybeCreateDescriptor(Edition.Legacy);

3
java/core/src/main/java/com/google/protobuf/Descriptors.java
View file

@ -120,7 +120,8 @@ public final class Descriptors {
+ javaEditionDefaults.getMinimumEdition()
+ "!");
}
if (edition.getNumber() > javaEditionDefaults.getMaximumEdition().getNumber()) {
if (edition.getNumber() > javaEditionDefaults.getMaximumEdition().getNumber()
&& edition != Edition.EDITION_UNSTABLE) {
throw new IllegalArgumentException(
"Edition "
+ edition

5
python/google/protobuf/descriptor_pool.py
View file

@ -738,7 +738,10 @@ class DescriptorPool(object):
),
)
)
if edition > self._edition_defaults.maximum_edition:
if (
edition > self._edition_defaults.maximum_edition
and edition != descriptor_pb2.EDITION_UNSTABLE
):
raise TypeError(
'Edition %s is later than the maximum supported edition %s!'
% (

5
src/google/protobuf/compiler/code_generator.cc
View file

@ -106,7 +106,10 @@ void GeneratorContext::GetCompilerVersion(Version* version) const {
bool CanSkipEditionCheck(absl::string_view filename) {
return absl::StartsWith(filename, "google/protobuf/") ||
absl::StartsWith(filename, "upb/") ||
absl::StartsWith(filename, "com/google/protobuf/");
absl::StartsWith(filename, "com/google/protobuf/") ||
absl::StartsWith(filename, "conformance/test_protos/") ||
// TODO: Remove this once internal proto rule is resolved.
absl::StartsWith(filename, "test_messages_edition_unstable");
}
} // namespace compiler

2
upb/reflection/file_def.c
View file

@ -220,7 +220,7 @@ const UPB_DESC(FeatureSet*)
upb_FileDef_EditionName(min));
return NULL;
}
if (edition > max) {
if (edition > max && edition != UPB_DESC(EDITION_UNSTABLE)) {
_upb_DefBuilder_Errf(ctx,
"Edition %s is later than the maximum edition %s "
"given in the defaults",