From 06c9057cc32f0155f277dd0842f83b5ac362c386 Mon Sep 17 00:00:00 2001
From: Yilun Chong <yilunchong@google.com>
Date: Wed, 28 Jun 2017 12:17:24 -0700
Subject: add objec support

---
 conformance/conformance_objc.m | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'conformance')

diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m
index ef037f84..db3cc3e7 100644
--- 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;
-      testMessage = [TestAllTypes parseFromData:request.protobufPayload
-                                          error:&error];
-      if (!testMessage) {
-        response.parseError =
-            [NSString stringWithFormat:@"Parse error: %@", error];
+      if ([request.messageType isEqualToString:@"proto3"]) {
+        NSError *error = nil;
+        testMessage = [TestAllTypes parseFromData:request.protobufPayload
+                                            error:&error];
+        if (!testMessage) {
+          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;
     }
-- 
cgit v1.2.3