Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: third_party/protobuf/src/google/protobuf/unittest.proto

Issue 2599263002: third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Address comments Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } 188 }
189 189
190 message TestDeprecatedFields { 190 message TestDeprecatedFields {
191 optional int32 deprecated_int32 = 1 [deprecated=true]; 191 optional int32 deprecated_int32 = 1 [deprecated=true];
192 } 192 }
193 193
194 // Define these after TestAllTypes to make sure the compiler can handle 194 // Define these after TestAllTypes to make sure the compiler can handle
195 // that. 195 // that.
196 message ForeignMessage { 196 message ForeignMessage {
197 optional int32 c = 1; 197 optional int32 c = 1;
198 optional int32 d = 2;
198 } 199 }
199 200
200 enum ForeignEnum { 201 enum ForeignEnum {
201 FOREIGN_FOO = 4; 202 FOREIGN_FOO = 4;
202 FOREIGN_BAR = 5; 203 FOREIGN_BAR = 5;
203 FOREIGN_BAZ = 6; 204 FOREIGN_BAZ = 6;
204 } 205 }
205 206
206 message TestReservedFields { 207 message TestReservedFields {
207 reserved 2, 15, 9 to 11; 208 reserved 2, 15, 9 to 11;
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 871
871 service TestService { 872 service TestService {
872 rpc Foo(FooRequest) returns (FooResponse); 873 rpc Foo(FooRequest) returns (FooResponse);
873 rpc Bar(BarRequest) returns (BarResponse); 874 rpc Bar(BarRequest) returns (BarResponse);
874 } 875 }
875 876
876 877
877 message BarRequest {} 878 message BarRequest {}
878 message BarResponse {} 879 message BarResponse {}
879 880
881 message TestJsonName {
882 optional int32 field_name1 = 1;
883 optional int32 fieldName2 = 2;
884 optional int32 FieldName3 = 3;
885 optional int32 _field_name4 = 4;
886 optional int32 FIELD_NAME5 = 5;
887 optional int32 field_name6 = 6 [json_name = "@type"];
888 }
889
890 message TestHugeFieldNumbers {
891 optional int32 optional_int32 = 536870000;
892 optional int32 fixed_32 = 536870001;
893 repeated int32 repeated_int32 = 536870002 [packed = false];
894 repeated int32 packed_int32 = 536870003 [packed = true];
895
896 optional ForeignEnum optional_enum = 536870004;
897 optional string optional_string = 536870005;
898 optional bytes optional_bytes = 536870006;
899 optional ForeignMessage optional_message = 536870007;
900
901 optional group OptionalGroup = 536870008 {
902 optional int32 group_a = 536870009;
903 }
904
905 map<string, string> string_string_map = 536870010;
906
907 oneof oneof_field {
908 uint32 oneof_uint32 = 536870011;
909 TestAllTypes oneof_test_all_types = 536870012;
910 string oneof_string = 536870013;
911 bytes oneof_bytes = 536870014;
912 }
913
914 extensions 536860000 to 536869999;
915 }
916
917 extend TestHugeFieldNumbers {
918 optional TestAllTypes test_all_types = 536860000;
919 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698