Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/objectivec/Tests/GPBWireFormatTests.m

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 28 matching lines @@
 
 @interface WireFormatTests : GPBTestCase
 @end
 
 @implementation WireFormatTests
 
 - (void)testSerialization {
   TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
 
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
   XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
 
   TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL];
 
   [self assertAllFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
 }
 
 - (void)testSerializationPacked {
   TestPackedTypes* message =
       [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
 
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
   XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
 
   TestPackedTypes* message2 =
       [TestPackedTypes parseFromData:rawBytes error:NULL];
 
   [self assertPackedFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
 }
 
 - (void)testSerializeExtensions {
   // TestAllTypes and TestAllExtensions should have compatible wire formats,
   // so if we serealize a TestAllExtensions then parse it as TestAllTypes
   // it should work.
 
   TestAllExtensions* message =
       [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
   XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
 
   TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL];
 
   [self assertAllFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
 }
 
 - (void)testSerializePackedExtensions {
   // TestPackedTypes and TestPackedExtensions should have compatible wire
   // formats; check that they serialize to the same string.
   TestPackedExtensions* message =
       [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
 
   TestPackedTypes* message2 =
       [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
   NSData* rawBytes2 = message2.data;
 
   XCTAssertEqualObjects(rawBytes, rawBytes2);
 }
 
 - (void)testParseExtensions {
   // TestAllTypes and TestAllExtensions should have compatible wire formats,
   // so if we serialize a TestAllTypes then parse it as TestAllExtensions
   // it should work.
 
   TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
 
   GPBExtensionRegistry* registry = [self extensionRegistry];
 
   TestAllExtensions* message2 = [TestAllExtensions parseFromData:rawBytes
                                                extensionRegistry:registry
                                                            error:NULL];
 
   [self assertAllExtensionsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
 }
 
 
-- (void)testExtensionsSerializedSize {
+- (void) testExtensionsSerializedSize {
   size_t allSet = [self allSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
   size_t extensionSet = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
   XCTAssertEqual(allSet, extensionSet);
 }
 
 - (void)testParsePackedExtensions {
   // Ensure that packed extensions can be properly parsed.
   TestPackedExtensions* message =
       [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
   NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
 
   GPBExtensionRegistry* registry = [self extensionRegistry];
 
   TestPackedExtensions* message2 = [TestPackedExtensions parseFromData:rawBytes
                                                      extensionRegistry:registry
                                                                  error:NULL];
 
   [self assertPackedExtensionsSet:message2
                     repeatedCount:kGPBDefaultRepeatCount];
 }
@@ skipping 106 matching lines @@
     if (tag == 0) {
       break;
     }
 
     XCTAssertGreaterThan(tag, previousTag);
     [input skipField:tag];
   }
 }
 
 @end