Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/objectivec/Tests/GPBDescriptorTests.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 16 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "GPBTestUtilities.h"
 
 #import <objc/runtime.h>
 
 #import "GPBDescriptor.h"
 #import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-#import "google/protobuf/Descriptor.pbobjc.h"
 
 @interface DescriptorTests : GPBTestCase
 @end
 
 @implementation DescriptorTests
 
-- (void)testDescriptor_containingType {
-  GPBDescriptor *testAllTypesDesc = [TestAllTypes descriptor];
-  GPBDescriptor *nestedMessageDesc = [TestAllTypes_NestedMessage descriptor];
-  XCTAssertNil(testAllTypesDesc.containingType);
-  XCTAssertNotNil(nestedMessageDesc.containingType);
-  XCTAssertEqual(nestedMessageDesc.containingType, testAllTypesDesc);  // Ptr comparison
-}
-
-- (void)testDescriptor_fullName {
-  GPBDescriptor *testAllTypesDesc = [TestAllTypes descriptor];
-  XCTAssertEqualObjects(testAllTypesDesc.fullName, @"protobuf_unittest.TestAllTypes");
-  GPBDescriptor *nestedMessageDesc = [TestAllTypes_NestedMessage descriptor];
-  XCTAssertEqualObjects(nestedMessageDesc.fullName, @"protobuf_unittest.TestAllTypes.NestedMessage");
-
-  // Prefixes removed.
-  GPBDescriptor *descDesc = [GPBDescriptorProto descriptor];
-  XCTAssertEqualObjects(descDesc.fullName, @"google.protobuf.DescriptorProto");
-  GPBDescriptor *descExtRngDesc = [GPBDescriptorProto_ExtensionRange descriptor];
-  XCTAssertEqualObjects(descExtRngDesc.fullName, @"google.protobuf.DescriptorProto.ExtensionRange");
-
-  // Things that get "_Class" added.
-  GPBDescriptor *pointDesc = [Point_Class descriptor];
-  XCTAssertEqualObjects(pointDesc.fullName, @"protobuf_unittest.Point");
-  GPBDescriptor *pointRectDesc = [Point_Rect descriptor];
-  XCTAssertEqualObjects(pointRectDesc.fullName, @"protobuf_unittest.Point.Rect");
-}
-
 - (void)testFieldDescriptor {
   GPBDescriptor *descriptor = [TestAllTypes descriptor];
 
   // Nested Enum
   GPBFieldDescriptor *fieldDescriptorWithName =
       [descriptor fieldWithName:@"optionalNestedEnum"];
   XCTAssertNotNil(fieldDescriptorWithName);
   GPBFieldDescriptor *fieldDescriptorWithNumber =
       [descriptor fieldWithNumber:21];
   XCTAssertNotNil(fieldDescriptorWithNumber);
@@ skipping 65 matching lines @@
   XCTAssertTrue(
       [descriptor getValue:&value forEnumName:@"TestAllTypes_NestedEnum_Bar"]);
   XCTAssertEqual(value, TestAllTypes_NestedEnum_Bar);
 
   enumName = [descriptor enumNameForValue:3];
   XCTAssertNotNil(enumName);
   XCTAssertTrue(
       [descriptor getValue:&value forEnumName:@"TestAllTypes_NestedEnum_Baz"]);
   XCTAssertEqual(value, TestAllTypes_NestedEnum_Baz);
 
-  // TextFormat
-  enumName = [descriptor textFormatNameForValue:1];
-  XCTAssertNotNil(enumName);
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:@"FOO"]);
-  XCTAssertEqual(value, TestAllTypes_NestedEnum_Foo);
-
   // Bad values
   enumName = [descriptor enumNameForValue:0];
   XCTAssertNil(enumName);
   XCTAssertFalse([descriptor getValue:&value forEnumName:@"Unknown"]);
   XCTAssertFalse([descriptor getValue:NULL forEnumName:@"Unknown"]);
   XCTAssertFalse([descriptor getValue:&value
                           forEnumName:@"TestAllTypes_NestedEnum_Unknown"]);
   XCTAssertFalse([descriptor getValue:NULL
                           forEnumName:@"TestAllTypes_NestedEnum_Unknown"]);
-  XCTAssertFalse([descriptor getValue:NULL forEnumTextFormatName:@"Unknown"]);
-  XCTAssertFalse([descriptor getValue:&value forEnumTextFormatName:@"Unknown"]);
 }
 
 - (void)testEnumValueValidator {
   GPBDescriptor *descriptor = [TestAllTypes descriptor];
   GPBFieldDescriptor *fieldDescriptor =
       [descriptor fieldWithName:@"optionalNestedEnum"];
 
   // Valid values
   XCTAssertTrue([fieldDescriptor isValidEnumValue:1]);
   XCTAssertTrue([fieldDescriptor isValidEnumValue:2]);
@@ skipping 63 matching lines @@
   // (pointer comparisions)
   XCTAssertEqual(fooStringField.containingOneof, oneofFoo);
   XCTAssertEqual(barStringField.containingOneof, oneofBar);
   GPBFieldDescriptor *bazString =
       [descriptor fieldWithNumber:TestOneof2_FieldNumber_BazString];
   XCTAssertNotNil(bazString);
   XCTAssertNil(bazString.containingOneof);
 }
 
 @end