add objec support

06c9057c · Yilun Chong · 5e7e2d3b · 06c9057c
Commit 06c9057c authored Jun 28, 2017 by Yilun Chong
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

conformance_objc.m conformance/conformance_objc.m +14 -6

No files found.
--- a/conformance/conformance_objc.m
+++ b/conformance/conformance_objc.m
@@ -71,12 +71,20 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
      break;
    case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: {
-      NSError *error = nil;
+      if ([request.messageType isEqualToString:@"proto3"]) {
-      testMessage = [TestAllTypes parseFromData:request.protobufPayload
+        NSError *error = nil;
-                                          error:&error];
+        testMessage = [TestAllTypes parseFromData:request.protobufPayload
-      if (!testMessage) {
+                                            error:&error];
-        response.parseError =
+        if (!testMessage) {
-            [NSString stringWithFormat:@"Parse error: %@", error];
+          response.parseError =
+              [NSString stringWithFormat:@"Parse error: %@", error];
+        }
+      } else if ([request.messageType isEqualToString:@"proto2"]) {
+	response.skipped = @"ObjC doesn't support proto2";
+	break;
+      } else {
+	Die(@"Protobuf request doesn't have specific payload type");
+	break;
      }
      break;
    }