diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
| commit | e2acd854250b449a3fdeef2ad52402c4c5d78259 (patch) | |
| tree | a08126762b6c76d56fde8ce443f8dff36408b6e0 /objectivec/Tests/GPBWireFormatTests.m | |
| parent | d9dc05e500807a6f0cd10d4637c599acc9a6aecf (diff) | |
| parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
| download | protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.gz protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.bz2 protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.zip | |
Merged master
Diffstat (limited to 'objectivec/Tests/GPBWireFormatTests.m')
| -rw-r--r-- | objectivec/Tests/GPBWireFormatTests.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/objectivec/Tests/GPBWireFormatTests.m b/objectivec/Tests/GPBWireFormatTests.m index fc5c4bda..d722d7b2 100644 --- a/objectivec/Tests/GPBWireFormatTests.m +++ b/objectivec/Tests/GPBWireFormatTests.m @@ -32,7 +32,7 @@ #import "GPBCodedInputStream.h" #import "GPBMessage_PackagePrivate.h" -#import "GPBField_PackagePrivate.h" +#import "GPBUnknownField_PackagePrivate.h" #import "google/protobuf/Unittest.pbobjc.h" #import "google/protobuf/UnittestMset.pbobjc.h" @@ -143,8 +143,8 @@ const int kUnknownTypeId = 1550055; setI:123]; [[message_set getExtension:[TestMessageSetExtension2 messageSetExtension]] setStr:@"foo"]; - GPBField* unknownField = - [[[GPBField alloc] initWithNumber:kUnknownTypeId] autorelease]; + GPBUnknownField* unknownField = + [[[GPBUnknownField alloc] initWithNumber:kUnknownTypeId] autorelease]; [unknownField addLengthDelimited:[NSData dataWithBytes:"bar" length:3]]; GPBUnknownFieldSet* unknownFieldSet = [[[GPBUnknownFieldSet alloc] init] autorelease]; @@ -159,9 +159,9 @@ const int kUnknownTypeId = 1550055; XCTAssertEqual([raw.unknownFields countOfFields], (NSUInteger)0); XCTAssertEqual(raw.itemArray.count, (NSUInteger)3); - XCTAssertEqual([raw.itemArray[0] typeId], + XCTAssertEqual((uint32_t)[raw.itemArray[0] typeId], [TestMessageSetExtension1 messageSetExtension].fieldNumber); - XCTAssertEqual([raw.itemArray[1] typeId], + XCTAssertEqual((uint32_t)[raw.itemArray[1] typeId], [TestMessageSetExtension2 messageSetExtension].fieldNumber); XCTAssertEqual([raw.itemArray[2] typeId], kUnknownTypeId); @@ -227,7 +227,7 @@ const int kUnknownTypeId = 1550055; @"foo"); XCTAssertEqual([messageSet.unknownFields countOfFields], (NSUInteger)1); - GPBField* unknownField = [messageSet.unknownFields getField:kUnknownTypeId]; + GPBUnknownField* unknownField = [messageSet.unknownFields getField:kUnknownTypeId]; XCTAssertNotNil(unknownField); XCTAssertEqual(unknownField.lengthDelimitedList.count, (NSUInteger)1); XCTAssertEqualObjects(unknownField.lengthDelimitedList[0], |