Fix bugs in proto3 mode encoding of submessages (#256)

[apps/agl-service-can-low-level.git] / tests / field_size_16 / alltypes.proto

diff --git a/tests/field_size_16/alltypes.proto b/tests/field_size_16/alltypes.proto
index b981760..46ac46a 100644 (file)
--- a/tests/field_size_16/alltypes.proto
+++ b/tests/field_size_16/alltypes.proto
@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message SubMessage {
     required string substuff1 = 1 [default = "1"];
     required int32 substuff2 = 2 [default = 2];
@@ -8,6 +10,24 @@ message EmptyMessage {
 
 }
 
+enum HugeEnum {
+    Negative = -2147483647; /* protoc doesn't accept -2147483648 here */
+    Positive =  2147483647;
+}
+
+message Limits {
+    required int32      int32_min  =  1;
+    required int32      int32_max  =  2;
+    required uint32     uint32_min =  3;
+    required uint32     uint32_max =  4;
+    required int64      int64_min  =  5;
+    required int64      int64_max  =  6;
+    required uint64     uint64_min =  7;
+    required uint64     uint64_max =  8;
+    required HugeEnum   enum_min   =  9;
+    required HugeEnum   enum_max   = 10;
+}
+
 enum MyEnum {
     Zero = 0;
     First = 1;
@@ -37,7 +57,7 @@ message AllTypes {
     required SubMessage req_submsg  = 16;
     required MyEnum     req_enum    = 17;
     required EmptyMessage req_emptymsg = 18;
-    
+    required bytes      req_fbytes  = 19;
     
     repeated int32      rep_int32   = 21;
     repeated int64      rep_int64   = 22;
@@ -60,6 +80,7 @@ message AllTypes {
     repeated SubMessage rep_submsg  = 10036;
     repeated MyEnum     rep_enum    = 10037;
     repeated EmptyMessage rep_emptymsg = 10038;
+    repeated bytes      rep_fbytes  = 10039;
     
     optional int32      opt_int32   = 10041 [default = 4041];
     optional int64      opt_int64   = 10042 [default = 4042];
@@ -82,9 +103,21 @@ message AllTypes {
     optional SubMessage opt_submsg  = 10056;
     optional MyEnum     opt_enum    = 10057 [default = Second];
     optional EmptyMessage opt_emptymsg = 10058;
+    optional bytes      opt_fbytes  = 10059 [default = "4059"];
+
+    oneof oneof
+    {
+        SubMessage oneof_msg1 = 10060;
+        EmptyMessage oneof_msg2 = 10061;
+    }
+
+    // Check that extreme integer values are handled correctly
+    required Limits     req_limits = 98;
 
     // Just to make sure that the size of the fields has been calculated
     // properly, i.e. otherwise a bug in last field might not be detected.
     required int32      end = 10099;
+
+    extensions 200 to 255;
 }