add message set test case

pull/3281/head
Yilun Chong 8 years ago
parent 06c9057cc3
commit 364502102a
  1. 1
      conformance/conformance.proto
  2. 20
      src/google/protobuf/test_messages_proto2.proto

@ -78,6 +78,7 @@ message ConformanceRequest {
// Which format should the testee serialize its message to?
WireFormat requested_output_format = 3;
// should be set to either "proto2" or "proto3"
string message_type = 4;
}

@ -179,6 +179,26 @@ message TestAllTypesProto2 {
optional int32 field__Name16 = 416;
optional int32 field_name17__ = 417;
optional int32 Field_name18__ = 418;
// message_set test case.
message mset_correct {
option message_set_wire_format = true;
extensions 4 to max;
}
message mset_correct_extension1 {
extend mset_correct {
optional mset_correct_extension1 message_set_extension = 1547769;
}
optional string str = 25;
}
message mset_correct_extension2 {
extend mset_correct {
optional mset_correct_extension1 message_set_extension = 4135312;
}
optional int32 i = 9;
}
}
message ForeignMessage {

Loading…
Cancel
Save