Change the effective proto root for C#-specific test protos. PiperOrigin-RevId: 505928634
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 8be4428..cd682c2 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh
@@ -50,7 +50,7 @@ # Note that this deliberately does *not* include old_extensions1.proto # and old_extensions2.proto, which are generated with an older version # of protoc. -$PROTOC -Isrc -Icsharp/protos \ +$PROTOC -Isrc -I. \ --experimental_allow_proto3_optional \ --csharp_out=csharp/src/Google.Protobuf.Test.TestProtos \ --csharp_opt=file_extension=.pb.cs \
diff --git a/csharp/protos/map_unittest_proto3.proto b/csharp/protos/map_unittest_proto3.proto index e43e858..832bc4c 100644 --- a/csharp/protos/map_unittest_proto3.proto +++ b/csharp/protos/map_unittest_proto3.proto
@@ -36,31 +36,31 @@ // required fields in proto3. syntax = "proto3"; -option csharp_namespace = "Google.Protobuf.TestProtos"; - -import "unittest_proto3.proto"; - package protobuf_unittest3; +import "csharp/protos/unittest_proto3.proto"; + +option csharp_namespace = "Google.Protobuf.TestProtos"; + // Tests maps. message TestMap { - map<int32 , int32 > map_int32_int32 = 1; - map<int64 , int64 > map_int64_int64 = 2; - map<uint32 , uint32 > map_uint32_uint32 = 3; - map<uint64 , uint64 > map_uint64_uint64 = 4; - map<sint32 , sint32 > map_sint32_sint32 = 5; - map<sint64 , sint64 > map_sint64_sint64 = 6; - map<fixed32 , fixed32 > map_fixed32_fixed32 = 7; - map<fixed64 , fixed64 > map_fixed64_fixed64 = 8; + map<int32, int32> map_int32_int32 = 1; + map<int64, int64> map_int64_int64 = 2; + map<uint32, uint32> map_uint32_uint32 = 3; + map<uint64, uint64> map_uint64_uint64 = 4; + map<sint32, sint32> map_sint32_sint32 = 5; + map<sint64, sint64> map_sint64_sint64 = 6; + map<fixed32, fixed32> map_fixed32_fixed32 = 7; + map<fixed64, fixed64> map_fixed64_fixed64 = 8; map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9; map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10; - map<int32 , float > map_int32_float = 11; - map<int32 , double > map_int32_double = 12; - map<bool , bool > map_bool_bool = 13; - map<string , string > map_string_string = 14; - map<int32 , bytes > map_int32_bytes = 15; - map<int32 , MapEnum > map_int32_enum = 16; - map<int32 , ForeignMessage> map_int32_foreign_message = 17; + map<int32, float> map_int32_float = 11; + map<int32, double> map_int32_double = 12; + map<bool, bool> map_bool_bool = 13; + map<string, string> map_string_string = 14; + map<int32, bytes> map_int32_bytes = 15; + map<int32, MapEnum> map_int32_enum = 16; + map<int32, ForeignMessage> map_int32_foreign_message = 17; } message TestMapSubmessage { @@ -84,21 +84,21 @@ } message TestArenaMap { - map<int32 , int32 > map_int32_int32 = 1; - map<int64 , int64 > map_int64_int64 = 2; - map<uint32 , uint32 > map_uint32_uint32 = 3; - map<uint64 , uint64 > map_uint64_uint64 = 4; - map<sint32 , sint32 > map_sint32_sint32 = 5; - map<sint64 , sint64 > map_sint64_sint64 = 6; - map<fixed32 , fixed32 > map_fixed32_fixed32 = 7; - map<fixed64 , fixed64 > map_fixed64_fixed64 = 8; + map<int32, int32> map_int32_int32 = 1; + map<int64, int64> map_int64_int64 = 2; + map<uint32, uint32> map_uint32_uint32 = 3; + map<uint64, uint64> map_uint64_uint64 = 4; + map<sint32, sint32> map_sint32_sint32 = 5; + map<sint64, sint64> map_sint64_sint64 = 6; + map<fixed32, fixed32> map_fixed32_fixed32 = 7; + map<fixed64, fixed64> map_fixed64_fixed64 = 8; map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9; map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10; - map<int32 , float > map_int32_float = 11; - map<int32 , double > map_int32_double = 12; - map<bool , bool > map_bool_bool = 13; - map<int32 , MapEnum > map_int32_enum = 14; - map<int32 , ForeignMessage> map_int32_foreign_message = 15; + map<int32, float> map_int32_float = 11; + map<int32, double> map_int32_double = 12; + map<bool, bool> map_bool_bool = 13; + map<int32, MapEnum> map_int32_enum = 14; + map<int32, ForeignMessage> map_int32_foreign_message = 15; } // Previously, message containing enum called Type cannot be used as value of
diff --git a/csharp/protos/old_extensions1.proto b/csharp/protos/old_extensions1.proto index 58f6eb5..9f71d65 100644 --- a/csharp/protos/old_extensions1.proto +++ b/csharp/protos/old_extensions1.proto
@@ -43,10 +43,9 @@ // Import the proto file containing the extension. We don't use it, // but the import is what caused the issue. -import "old_extensions2.proto"; +import "csharp/protos/old_extensions2.proto"; option csharp_namespace = "Google.Protobuf.TestProtos.OldGenerator"; // We don't use this message other than to get its descriptor. -message TestMessage { -} +message TestMessage {}
diff --git a/csharp/protos/unittest.proto b/csharp/protos/unittest.proto index 9628b9e..a413e65 100644 --- a/csharp/protos/unittest.proto +++ b/csharp/protos/unittest.proto
@@ -40,12 +40,12 @@ // Some generic_services option(s) added automatically. // See: http://go/proto2-generic-services-default -option cc_generic_services = true; // auto-added -option java_generic_services = true; // auto-added -option py_generic_services = true; // auto-added +option cc_generic_services = true; // auto-added +option java_generic_services = true; // auto-added +option py_generic_services = true; // auto-added option cc_enable_arenas = true; -import "unittest_import.proto"; +import "csharp/protos/unittest_import.proto"; // We don't put this in a package within proto2 because we need to make sure // that the generated code doesn't depend on being in the proto2 namespace. @@ -77,101 +77,104 @@ } // Singular - optional int32 optional_int32 = 1; - optional int64 optional_int64 = 2; - optional uint32 optional_uint32 = 3; - optional uint64 optional_uint64 = 4; - optional sint32 optional_sint32 = 5; - optional sint64 optional_sint64 = 6; - optional fixed32 optional_fixed32 = 7; - optional fixed64 optional_fixed64 = 8; - optional sfixed32 optional_sfixed32 = 9; + optional int32 optional_int32 = 1; + optional int64 optional_int64 = 2; + optional uint32 optional_uint32 = 3; + optional uint64 optional_uint64 = 4; + optional sint32 optional_sint32 = 5; + optional sint64 optional_sint64 = 6; + optional fixed32 optional_fixed32 = 7; + optional fixed64 optional_fixed64 = 8; + optional sfixed32 optional_sfixed32 = 9; optional sfixed64 optional_sfixed64 = 10; - optional float optional_float = 11; - optional double optional_double = 12; - optional bool optional_bool = 13; - optional string optional_string = 14; - optional bytes optional_bytes = 15; + optional float optional_float = 11; + optional double optional_double = 12; + optional bool optional_bool = 13; + optional string optional_string = 14; + optional bytes optional_bytes = 15; optional group OptionalGroup = 16 { optional int32 a = 17; } - optional NestedMessage optional_nested_message = 18; - optional ForeignMessage optional_foreign_message = 19; - optional protobuf_unittest_import_proto2.ImportMessage optional_import_message = 20; + optional NestedMessage optional_nested_message = 18; + optional ForeignMessage optional_foreign_message = 19; + optional protobuf_unittest_import_proto2.ImportMessage + optional_import_message = 20; - optional NestedEnum optional_nested_enum = 21; - optional ForeignEnum optional_foreign_enum = 22; - optional protobuf_unittest_import_proto2.ImportEnum optional_import_enum = 23; + optional NestedEnum optional_nested_enum = 21; + optional ForeignEnum optional_foreign_enum = 22; + optional protobuf_unittest_import_proto2.ImportEnum optional_import_enum = 23; - optional string optional_string_piece = 24 [ctype=STRING_PIECE]; - optional string optional_cord = 25 [ctype=CORD]; + optional string optional_string_piece = 24 [ctype = STRING_PIECE]; + optional string optional_cord = 25 [ctype = CORD]; // Defined in unittest_import_public.proto optional protobuf_unittest_import_proto2.PublicImportMessage optional_public_import_message = 26; - optional NestedMessage optional_lazy_message = 27 [lazy=true]; + optional NestedMessage optional_lazy_message = 27 [lazy = true]; // Repeated - repeated int32 repeated_int32 = 31; - repeated int64 repeated_int64 = 32; - repeated uint32 repeated_uint32 = 33; - repeated uint64 repeated_uint64 = 34; - repeated sint32 repeated_sint32 = 35; - repeated sint64 repeated_sint64 = 36; - repeated fixed32 repeated_fixed32 = 37; - repeated fixed64 repeated_fixed64 = 38; + repeated int32 repeated_int32 = 31; + repeated int64 repeated_int64 = 32; + repeated uint32 repeated_uint32 = 33; + repeated uint64 repeated_uint64 = 34; + repeated sint32 repeated_sint32 = 35; + repeated sint64 repeated_sint64 = 36; + repeated fixed32 repeated_fixed32 = 37; + repeated fixed64 repeated_fixed64 = 38; repeated sfixed32 repeated_sfixed32 = 39; repeated sfixed64 repeated_sfixed64 = 40; - repeated float repeated_float = 41; - repeated double repeated_double = 42; - repeated bool repeated_bool = 43; - repeated string repeated_string = 44; - repeated bytes repeated_bytes = 45; + repeated float repeated_float = 41; + repeated double repeated_double = 42; + repeated bool repeated_bool = 43; + repeated string repeated_string = 44; + repeated bytes repeated_bytes = 45; repeated group RepeatedGroup = 46 { optional int32 a = 47; } - repeated NestedMessage repeated_nested_message = 48; - repeated ForeignMessage repeated_foreign_message = 49; - repeated protobuf_unittest_import_proto2.ImportMessage repeated_import_message = 50; + repeated NestedMessage repeated_nested_message = 48; + repeated ForeignMessage repeated_foreign_message = 49; + repeated protobuf_unittest_import_proto2.ImportMessage + repeated_import_message = 50; - repeated NestedEnum repeated_nested_enum = 51; - repeated ForeignEnum repeated_foreign_enum = 52; - repeated protobuf_unittest_import_proto2.ImportEnum repeated_import_enum = 53; + repeated NestedEnum repeated_nested_enum = 51; + repeated ForeignEnum repeated_foreign_enum = 52; + repeated protobuf_unittest_import_proto2.ImportEnum repeated_import_enum = 53; - repeated string repeated_string_piece = 54 [ctype=STRING_PIECE]; - repeated string repeated_cord = 55 [ctype=CORD]; + repeated string repeated_string_piece = 54 [ctype = STRING_PIECE]; + repeated string repeated_cord = 55 [ctype = CORD]; - repeated NestedMessage repeated_lazy_message = 57 [lazy=true]; + repeated NestedMessage repeated_lazy_message = 57 [lazy = true]; // Singular with defaults - optional int32 default_int32 = 61 [default = 41 ]; - optional int64 default_int64 = 62 [default = 42 ]; - optional uint32 default_uint32 = 63 [default = 43 ]; - optional uint64 default_uint64 = 64 [default = 44 ]; - optional sint32 default_sint32 = 65 [default = -45 ]; - optional sint64 default_sint64 = 66 [default = 46 ]; - optional fixed32 default_fixed32 = 67 [default = 47 ]; - optional fixed64 default_fixed64 = 68 [default = 48 ]; - optional sfixed32 default_sfixed32 = 69 [default = 49 ]; - optional sfixed64 default_sfixed64 = 70 [default = -50 ]; - optional float default_float = 71 [default = 51.5 ]; - optional double default_double = 72 [default = 52e3 ]; - optional bool default_bool = 73 [default = true ]; - optional string default_string = 74 [default = "hello"]; - optional bytes default_bytes = 75 [default = "world"]; + optional int32 default_int32 = 61 [default = 41]; + optional int64 default_int64 = 62 [default = 42]; + optional uint32 default_uint32 = 63 [default = 43]; + optional uint64 default_uint64 = 64 [default = 44]; + optional sint32 default_sint32 = 65 [default = -45]; + optional sint64 default_sint64 = 66 [default = 46]; + optional fixed32 default_fixed32 = 67 [default = 47]; + optional fixed64 default_fixed64 = 68 [default = 48]; + optional sfixed32 default_sfixed32 = 69 [default = 49]; + optional sfixed64 default_sfixed64 = 70 [default = -50]; + optional float default_float = 71 [default = 51.5]; + optional double default_double = 72 [default = 52e3]; + optional bool default_bool = 73 [default = true]; + optional string default_string = 74 [default = "hello"]; + optional bytes default_bytes = 75 [default = "world"]; - optional NestedEnum default_nested_enum = 81 [default = BAR ]; + optional NestedEnum default_nested_enum = 81 [default = BAR]; optional ForeignEnum default_foreign_enum = 82 [default = FOREIGN_BAR]; - optional protobuf_unittest_import_proto2.ImportEnum - default_import_enum = 83 [default = IMPORT_BAR]; + optional protobuf_unittest_import_proto2.ImportEnum default_import_enum = 83 + [default = IMPORT_BAR]; - optional string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"]; - optional string default_cord = 85 [ctype=CORD,default="123"]; + optional string default_string_piece = 84 + [ctype = STRING_PIECE, default = "abc"]; + optional string default_cord = 85 [ctype = CORD, default = "123"]; // For oneof test oneof oneof_field { @@ -190,9 +193,9 @@ } message TestDeprecatedFields { - optional int32 deprecated_int32 = 1 [deprecated=true]; + optional int32 deprecated_int32 = 1 [deprecated = true]; oneof oneof_fields { - int32 deprecated_int32_in_oneof = 2 [deprecated=true]; + int32 deprecated_int32_in_oneof = 2 [deprecated = true]; } } @@ -224,21 +227,21 @@ extend TestAllExtensions { // Singular - optional int32 optional_int32_extension = 1; - optional int64 optional_int64_extension = 2; - optional uint32 optional_uint32_extension = 3; - optional uint64 optional_uint64_extension = 4; - optional sint32 optional_sint32_extension = 5; - optional sint64 optional_sint64_extension = 6; - optional fixed32 optional_fixed32_extension = 7; - optional fixed64 optional_fixed64_extension = 8; - optional sfixed32 optional_sfixed32_extension = 9; + optional int32 optional_int32_extension = 1; + optional int64 optional_int64_extension = 2; + optional uint32 optional_uint32_extension = 3; + optional uint64 optional_uint64_extension = 4; + optional sint32 optional_sint32_extension = 5; + optional sint64 optional_sint64_extension = 6; + optional fixed32 optional_fixed32_extension = 7; + optional fixed64 optional_fixed64_extension = 8; + optional sfixed32 optional_sfixed32_extension = 9; optional sfixed64 optional_sfixed64_extension = 10; - optional float optional_float_extension = 11; - optional double optional_double_extension = 12; - optional bool optional_bool_extension = 13; - optional string optional_string_extension = 14; - optional bytes optional_bytes_extension = 15; + optional float optional_float_extension = 11; + optional double optional_double_extension = 12; + optional bool optional_bool_extension = 13; + optional string optional_string_extension = 14; + optional bytes optional_bytes_extension = 15; optional group OptionalGroup_extension = 16 { optional int32 a = 17; @@ -247,38 +250,38 @@ optional TestAllTypes.NestedMessage optional_nested_message_extension = 18; optional ForeignMessage optional_foreign_message_extension = 19; optional protobuf_unittest_import_proto2.ImportMessage - optional_import_message_extension = 20; + optional_import_message_extension = 20; optional TestAllTypes.NestedEnum optional_nested_enum_extension = 21; optional ForeignEnum optional_foreign_enum_extension = 22; optional protobuf_unittest_import_proto2.ImportEnum - optional_import_enum_extension = 23; + optional_import_enum_extension = 23; - optional string optional_string_piece_extension = 24 [ctype=STRING_PIECE]; - optional string optional_cord_extension = 25 [ctype=CORD]; + optional string optional_string_piece_extension = 24 [ctype = STRING_PIECE]; + optional string optional_cord_extension = 25 [ctype = CORD]; optional protobuf_unittest_import_proto2.PublicImportMessage - optional_public_import_message_extension = 26; + optional_public_import_message_extension = 26; - optional TestAllTypes.NestedMessage - optional_lazy_message_extension = 27 [lazy=true]; + optional TestAllTypes.NestedMessage optional_lazy_message_extension = 27 + [lazy = true]; // Repeated - repeated int32 repeated_int32_extension = 31; - repeated int64 repeated_int64_extension = 32; - repeated uint32 repeated_uint32_extension = 33; - repeated uint64 repeated_uint64_extension = 34; - repeated sint32 repeated_sint32_extension = 35; - repeated sint64 repeated_sint64_extension = 36; - repeated fixed32 repeated_fixed32_extension = 37; - repeated fixed64 repeated_fixed64_extension = 38; + repeated int32 repeated_int32_extension = 31; + repeated int64 repeated_int64_extension = 32; + repeated uint32 repeated_uint32_extension = 33; + repeated uint64 repeated_uint64_extension = 34; + repeated sint32 repeated_sint32_extension = 35; + repeated sint64 repeated_sint64_extension = 36; + repeated fixed32 repeated_fixed32_extension = 37; + repeated fixed64 repeated_fixed64_extension = 38; repeated sfixed32 repeated_sfixed32_extension = 39; repeated sfixed64 repeated_sfixed64_extension = 40; - repeated float repeated_float_extension = 41; - repeated double repeated_double_extension = 42; - repeated bool repeated_bool_extension = 43; - repeated string repeated_string_extension = 44; - repeated bytes repeated_bytes_extension = 45; + repeated float repeated_float_extension = 41; + repeated double repeated_double_extension = 42; + repeated bool repeated_bool_extension = 43; + repeated string repeated_string_extension = 44; + repeated bytes repeated_bytes_extension = 45; repeated group RepeatedGroup_extension = 46 { optional int32 a = 47; @@ -287,46 +290,46 @@ repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 48; repeated ForeignMessage repeated_foreign_message_extension = 49; repeated protobuf_unittest_import_proto2.ImportMessage - repeated_import_message_extension = 50; + repeated_import_message_extension = 50; repeated TestAllTypes.NestedEnum repeated_nested_enum_extension = 51; repeated ForeignEnum repeated_foreign_enum_extension = 52; repeated protobuf_unittest_import_proto2.ImportEnum - repeated_import_enum_extension = 53; + repeated_import_enum_extension = 53; - repeated string repeated_string_piece_extension = 54 [ctype=STRING_PIECE]; - repeated string repeated_cord_extension = 55 [ctype=CORD]; + repeated string repeated_string_piece_extension = 54 [ctype = STRING_PIECE]; + repeated string repeated_cord_extension = 55 [ctype = CORD]; - repeated TestAllTypes.NestedMessage - repeated_lazy_message_extension = 57 [lazy=true]; + repeated TestAllTypes.NestedMessage repeated_lazy_message_extension = 57 + [lazy = true]; // Singular with defaults - optional int32 default_int32_extension = 61 [default = 41 ]; - optional int64 default_int64_extension = 62 [default = 42 ]; - optional uint32 default_uint32_extension = 63 [default = 43 ]; - optional uint64 default_uint64_extension = 64 [default = 44 ]; - optional sint32 default_sint32_extension = 65 [default = -45 ]; - optional sint64 default_sint64_extension = 66 [default = 46 ]; - optional fixed32 default_fixed32_extension = 67 [default = 47 ]; - optional fixed64 default_fixed64_extension = 68 [default = 48 ]; - optional sfixed32 default_sfixed32_extension = 69 [default = 49 ]; - optional sfixed64 default_sfixed64_extension = 70 [default = -50 ]; - optional float default_float_extension = 71 [default = 51.5 ]; - optional double default_double_extension = 72 [default = 52e3 ]; - optional bool default_bool_extension = 73 [default = true ]; - optional string default_string_extension = 74 [default = "hello"]; - optional bytes default_bytes_extension = 75 [default = "world"]; + optional int32 default_int32_extension = 61 [default = 41]; + optional int64 default_int64_extension = 62 [default = 42]; + optional uint32 default_uint32_extension = 63 [default = 43]; + optional uint64 default_uint64_extension = 64 [default = 44]; + optional sint32 default_sint32_extension = 65 [default = -45]; + optional sint64 default_sint64_extension = 66 [default = 46]; + optional fixed32 default_fixed32_extension = 67 [default = 47]; + optional fixed64 default_fixed64_extension = 68 [default = 48]; + optional sfixed32 default_sfixed32_extension = 69 [default = 49]; + optional sfixed64 default_sfixed64_extension = 70 [default = -50]; + optional float default_float_extension = 71 [default = 51.5]; + optional double default_double_extension = 72 [default = 52e3]; + optional bool default_bool_extension = 73 [default = true]; + optional string default_string_extension = 74 [default = "hello"]; + optional bytes default_bytes_extension = 75 [default = "world"]; - optional TestAllTypes.NestedEnum - default_nested_enum_extension = 81 [default = BAR]; - optional ForeignEnum - default_foreign_enum_extension = 82 [default = FOREIGN_BAR]; + optional TestAllTypes.NestedEnum default_nested_enum_extension = 81 + [default = BAR]; + optional ForeignEnum default_foreign_enum_extension = 82 + [default = FOREIGN_BAR]; optional protobuf_unittest_import_proto2.ImportEnum - default_import_enum_extension = 83 [default = IMPORT_BAR]; + default_import_enum_extension = 83 [default = IMPORT_BAR]; - optional string default_string_piece_extension = 84 [ctype=STRING_PIECE, - default="abc"]; - optional string default_cord_extension = 85 [ctype=CORD, default="123"]; + optional string default_string_piece_extension = 84 + [ctype = STRING_PIECE, default = "abc"]; + optional string default_cord_extension = 85 [ctype = CORD, default = "123"]; // For oneof test optional uint32 oneof_uint32_extension = 111; @@ -350,7 +353,7 @@ extend TestAllExtensions { // Check for bug where string extensions declared in tested scope did not // compile. - optional string test = 1002 [default="test"]; + optional string test = 1002 [default = "test"]; // Used to test if generated extension name is correct when there are // underscores. optional string nested_string_extension = 1003; @@ -376,17 +379,17 @@ extend TestAllExtensions { optional TestRequired single = 1000; - repeated TestRequired multi = 1001; + repeated TestRequired multi = 1001; } // Pad the field count to 32 so that we can test that IsInitialized() // properly checks multiple elements of has_bits_. - optional int32 dummy4 = 4; - optional int32 dummy5 = 5; - optional int32 dummy6 = 6; - optional int32 dummy7 = 7; - optional int32 dummy8 = 8; - optional int32 dummy9 = 9; + optional int32 dummy4 = 4; + optional int32 dummy5 = 5; + optional int32 dummy6 = 6; + optional int32 dummy7 = 7; + optional int32 dummy8 = 8; + optional int32 dummy9 = 9; optional int32 dummy10 = 10; optional int32 dummy11 = 11; optional int32 dummy12 = 12; @@ -432,8 +435,7 @@ } // TestEmptyMessage is used to test unknown field support. -message TestEmptyMessage { -} +message TestEmptyMessage {} // Like above, but declare all field numbers as potential extensions. No // actual extensions should ever be defined for this type. @@ -487,21 +489,25 @@ } // Test that groups have disjoint field numbers from their siblings and -// parents. This is NOT possible in proto1; only google.protobuf. When attempting -// to compile with proto1, this will emit an error; so we only include it -// in protobuf_unittest_proto. -message TestDupFieldNumber { // NO_PROTO1 - optional int32 a = 1; // NO_PROTO1 - optional group Foo = 2 { optional int32 a = 1; } // NO_PROTO1 - optional group Bar = 3 { optional int32 a = 1; } // NO_PROTO1 -} // NO_PROTO1 +// parents. This is NOT possible in proto1; only google.protobuf. When +// attempting to compile with proto1, this will emit an error; so we only +// include it in protobuf_unittest_proto. +message TestDupFieldNumber { // NO_PROTO1 + optional int32 a = 1; // NO_PROTO1 + optional group Foo = 2 { + optional int32 a = 1; + } // NO_PROTO1 + optional group Bar = 3 { + optional int32 a = 1; + } // NO_PROTO1 +} // NO_PROTO1 // Additional messages for testing lazy fields. message TestEagerMessage { - optional TestAllTypes sub_message = 1 [lazy=false]; + optional TestAllTypes sub_message = 1 [lazy = false]; } message TestLazyMessage { - optional TestAllTypes sub_message = 1 [lazy=true]; + optional TestAllTypes sub_message = 1 [lazy = true]; } // Needed for a Python test. @@ -513,7 +519,6 @@ optional NestedMessage optional_nested_message = 1; } - // Test an enum that has multiple values with the same number. enum TestEnumWithDupValue { option allow_alias = true; @@ -543,18 +548,17 @@ optional string StringField = 2; optional ForeignEnum EnumField = 3; optional ForeignMessage MessageField = 4; - optional string StringPieceField = 5 [ctype=STRING_PIECE]; - optional string CordField = 6 [ctype=CORD]; + optional string StringPieceField = 5 [ctype = STRING_PIECE]; + optional string CordField = 6 [ctype = CORD]; repeated int32 RepeatedPrimitiveField = 7; repeated string RepeatedStringField = 8; repeated ForeignEnum RepeatedEnumField = 9; repeated ForeignMessage RepeatedMessageField = 10; - repeated string RepeatedStringPieceField = 11 [ctype=STRING_PIECE]; - repeated string RepeatedCordField = 12 [ctype=CORD]; + repeated string RepeatedStringPieceField = 11 [ctype = STRING_PIECE]; + repeated string RepeatedCordField = 12 [ctype = CORD]; } - // We list fields out of order, to ensure that we're using field number and not // field index to determine serialization order. message TestFieldOrderings { @@ -571,7 +575,7 @@ optional int32 bb = 1; } - optional NestedMessage optional_nested_message = 200; + optional NestedMessage optional_nested_message = 200; } extend TestFieldOrderings { @@ -603,10 +607,10 @@ optional bytes escaped_bytes = 1 [default = "\0\001\a\b\f\n\r\t\v\\\'\"\xfe"]; optional uint32 large_uint32 = 2 [default = 0xFFFFFFFF]; optional uint64 large_uint64 = 3 [default = 0xFFFFFFFFFFFFFFFF]; - optional int32 small_int32 = 4 [default = -0x7FFFFFFF]; - optional int64 small_int64 = 5 [default = -0x7FFFFFFFFFFFFFFF]; - optional int32 really_small_int32 = 21 [default = -0x80000000]; - optional int64 really_small_int64 = 22 [default = -0x8000000000000000]; + optional int32 small_int32 = 4 [default = -0x7FFFFFFF]; + optional int64 small_int64 = 5 [default = -0x7FFFFFFFFFFFFFFF]; + optional int32 really_small_int32 = 21 [default = -0x80000000]; + optional int64 really_small_int64 = 22 [default = -0x8000000000000000]; // The default value here is UTF-8 for "\u1234". (We could also just type // the UTF-8 text directly into this text file rather than escape it, but @@ -639,13 +643,12 @@ optional string cpp_trigraph = 20 [default = "? \? ?? \?? \??? ??/ ?\?-"]; // String defaults containing the character '\000' - optional string string_with_zero = 23 [default = "hel\000lo"]; - optional bytes bytes_with_zero = 24 [default = "wor\000ld"]; - optional string string_piece_with_zero = 25 [ctype=STRING_PIECE, - default="ab\000c"]; - optional string cord_with_zero = 26 [ctype=CORD, - default="12\0003"]; - optional string replacement_string = 27 [default="${unknown}"]; + optional string string_with_zero = 23 [default = "hel\000lo"]; + optional bytes bytes_with_zero = 24 [default = "wor\000ld"]; + optional string string_piece_with_zero = 25 + [ctype = STRING_PIECE, default = "ab\000c"]; + optional string cord_with_zero = 26 [ctype = CORD, default = "12\0003"]; + optional string replacement_string = 27 [default = "${unknown}"]; } message SparseEnumMessage { @@ -717,8 +720,8 @@ oneof foo { int32 foo_int = 1; string foo_string = 2; - string foo_cord = 3 [ctype=CORD]; - string foo_string_piece = 4 [ctype=STRING_PIECE]; + string foo_cord = 3 [ctype = CORD]; + string foo_string_piece = 4 [ctype = STRING_PIECE]; bytes foo_bytes = 5; NestedEnum foo_enum = 6; NestedMessage foo_message = 7; @@ -726,14 +729,14 @@ optional int32 a = 9; optional string b = 10; } - NestedMessage foo_lazy_message = 11 [lazy=true]; + NestedMessage foo_lazy_message = 11 [lazy = true]; } oneof bar { int32 bar_int = 12 [default = 5]; string bar_string = 13 [default = "STRING"]; - string bar_cord = 14 [ctype=CORD, default = "CORD"]; - string bar_string_piece = 15 [ctype=STRING_PIECE, default = "SPIECE"]; + string bar_cord = 14 [ctype = CORD, default = "CORD"]; + string bar_string_piece = 15 [ctype = STRING_PIECE, default = "SPIECE"]; bytes bar_bytes = 16 [default = "BYTES"]; NestedEnum bar_enum = 17 [default = BAR]; } @@ -774,39 +777,39 @@ // Test messages for packed fields message TestPackedTypes { - repeated int32 packed_int32 = 90 [packed = true]; - repeated int64 packed_int64 = 91 [packed = true]; - repeated uint32 packed_uint32 = 92 [packed = true]; - repeated uint64 packed_uint64 = 93 [packed = true]; - repeated sint32 packed_sint32 = 94 [packed = true]; - repeated sint64 packed_sint64 = 95 [packed = true]; - repeated fixed32 packed_fixed32 = 96 [packed = true]; - repeated fixed64 packed_fixed64 = 97 [packed = true]; - repeated sfixed32 packed_sfixed32 = 98 [packed = true]; - repeated sfixed64 packed_sfixed64 = 99 [packed = true]; - repeated float packed_float = 100 [packed = true]; - repeated double packed_double = 101 [packed = true]; - repeated bool packed_bool = 102 [packed = true]; - repeated ForeignEnum packed_enum = 103 [packed = true]; + repeated int32 packed_int32 = 90 [packed = true]; + repeated int64 packed_int64 = 91 [packed = true]; + repeated uint32 packed_uint32 = 92 [packed = true]; + repeated uint64 packed_uint64 = 93 [packed = true]; + repeated sint32 packed_sint32 = 94 [packed = true]; + repeated sint64 packed_sint64 = 95 [packed = true]; + repeated fixed32 packed_fixed32 = 96 [packed = true]; + repeated fixed64 packed_fixed64 = 97 [packed = true]; + repeated sfixed32 packed_sfixed32 = 98 [packed = true]; + repeated sfixed64 packed_sfixed64 = 99 [packed = true]; + repeated float packed_float = 100 [packed = true]; + repeated double packed_double = 101 [packed = true]; + repeated bool packed_bool = 102 [packed = true]; + repeated ForeignEnum packed_enum = 103 [packed = true]; } // A message with the same fields as TestPackedTypes, but without packing. Used // to test packed <-> unpacked wire compatibility. message TestUnpackedTypes { - repeated int32 unpacked_int32 = 90 [packed = false]; - repeated int64 unpacked_int64 = 91 [packed = false]; - repeated uint32 unpacked_uint32 = 92 [packed = false]; - repeated uint64 unpacked_uint64 = 93 [packed = false]; - repeated sint32 unpacked_sint32 = 94 [packed = false]; - repeated sint64 unpacked_sint64 = 95 [packed = false]; - repeated fixed32 unpacked_fixed32 = 96 [packed = false]; - repeated fixed64 unpacked_fixed64 = 97 [packed = false]; - repeated sfixed32 unpacked_sfixed32 = 98 [packed = false]; - repeated sfixed64 unpacked_sfixed64 = 99 [packed = false]; - repeated float unpacked_float = 100 [packed = false]; - repeated double unpacked_double = 101 [packed = false]; - repeated bool unpacked_bool = 102 [packed = false]; - repeated ForeignEnum unpacked_enum = 103 [packed = false]; + repeated int32 unpacked_int32 = 90 [packed = false]; + repeated int64 unpacked_int64 = 91 [packed = false]; + repeated uint32 unpacked_uint32 = 92 [packed = false]; + repeated uint64 unpacked_uint64 = 93 [packed = false]; + repeated sint32 unpacked_sint32 = 94 [packed = false]; + repeated sint64 unpacked_sint64 = 95 [packed = false]; + repeated fixed32 unpacked_fixed32 = 96 [packed = false]; + repeated fixed64 unpacked_fixed64 = 97 [packed = false]; + repeated sfixed32 unpacked_sfixed32 = 98 [packed = false]; + repeated sfixed64 unpacked_sfixed64 = 99 [packed = false]; + repeated float unpacked_float = 100 [packed = false]; + repeated double unpacked_double = 101 [packed = false]; + repeated bool unpacked_bool = 102 [packed = false]; + repeated ForeignEnum unpacked_enum = 103 [packed = false]; } message TestPackedExtensions { @@ -814,20 +817,20 @@ } extend TestPackedExtensions { - repeated int32 packed_int32_extension = 90 [packed = true]; - repeated int64 packed_int64_extension = 91 [packed = true]; - repeated uint32 packed_uint32_extension = 92 [packed = true]; - repeated uint64 packed_uint64_extension = 93 [packed = true]; - repeated sint32 packed_sint32_extension = 94 [packed = true]; - repeated sint64 packed_sint64_extension = 95 [packed = true]; - repeated fixed32 packed_fixed32_extension = 96 [packed = true]; - repeated fixed64 packed_fixed64_extension = 97 [packed = true]; - repeated sfixed32 packed_sfixed32_extension = 98 [packed = true]; - repeated sfixed64 packed_sfixed64_extension = 99 [packed = true]; - repeated float packed_float_extension = 100 [packed = true]; - repeated double packed_double_extension = 101 [packed = true]; - repeated bool packed_bool_extension = 102 [packed = true]; - repeated ForeignEnum packed_enum_extension = 103 [packed = true]; + repeated int32 packed_int32_extension = 90 [packed = true]; + repeated int64 packed_int64_extension = 91 [packed = true]; + repeated uint32 packed_uint32_extension = 92 [packed = true]; + repeated uint64 packed_uint64_extension = 93 [packed = true]; + repeated sint32 packed_sint32_extension = 94 [packed = true]; + repeated sint64 packed_sint64_extension = 95 [packed = true]; + repeated fixed32 packed_fixed32_extension = 96 [packed = true]; + repeated fixed64 packed_fixed64_extension = 97 [packed = true]; + repeated sfixed32 packed_sfixed32_extension = 98 [packed = true]; + repeated sfixed64 packed_sfixed64_extension = 99 [packed = true]; + repeated float packed_float_extension = 100 [packed = true]; + repeated double packed_double_extension = 101 [packed = true]; + repeated bool packed_bool_extension = 102 [packed = true]; + repeated ForeignEnum packed_enum_extension = 103 [packed = true]; } message TestUnpackedExtensions { @@ -835,20 +838,20 @@ } extend TestUnpackedExtensions { - repeated int32 unpacked_int32_extension = 90 [packed = false]; - repeated int64 unpacked_int64_extension = 91 [packed = false]; - repeated uint32 unpacked_uint32_extension = 92 [packed = false]; - repeated uint64 unpacked_uint64_extension = 93 [packed = false]; - repeated sint32 unpacked_sint32_extension = 94 [packed = false]; - repeated sint64 unpacked_sint64_extension = 95 [packed = false]; - repeated fixed32 unpacked_fixed32_extension = 96 [packed = false]; - repeated fixed64 unpacked_fixed64_extension = 97 [packed = false]; - repeated sfixed32 unpacked_sfixed32_extension = 98 [packed = false]; - repeated sfixed64 unpacked_sfixed64_extension = 99 [packed = false]; - repeated float unpacked_float_extension = 100 [packed = false]; - repeated double unpacked_double_extension = 101 [packed = false]; - repeated bool unpacked_bool_extension = 102 [packed = false]; - repeated ForeignEnum unpacked_enum_extension = 103 [packed = false]; + repeated int32 unpacked_int32_extension = 90 [packed = false]; + repeated int64 unpacked_int64_extension = 91 [packed = false]; + repeated uint32 unpacked_uint32_extension = 92 [packed = false]; + repeated uint64 unpacked_uint64_extension = 93 [packed = false]; + repeated sint32 unpacked_sint32_extension = 94 [packed = false]; + repeated sint64 unpacked_sint64_extension = 95 [packed = false]; + repeated fixed32 unpacked_fixed32_extension = 96 [packed = false]; + repeated fixed64 unpacked_fixed64_extension = 97 [packed = false]; + repeated sfixed32 unpacked_sfixed32_extension = 98 [packed = false]; + repeated sfixed64 unpacked_sfixed64_extension = 99 [packed = false]; + repeated float unpacked_float_extension = 100 [packed = false]; + repeated double unpacked_double_extension = 101 [packed = false]; + repeated bool unpacked_bool_extension = 102 [packed = false]; + repeated ForeignEnum unpacked_enum_extension = 103 [packed = false]; } // Used by ExtensionSetTest/DynamicExtensions. The test actually builds @@ -881,15 +884,15 @@ // in TestAllTypes didn't trigger the check. repeated fixed32 repeated_fixed32 = 12; // Check for a varint type, just for good measure. - repeated int32 repeated_int32 = 13; + repeated int32 repeated_int32 = 13; // These have two-byte tags. repeated fixed64 repeated_fixed64 = 2046; - repeated int64 repeated_int64 = 2047; + repeated int64 repeated_int64 = 2047; // Three byte tags. - repeated float repeated_float = 262142; - repeated uint64 repeated_uint64 = 262143; + repeated float repeated_float = 262142; + repeated uint64 repeated_uint64 = 262143; } // Test that if an optional or required message/group field appears multiple @@ -931,24 +934,22 @@ message TestCommentInjectionMessage { // */ <- This should not close the generated doc comment - optional string a = 1 [default="*/ <- Neither should this."]; + optional string a = 1 [default = "*/ <- Neither should this."]; } - // Test that RPC services work. -message FooRequest {} +message FooRequest {} message FooResponse {} message FooClientMessage {} -message FooServerMessage{} +message FooServerMessage {} service TestService { rpc Foo(FooRequest) returns (FooResponse); rpc Bar(BarRequest) returns (BarResponse); } - -message BarRequest {} +message BarRequest {} message BarResponse {} message TestJsonName { @@ -984,7 +985,7 @@ bytes oneof_bytes = 536870014; } - extensions 536860000 to 536869999; + extensions 536860000 to 536869999; } extend TestHugeFieldNumbers { @@ -1110,4 +1111,4 @@ ENUM_LABEL_98 = 98; ENUM_LABEL_99 = 99; ENUM_LABEL_100 = 100; -}; +}
diff --git a/csharp/protos/unittest_import.proto b/csharp/protos/unittest_import.proto index a0198c3..bb1e25e 100644 --- a/csharp/protos/unittest_import.proto +++ b/csharp/protos/unittest_import.proto
@@ -44,11 +44,10 @@ option optimize_for = SPEED; option cc_enable_arenas = true; - option csharp_namespace = "Google.Protobuf.TestProtos.Proto2"; // Test public import -import public "unittest_import_public.proto"; +import public "csharp/protos/unittest_import_public.proto"; message ImportMessage { optional int32 d = 1; @@ -60,7 +59,6 @@ IMPORT_BAZ = 9; } - // To use an enum in a map, it must has the first value as 0. enum ImportEnumForMap { UNKNOWN = 0;
diff --git a/csharp/protos/unittest_import_proto3.proto b/csharp/protos/unittest_import_proto3.proto index 2e66682..90692ef 100644 --- a/csharp/protos/unittest_import_proto3.proto +++ b/csharp/protos/unittest_import_proto3.proto
@@ -41,7 +41,7 @@ option csharp_namespace = "Google.Protobuf.TestProtos"; // Test public import -import public "unittest_import_public_proto3.proto"; +import public "csharp/protos/unittest_import_public_proto3.proto"; message ImportMessage { int32 d = 1; @@ -53,4 +53,3 @@ IMPORT_BAR = 8; IMPORT_BAZ = 9; } -
diff --git a/csharp/protos/unittest_issue6936_b.proto b/csharp/protos/unittest_issue6936_b.proto index 1d6d945..194c360 100644 --- a/csharp/protos/unittest_issue6936_b.proto +++ b/csharp/protos/unittest_issue6936_b.proto
@@ -30,15 +30,16 @@ syntax = "proto3"; -import "unittest_issue6936_a.proto"; - package unittest_issues; +import "csharp/protos/unittest_issue6936_a.proto"; + option csharp_namespace = "UnitTest.Issues.TestProtos"; // This file is used as part of a unit test for issue 6936 -// We don't need to use it, we just have to import it in "unittest_issue6936_c.proto" +// We don't need to use it, we just have to import it in +// "unittest_issue6936_c.proto" message Foo { - option (opt) = "foo"; + option (opt) = "foo"; }
diff --git a/csharp/protos/unittest_issue6936_c.proto b/csharp/protos/unittest_issue6936_c.proto index 2bc3115..3d77e6d 100644 --- a/csharp/protos/unittest_issue6936_c.proto +++ b/csharp/protos/unittest_issue6936_c.proto
@@ -30,17 +30,18 @@ syntax = "proto3"; -import "unittest_issue6936_a.proto"; -import "unittest_issue6936_b.proto"; - package unittest_issues; +import "csharp/protos/unittest_issue6936_a.proto"; +import "csharp/protos/unittest_issue6936_b.proto"; + option csharp_namespace = "UnitTest.Issues.TestProtos"; // This file is used as part of a unit test for issue 6936 // We don't need to use it, we just have to load it at runtime message Bar { - option (opt) = "bar"; - Foo foo = 1; + option (opt) = "bar"; + + Foo foo = 1; }
diff --git a/csharp/protos/unittest_proto3.proto b/csharp/protos/unittest_proto3.proto index 8c2f2c9..5bc9b9e 100644 --- a/csharp/protos/unittest_proto3.proto +++ b/csharp/protos/unittest_proto3.proto
@@ -42,7 +42,7 @@ // of a non-C# option) option java_outer_classname = "UnittestProto"; -import "unittest_import_proto3.proto"; +import "csharp/protos/unittest_import_proto3.proto"; package protobuf_unittest3; @@ -90,33 +90,33 @@ protobuf_unittest_import.ImportEnum single_import_enum = 23; // Defined in unittest_import_public.proto - protobuf_unittest_import.PublicImportMessage - single_public_import_message = 26; + protobuf_unittest_import.PublicImportMessage single_public_import_message = + 26; // Repeated - repeated int32 repeated_int32 = 31; - repeated int64 repeated_int64 = 32; - repeated uint32 repeated_uint32 = 33; - repeated uint64 repeated_uint64 = 34; - repeated sint32 repeated_sint32 = 35; - repeated sint64 repeated_sint64 = 36; - repeated fixed32 repeated_fixed32 = 37; - repeated fixed64 repeated_fixed64 = 38; + repeated int32 repeated_int32 = 31; + repeated int64 repeated_int64 = 32; + repeated uint32 repeated_uint32 = 33; + repeated uint64 repeated_uint64 = 34; + repeated sint32 repeated_sint32 = 35; + repeated sint64 repeated_sint64 = 36; + repeated fixed32 repeated_fixed32 = 37; + repeated fixed64 repeated_fixed64 = 38; repeated sfixed32 repeated_sfixed32 = 39; repeated sfixed64 repeated_sfixed64 = 40; - repeated float repeated_float = 41; - repeated double repeated_double = 42; - repeated bool repeated_bool = 43; - repeated string repeated_string = 44; - repeated bytes repeated_bytes = 45; + repeated float repeated_float = 41; + repeated double repeated_double = 42; + repeated bool repeated_bool = 43; + repeated string repeated_string = 44; + repeated bytes repeated_bytes = 45; - repeated NestedMessage repeated_nested_message = 48; - repeated ForeignMessage repeated_foreign_message = 49; - repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50; + repeated NestedMessage repeated_nested_message = 48; + repeated ForeignMessage repeated_foreign_message = 49; + repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50; - repeated NestedEnum repeated_nested_enum = 51; - repeated ForeignEnum repeated_foreign_enum = 52; - repeated protobuf_unittest_import.ImportEnum repeated_import_enum = 53; + repeated NestedEnum repeated_nested_enum = 51; + repeated ForeignEnum repeated_foreign_enum = 52; + repeated protobuf_unittest_import.ImportEnum repeated_import_enum = 53; // Defined in unittest_import_public.proto repeated protobuf_unittest_import.PublicImportMessage repeated_public_import_message = 54; @@ -138,7 +138,7 @@ } message TestDeprecatedFields { - int32 deprecated_int32 = 1 [deprecated=true]; + int32 deprecated_int32 = 1 [deprecated = true]; } // Define these after TestAllTypes to make sure the compiler can handle @@ -159,7 +159,6 @@ reserved "bar", "baz"; } - // Test that we can use NestedMessage from outside TestAllTypes. message TestForeignNested { TestAllTypes.NestedMessage foreign_nested = 1; @@ -194,9 +193,10 @@ // Test an enum that has multiple values with the same number. enum TestEnumWithDupValue { - TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED = 0; option allow_alias = true; + TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED = 0; + FOO1 = 1; BAR1 = 2; BAZ = 3; @@ -231,7 +231,6 @@ repeated ForeignMessage RepeatedMessageField = 10; } - // We list fields out of order, to ensure that we're using field number and not // field index to determine serialization order. message TestFieldOrderings { @@ -246,7 +245,7 @@ int32 bb = 1; } - NestedMessage single_nested_message = 200; + NestedMessage single_nested_message = 200; } message SparseEnumMessage { @@ -303,39 +302,39 @@ // Test messages for packed fields message TestPackedTypes { - repeated int32 packed_int32 = 90 [packed = true]; - repeated int64 packed_int64 = 91 [packed = true]; - repeated uint32 packed_uint32 = 92 [packed = true]; - repeated uint64 packed_uint64 = 93 [packed = true]; - repeated sint32 packed_sint32 = 94 [packed = true]; - repeated sint64 packed_sint64 = 95 [packed = true]; - repeated fixed32 packed_fixed32 = 96 [packed = true]; - repeated fixed64 packed_fixed64 = 97 [packed = true]; - repeated sfixed32 packed_sfixed32 = 98 [packed = true]; - repeated sfixed64 packed_sfixed64 = 99 [packed = true]; - repeated float packed_float = 100 [packed = true]; - repeated double packed_double = 101 [packed = true]; - repeated bool packed_bool = 102 [packed = true]; - repeated ForeignEnum packed_enum = 103 [packed = true]; + repeated int32 packed_int32 = 90 [packed = true]; + repeated int64 packed_int64 = 91 [packed = true]; + repeated uint32 packed_uint32 = 92 [packed = true]; + repeated uint64 packed_uint64 = 93 [packed = true]; + repeated sint32 packed_sint32 = 94 [packed = true]; + repeated sint64 packed_sint64 = 95 [packed = true]; + repeated fixed32 packed_fixed32 = 96 [packed = true]; + repeated fixed64 packed_fixed64 = 97 [packed = true]; + repeated sfixed32 packed_sfixed32 = 98 [packed = true]; + repeated sfixed64 packed_sfixed64 = 99 [packed = true]; + repeated float packed_float = 100 [packed = true]; + repeated double packed_double = 101 [packed = true]; + repeated bool packed_bool = 102 [packed = true]; + repeated ForeignEnum packed_enum = 103 [packed = true]; } // A message with the same fields as TestPackedTypes, but without packing. Used // to test packed <-> unpacked wire compatibility. message TestUnpackedTypes { - repeated int32 unpacked_int32 = 90 [packed = false]; - repeated int64 unpacked_int64 = 91 [packed = false]; - repeated uint32 unpacked_uint32 = 92 [packed = false]; - repeated uint64 unpacked_uint64 = 93 [packed = false]; - repeated sint32 unpacked_sint32 = 94 [packed = false]; - repeated sint64 unpacked_sint64 = 95 [packed = false]; - repeated fixed32 unpacked_fixed32 = 96 [packed = false]; - repeated fixed64 unpacked_fixed64 = 97 [packed = false]; - repeated sfixed32 unpacked_sfixed32 = 98 [packed = false]; - repeated sfixed64 unpacked_sfixed64 = 99 [packed = false]; - repeated float unpacked_float = 100 [packed = false]; - repeated double unpacked_double = 101 [packed = false]; - repeated bool unpacked_bool = 102 [packed = false]; - repeated ForeignEnum unpacked_enum = 103 [packed = false]; + repeated int32 unpacked_int32 = 90 [packed = false]; + repeated int64 unpacked_int64 = 91 [packed = false]; + repeated uint32 unpacked_uint32 = 92 [packed = false]; + repeated uint64 unpacked_uint64 = 93 [packed = false]; + repeated sint32 unpacked_sint32 = 94 [packed = false]; + repeated sint64 unpacked_sint64 = 95 [packed = false]; + repeated fixed32 unpacked_fixed32 = 96 [packed = false]; + repeated fixed64 unpacked_fixed64 = 97 [packed = false]; + repeated sfixed32 unpacked_sfixed32 = 98 [packed = false]; + repeated sfixed64 unpacked_sfixed64 = 99 [packed = false]; + repeated float unpacked_float = 100 [packed = false]; + repeated double unpacked_double = 101 [packed = false]; + repeated bool unpacked_bool = 102 [packed = false]; + repeated ForeignEnum unpacked_enum = 103 [packed = false]; } message TestRepeatedScalarDifferentTagSizes { @@ -344,15 +343,15 @@ // in TestAllTypes didn't trigger the check. repeated fixed32 repeated_fixed32 = 12; // Check for a varint type, just for good measure. - repeated int32 repeated_int32 = 13; + repeated int32 repeated_int32 = 13; // These have two-byte tags. repeated fixed64 repeated_fixed64 = 2046; - repeated int64 repeated_int64 = 2047; + repeated int64 repeated_int64 = 2047; // Three byte tags. - repeated float repeated_float = 262142; - repeated uint64 repeated_uint64 = 262143; + repeated float repeated_float = 262142; + repeated uint64 repeated_uint64 = 262143; } message TestCommentInjectionMessage { @@ -360,13 +359,12 @@ string a = 1; } - // Test that RPC services work. -message FooRequest {} +message FooRequest {} message FooResponse {} message FooClientMessage {} -message FooServerMessage{} +message FooServerMessage {} // This is a test service service TestService { @@ -375,8 +373,7 @@ rpc Bar(BarRequest) returns (BarResponse); } - -message BarRequest {} +message BarRequest {} message BarResponse {} message TestEmptyMessage {} @@ -400,7 +397,7 @@ } // Leading field comment - string text = 1; // Trailing field comment + string text = 1; // Trailing field comment } // Leading enum comment
diff --git a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs index d9d5667..681bc04 100644 --- a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs +++ b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs
@@ -1,4 +1,4 @@ -#region Copyright notice and license +#region Copyright notice and license // Protocol Buffers - Google's data interchange format // Copyright 2018 Google Inc. All rights reserved. // https://developers.google.com/protocol-buffers/ @@ -86,10 +86,12 @@ { var message = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage"); Assert.NotNull(message.Declaration); - Assert.AreEqual(389, message.Declaration.StartLine); + // TODO(jonskeet): Reinstate after regeneration + // Assert.AreEqual(386, message.Declaration.StartLine); Assert.AreEqual(1, message.Declaration.StartColumn); - Assert.AreEqual(404, message.Declaration.EndLine); + // TODO(jonskeet): Reinstate after regeneration + // Assert.AreEqual(401, message.Declaration.EndLine); Assert.AreEqual(2, message.Declaration.EndColumn); } @@ -169,7 +171,10 @@ } var byteStrings = descriptorSet.File.Select(f => f.ToByteString()).ToList(); var descriptors = FileDescriptor.BuildFromByteStrings(byteStrings); - return descriptors.Single(d => d.Name == "unittest_proto3.proto"); + // TODO(jonskeet): Remove the second condition here after regeneration + // (The Windows build doesn't perform regeneration yet.) + return descriptors.Single(d => d.Name == "csharp/protos/unittest_proto3.proto" || + d.Name == "unittest_proto3.proto"); } } }
diff --git a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs index 5c4909b..c18d29e 100644 --- a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs +++ b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
@@ -91,11 +91,13 @@ private void TestFileDescriptor(FileDescriptor file, FileDescriptor importedFile, FileDescriptor importedPublicFile) { - Assert.AreEqual("unittest_proto3.proto", file.Name); + // TODO(jonskeet): Reinstate after regeneration + // Assert.AreEqual("csharp/protos/unittest_proto3.proto", file.Name); Assert.AreEqual("protobuf_unittest3", file.Package); Assert.AreEqual("UnittestProto", file.Proto.Options.JavaOuterClassname); - Assert.AreEqual("unittest_proto3.proto", file.Proto.Name); + // TODO(jonskeet): Reinstate after regeneration + // Assert.AreEqual("csharp/protos/unittest_proto3.proto", file.Proto.Name); // unittest_proto3.proto doesn't have any public imports, but unittest_import_proto3.proto does. Assert.AreEqual(0, file.PublicDependencies.Count); @@ -127,16 +129,6 @@ } [Test] - public void FileDescriptor_NonRootPath() - { - // unittest_proto3.proto used to be in google/protobuf. Now it's in the C#-specific location, - // let's test something that's still in a directory. - FileDescriptor file = UnittestWellKnownTypesReflection.Descriptor; - Assert.AreEqual("google/protobuf/unittest_well_known_types.proto", file.Name); - Assert.AreEqual("protobuf_unittest", file.Package); - } - - [Test] public void FileDescriptor_BuildFromByteStrings_MissingDependency() { var descriptorData = new List<ByteString>