diff options
author | Yilun Chong <chongyilun250@sina.com> | 2017-07-24 14:50:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-24 14:50:52 -0700 |
commit | a713b73076f1d90bdc39ea8805b50421a59d7986 (patch) | |
tree | cea38fdfe5c1d93b6291e96332961b2c3bf5439f /conformance/conformance_objc.m | |
parent | f15185d370a5789c65105f77ba806c9faa563325 (diff) | |
parent | bceb830c396e3370d4cc15e0d4f96ed1819dcca9 (diff) |
Merge pull request #3281 from BSBandme/ConformanceTestYilunChong
Proto2 test message support to conformance test
Diffstat (limited to 'conformance/conformance_objc.m')
-rw-r--r-- | conformance/conformance_objc.m | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m index ef037f84..ba1c946f 100644 --- a/conformance/conformance_objc.m +++ b/conformance/conformance_objc.m @@ -63,7 +63,7 @@ static NSData *CheckedReadDataOfLength(NSFileHandle *handle, NSUInteger numBytes static ConformanceResponse *DoTest(ConformanceRequest *request) { ConformanceResponse *response = [ConformanceResponse message]; - TestAllTypes *testMessage = nil; + TestAllTypesProto3 *testMessage = nil; switch (request.payloadOneOfCase) { case ConformanceRequest_Payload_OneOfCase_GPBUnsetOneOfCase: @@ -71,12 +71,20 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) { break; case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: { - NSError *error = nil; - testMessage = [TestAllTypes parseFromData:request.protobufPayload - error:&error]; - if (!testMessage) { - response.parseError = - [NSString stringWithFormat:@"Parse error: %@", error]; + if ([request.messageType isEqualToString:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) { + NSError *error = nil; + testMessage = [TestAllTypesProto3 parseFromData:request.protobufPayload + error:&error]; + if (!testMessage) { + response.parseError = + [NSString stringWithFormat:@"Parse error: %@", error]; + } + } else if ([request.messageType isEqualToString:@"protobuf_test_messages.proto2.TestAllTypesProto2"]) { + response.skipped = @"ObjC doesn't support proto2"; + break; + } else { + Die(@"Protobuf request doesn't have specific payload type"); + break; } break; } |