From 4c6436ab447f751c1ae6b421c23992e444bdf3be Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 20 Feb 2024 11:15:29 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 608673368 --- .../codegen_tests/proto2_optional.proto | 18 ++++++++++++++++++ .../codegen_tests/proto3_implicit.proto | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/google/protobuf/editions/codegen_tests/proto2_optional.proto b/src/google/protobuf/editions/codegen_tests/proto2_optional.proto index f358439fd6..1211a8955a 100644 --- a/src/google/protobuf/editions/codegen_tests/proto2_optional.proto +++ b/src/google/protobuf/editions/codegen_tests/proto2_optional.proto @@ -43,5 +43,23 @@ message Proto2Optional { optional string string_field = 30; optional bytes bytes_field = 31; } + + oneof oneof_field { + int32 int32_oneof_field = 152; + float float_oneof_field = 153; + double double_oneof_field = 154; + int64 int64_oneof_field = 155; + uint32 uint32_oneof_field = 156; + uint64 uint64_oneof_field = 157; + sint32 sint32_oneof_field = 158; + sint64 sint64_oneof_field = 159; + fixed32 fixed32_oneof_field = 160; + fixed64 fixed64_oneof_field = 161; + sfixed32 sfixed32_oneof_field = 162; + sfixed64 sfixed64_oneof_field = 163; + bool bool_oneof_field = 164; + string string_oneof_field = 165; + bytes bytes_oneof_field = 166; + } optional SubMessage sub_message = 2; } diff --git a/src/google/protobuf/editions/codegen_tests/proto3_implicit.proto b/src/google/protobuf/editions/codegen_tests/proto3_implicit.proto index 19424cd717..e7f0f5389a 100644 --- a/src/google/protobuf/editions/codegen_tests/proto3_implicit.proto +++ b/src/google/protobuf/editions/codegen_tests/proto3_implicit.proto @@ -43,5 +43,23 @@ message Proto3Implicit { string string_field = 30; bytes bytes = 31; } + + oneof oneof_field { + int32 int32_oneof_field = 152; + float float_oneof_field = 153; + double double_oneof_field = 154; + int64 int64_oneof_field = 155; + uint32 uint32_oneof_field = 156; + uint64 uint64_oneof_field = 157; + sint32 sint32_oneof_field = 158; + sint64 sint64_oneof_field = 159; + fixed32 fixed32_oneof_field = 160; + fixed64 fixed64_oneof_field = 161; + sfixed32 sfixed32_oneof_field = 162; + sfixed64 sfixed64_oneof_field = 163; + bool bool_oneof_field = 164; + string string_oneof_field = 165; + bytes bytes_oneof_field = 166; + } SubMessage sub_message = 2; }