diff options
| author |  Yilun Chong <yilunchong@google.com> | 2017-06-30 17:22:32 -0700 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2017-06-30 17:22:32 -0700 |
| commit | 3adb054bbfa83530ca5a5fd54a856755fd72af83 (patch) | |
| tree | 4d09a00969cdc7833dca181d6910b79f5ac877ae /conformance/conformance_objc.m | |
| parent | a7d5be6a910caabc4b26d73bc5c369dbc638c4c3 (diff) | |
add some test proto2 supported, add js proto2 supported, fixed some error
Diffstat (limited to 'conformance/conformance_objc.m')
| -rw-r--r-- | conformance/conformance_objc.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m index 8bf1d4b8..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,9 +71,9 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) { break; case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: { - if ([request.messageType isEqualToString:@"protobuf_test_messages.proto3.TestAllTypes"]) { + if ([request.messageType isEqualToString:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) { NSError *error = nil; - testMessage = [TestAllTypes parseFromData:request.protobufPayload + testMessage = [TestAllTypesProto3 parseFromData:request.protobufPayload error:&error]; if (!testMessage) { response.parseError = |