ADD: added new version of protobuf

libs/protobuf/objectivec/Tests/GPBUnknownFieldSetTest.m

@@ -30,9 +30,9 @@
 
 #import "GPBTestUtilities.h"
 
-#import "GPBUnknownFieldSet_PackagePrivate.h"
 #import "GPBUnknownField_PackagePrivate.h"
-#import "objectivec/Tests/Unittest.pbobjc.h"
+#import "GPBUnknownFieldSet_PackagePrivate.h"
+#import "google/protobuf/Unittest.pbobjc.h"
 
 @interface GPBUnknownFieldSet (GPBUnknownFieldSetTest)
 - (void)getTags:(int32_t*)tags;
@@ -61,7 +61,7 @@
 }
 
 - (void)testInvalidFieldNumber {
-  GPBUnknownFieldSet* set = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *set = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* field = [[[GPBUnknownField alloc] initWithNumber:0] autorelease];
   XCTAssertThrowsSpecificNamed([set addField:field], NSException, NSInvalidArgumentException);
 }
@@ -69,10 +69,10 @@
 - (void)testEqualityAndHash {
   // Empty
 
-  GPBUnknownFieldSet* set1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *set1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   XCTAssertTrue([set1 isEqual:set1]);
   XCTAssertFalse([set1 isEqual:@"foo"]);
-  GPBUnknownFieldSet* set2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *set2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   XCTAssertEqualObjects(set1, set2);
   XCTAssertEqual([set1 hash], [set2 hash]);
 
@@ -126,11 +126,11 @@
 
   // Group
 
-  GPBUnknownFieldSet* group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup1 = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
   [fieldGroup1 addVarint:1];
   [group1 addField:fieldGroup1];
-  GPBUnknownFieldSet* group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup2 = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
   [fieldGroup2 addVarint:1];
   [group2 addField:fieldGroup2];
@@ -153,9 +153,10 @@
 // numbers as allFieldsData except that each field is some other wire
 // type.
 - (NSData*)getBizarroData {
-  GPBUnknownFieldSet* bizarroFields = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet* bizarroFields =
+      [[[GPBUnknownFieldSet alloc] init] autorelease];
   NSUInteger count = [unknownFields_ countOfFields];
-  int32_t* tags = malloc(count * sizeof(int32_t));
+  int32_t *tags = malloc(count * sizeof(int32_t));
   if (!tags) {
     XCTFail(@"Failed to make scratch buffer for testing");
     return [NSData data];
@@ -167,17 +168,20 @@
       GPBUnknownField* field = [unknownFields_ getField:tag];
       if (field.varintList.count == 0) {
         // Original field is not a varint, so use a varint.
-        GPBUnknownField* varintField = [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
+        GPBUnknownField* varintField =
+            [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
         [varintField addVarint:1];
         [bizarroFields addField:varintField];
       } else {
         // Original field *is* a varint, so use something else.
-        GPBUnknownField* fixed32Field = [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
+        GPBUnknownField* fixed32Field =
+            [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
         [fixed32Field addFixed32:1];
         [bizarroFields addField:fixed32Field];
       }
     }
-  } @finally {
+  }
+  @finally {
     free(tags);
   }
 
@@ -216,7 +220,7 @@
   [field addLengthDelimited:DataFromCStr("data1")];
   [set1 addField:field];
 
-  GPBUnknownFieldSet* group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup1 = [[[GPBUnknownField alloc] initWithNumber:200] autorelease];
   [fieldGroup1 addVarint:100];
   [group1 addField:fieldGroup1];
@@ -242,7 +246,7 @@
   [field addLengthDelimited:DataFromCStr("data2")];
   [set2 addField:field];
 
-  GPBUnknownFieldSet* group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup2 = [[[GPBUnknownField alloc] initWithNumber:201] autorelease];
   [fieldGroup2 addVarint:99];
   [group2 addField:fieldGroup2];
@@ -276,11 +280,11 @@
   [field addLengthDelimited:DataFromCStr("data2")];
   [set3 addField:field];
 
-  GPBUnknownFieldSet* group3a = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group3a = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup3a1 = [[[GPBUnknownField alloc] initWithNumber:200] autorelease];
   [fieldGroup3a1 addVarint:100];
   [group3a addField:fieldGroup3a1];
-  GPBUnknownFieldSet* group3b = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group3b = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup3b2 = [[[GPBUnknownField alloc] initWithNumber:201] autorelease];
   [fieldGroup3b2 addVarint:99];
   [group3b addField:fieldGroup3b2];
@@ -310,7 +314,7 @@
 }
 
 - (void)testClearMessage {
-  TestEmptyMessage* message = [TestEmptyMessage message];
+  TestEmptyMessage *message = [TestEmptyMessage message];
   [message mergeFrom:emptyMessage_];
   [message clear];
   XCTAssertEqual(message.serializedSize, (size_t)0);
@@ -318,8 +322,9 @@
 
 - (void)testParseKnownAndUnknown {
   // Test mixing known and unknown fields when parsing.
-  GPBUnknownFieldSet* fields = [[unknownFields_ copy] autorelease];
-  GPBUnknownField* field = [[[GPBUnknownField alloc] initWithNumber:123456] autorelease];
+  GPBUnknownFieldSet *fields = [[unknownFields_ copy] autorelease];
+  GPBUnknownField *field =
+    [[[GPBUnknownField alloc] initWithNumber:123456] autorelease];
   [field addVarint:654321];
   [fields addField:field];
 
@@ -339,8 +344,10 @@
   // when parsing.
 
   NSData* bizarroData = [self getBizarroData];
-  TestAllTypes* allTypesMessage = [TestAllTypes parseFromData:bizarroData error:NULL];
-  TestEmptyMessage* emptyMessage = [TestEmptyMessage parseFromData:bizarroData error:NULL];
+  TestAllTypes* allTypesMessage =
+      [TestAllTypes parseFromData:bizarroData error:NULL];
+  TestEmptyMessage* emptyMessage =
+      [TestEmptyMessage parseFromData:bizarroData error:NULL];
 
   // All fields should have been interpreted as unknown, so the debug strings
   // should be the same.
@@ -354,7 +361,8 @@
   TestEmptyMessageWithExtensions* message =
       [TestEmptyMessageWithExtensions parseFromData:allFieldsData_ error:NULL];
 
-  XCTAssertEqual(unknownFields_.countOfFields, message.unknownFields.countOfFields);
+  XCTAssertEqual(unknownFields_.countOfFields,
+                 message.unknownFields.countOfFields);
   XCTAssertEqualObjects(allFieldsData_, message.data);
 }
 
@@ -363,9 +371,10 @@
   // when parsing extensions.
 
   NSData* bizarroData = [self getBizarroData];
-  TestAllExtensions* allExtensionsMessage = [TestAllExtensions parseFromData:bizarroData
-                                                                       error:NULL];
-  TestEmptyMessage* emptyMessage = [TestEmptyMessage parseFromData:bizarroData error:NULL];
+  TestAllExtensions* allExtensionsMessage =
+      [TestAllExtensions parseFromData:bizarroData error:NULL];
+  TestEmptyMessage* emptyMessage =
+      [TestEmptyMessage parseFromData:bizarroData error:NULL];
 
   // All fields should have been interpreted as unknown, so the debug strings
   // should be the same.
@@ -456,7 +465,7 @@
 
   // Group
 
-  GPBUnknownFieldSet* group = [[[GPBUnknownFieldSet alloc] init] autorelease];
+  GPBUnknownFieldSet *group = [[[GPBUnknownFieldSet alloc] init] autorelease];
   GPBUnknownField* fieldGroup = [[[GPBUnknownField alloc] initWithNumber:100] autorelease];
   [fieldGroup addVarint:100];
   [group addField:fieldGroup];