ADD: added new version of protobuf
This commit is contained in:
@@ -33,8 +33,9 @@
|
||||
#import "GPBCodedInputStream.h"
|
||||
#import "GPBMessage_PackagePrivate.h"
|
||||
#import "GPBUnknownField_PackagePrivate.h"
|
||||
#import "objectivec/Tests/Unittest.pbobjc.h"
|
||||
#import "objectivec/Tests/UnittestMset.pbobjc.h"
|
||||
#import "google/protobuf/Unittest.pbobjc.h"
|
||||
#import "google/protobuf/UnittestMset.pbobjc.h"
|
||||
#import "google/protobuf/UnittestMsetWireFormat.pbobjc.h"
|
||||
|
||||
@interface WireFormatTests : GPBTestCase
|
||||
@end
|
||||
@@ -54,13 +55,15 @@
|
||||
}
|
||||
|
||||
- (void)testSerializationPacked {
|
||||
TestPackedTypes* message = [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
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];
|
||||
TestPackedTypes* message2 =
|
||||
[TestPackedTypes parseFromData:rawBytes error:NULL];
|
||||
|
||||
[self assertPackedFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
|
||||
}
|
||||
@@ -70,7 +73,8 @@
|
||||
// so if we serealize a TestAllExtensions then parse it as TestAllTypes
|
||||
// it should work.
|
||||
|
||||
TestAllExtensions* message = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
TestAllExtensions* message =
|
||||
[self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
NSData* rawBytes = message.data;
|
||||
[self assertFieldsInOrder:rawBytes];
|
||||
XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
|
||||
@@ -83,11 +87,13 @@
|
||||
- (void)testSerializePackedExtensions {
|
||||
// TestPackedTypes and TestPackedExtensions should have compatible wire
|
||||
// formats; check that they serialize to the same string.
|
||||
TestPackedExtensions* message = [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
TestPackedExtensions* message =
|
||||
[self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
NSData* rawBytes = message.data;
|
||||
[self assertFieldsInOrder:rawBytes];
|
||||
|
||||
TestPackedTypes* message2 = [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
TestPackedTypes* message2 =
|
||||
[self packedSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
NSData* rawBytes2 = message2.data;
|
||||
|
||||
XCTAssertEqualObjects(rawBytes, rawBytes2);
|
||||
@@ -111,6 +117,7 @@
|
||||
[self assertAllExtensionsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
|
||||
}
|
||||
|
||||
|
||||
- (void)testExtensionsSerializedSize {
|
||||
size_t allSet = [self allSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
|
||||
size_t extensionSet = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
|
||||
@@ -119,7 +126,8 @@
|
||||
|
||||
- (void)testParsePackedExtensions {
|
||||
// Ensure that packed extensions can be properly parsed.
|
||||
TestPackedExtensions* message = [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
TestPackedExtensions* message =
|
||||
[self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
|
||||
NSData* rawBytes = message.data;
|
||||
[self assertFieldsInOrder:rawBytes];
|
||||
|
||||
@@ -129,74 +137,79 @@
|
||||
extensionRegistry:registry
|
||||
error:NULL];
|
||||
|
||||
[self assertPackedExtensionsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
|
||||
[self assertPackedExtensionsSet:message2
|
||||
repeatedCount:kGPBDefaultRepeatCount];
|
||||
}
|
||||
|
||||
const int kUnknownTypeId = 1550055;
|
||||
|
||||
- (void)testSerializeMessageSet {
|
||||
// Set up a MSetMessage with two known messages and an unknown one.
|
||||
MSetMessage* message_set = [MSetMessage message];
|
||||
[[message_set getExtension:[MSetMessageExtension1 messageSetExtension]] setI:123];
|
||||
[[message_set getExtension:[MSetMessageExtension2 messageSetExtension]] setStr:@"foo"];
|
||||
// Set up a TestMessageSet with two known messages and an unknown one.
|
||||
TestMessageSet* message_set = [TestMessageSet message];
|
||||
[[message_set getExtension:[TestMessageSetExtension1 messageSetExtension]]
|
||||
setI:123];
|
||||
[[message_set getExtension:[TestMessageSetExtension2 messageSetExtension]]
|
||||
setStr:@"foo"];
|
||||
GPBUnknownField* unknownField =
|
||||
[[[GPBUnknownField alloc] initWithNumber:kUnknownTypeId] autorelease];
|
||||
[unknownField addLengthDelimited:[NSData dataWithBytes:"bar" length:3]];
|
||||
GPBUnknownFieldSet* unknownFieldSet = [[[GPBUnknownFieldSet alloc] init] autorelease];
|
||||
GPBUnknownFieldSet* unknownFieldSet =
|
||||
[[[GPBUnknownFieldSet alloc] init] autorelease];
|
||||
[unknownFieldSet addField:unknownField];
|
||||
[message_set setUnknownFields:unknownFieldSet];
|
||||
|
||||
NSData* data = [message_set data];
|
||||
|
||||
// Parse back using MSetRawMessageSet and check the contents.
|
||||
MSetRawMessageSet* raw = [MSetRawMessageSet parseFromData:data error:NULL];
|
||||
// Parse back using RawMessageSet and check the contents.
|
||||
RawMessageSet* raw = [RawMessageSet parseFromData:data error:NULL];
|
||||
|
||||
XCTAssertEqual([raw.unknownFields countOfFields], (NSUInteger)0);
|
||||
|
||||
XCTAssertEqual(raw.itemArray.count, (NSUInteger)3);
|
||||
XCTAssertEqual((uint32_t)[raw.itemArray[0] typeId],
|
||||
[MSetMessageExtension1 messageSetExtension].fieldNumber);
|
||||
[TestMessageSetExtension1 messageSetExtension].fieldNumber);
|
||||
XCTAssertEqual((uint32_t)[raw.itemArray[1] typeId],
|
||||
[MSetMessageExtension2 messageSetExtension].fieldNumber);
|
||||
[TestMessageSetExtension2 messageSetExtension].fieldNumber);
|
||||
XCTAssertEqual([raw.itemArray[2] typeId], kUnknownTypeId);
|
||||
|
||||
MSetMessageExtension1* message1 =
|
||||
[MSetMessageExtension1 parseFromData:[((MSetRawMessageSet_Item*)raw.itemArray[0]) message]
|
||||
error:NULL];
|
||||
TestMessageSetExtension1* message1 =
|
||||
[TestMessageSetExtension1 parseFromData:[((RawMessageSet_Item*)raw.itemArray[0]) message]
|
||||
error:NULL];
|
||||
XCTAssertEqual(message1.i, 123);
|
||||
|
||||
MSetMessageExtension2* message2 =
|
||||
[MSetMessageExtension2 parseFromData:[((MSetRawMessageSet_Item*)raw.itemArray[1]) message]
|
||||
error:NULL];
|
||||
TestMessageSetExtension2* message2 =
|
||||
[TestMessageSetExtension2 parseFromData:[((RawMessageSet_Item*)raw.itemArray[1]) message]
|
||||
error:NULL];
|
||||
XCTAssertEqualObjects(message2.str, @"foo");
|
||||
|
||||
XCTAssertEqualObjects([raw.itemArray[2] message], [NSData dataWithBytes:"bar" length:3]);
|
||||
XCTAssertEqualObjects([raw.itemArray[2] message],
|
||||
[NSData dataWithBytes:"bar" length:3]);
|
||||
}
|
||||
|
||||
- (void)testParseMessageSet {
|
||||
// Set up a MSetRawMessageSet with two known messages and an unknown one.
|
||||
MSetRawMessageSet* raw = [MSetRawMessageSet message];
|
||||
// Set up a RawMessageSet with two known messages and an unknown one.
|
||||
RawMessageSet* raw = [RawMessageSet message];
|
||||
|
||||
{
|
||||
MSetRawMessageSet_Item* item = [MSetRawMessageSet_Item message];
|
||||
item.typeId = [MSetMessageExtension1 messageSetExtension].fieldNumber;
|
||||
MSetMessageExtension1* message = [MSetMessageExtension1 message];
|
||||
RawMessageSet_Item* item = [RawMessageSet_Item message];
|
||||
item.typeId = [TestMessageSetExtension1 messageSetExtension].fieldNumber;
|
||||
TestMessageSetExtension1* message = [TestMessageSetExtension1 message];
|
||||
message.i = 123;
|
||||
item.message = [message data];
|
||||
[raw.itemArray addObject:item];
|
||||
}
|
||||
|
||||
{
|
||||
MSetRawMessageSet_Item* item = [MSetRawMessageSet_Item message];
|
||||
item.typeId = [MSetMessageExtension2 messageSetExtension].fieldNumber;
|
||||
MSetMessageExtension2* message = [MSetMessageExtension2 message];
|
||||
RawMessageSet_Item* item = [RawMessageSet_Item message];
|
||||
item.typeId = [TestMessageSetExtension2 messageSetExtension].fieldNumber;
|
||||
TestMessageSetExtension2* message = [TestMessageSetExtension2 message];
|
||||
message.str = @"foo";
|
||||
item.message = [message data];
|
||||
[raw.itemArray addObject:item];
|
||||
}
|
||||
|
||||
{
|
||||
MSetRawMessageSet_Item* item = [MSetRawMessageSet_Item message];
|
||||
RawMessageSet_Item* item = [RawMessageSet_Item message];
|
||||
item.typeId = kUnknownTypeId;
|
||||
item.message = [NSData dataWithBytes:"bar" length:3];
|
||||
[raw.itemArray addObject:item];
|
||||
@@ -204,20 +217,27 @@ const int kUnknownTypeId = 1550055;
|
||||
|
||||
NSData* data = [raw data];
|
||||
|
||||
// Parse as a MSetMessage and check the contents.
|
||||
MSetMessage* messageSet = [MSetMessage parseFromData:data
|
||||
extensionRegistry:[MSetUnittestMsetRoot extensionRegistry]
|
||||
error:NULL];
|
||||
// Parse as a TestMessageSet and check the contents.
|
||||
TestMessageSet* messageSet =
|
||||
[TestMessageSet parseFromData:data
|
||||
extensionRegistry:[UnittestMsetRoot extensionRegistry]
|
||||
error:NULL];
|
||||
|
||||
XCTAssertEqual([[messageSet getExtension:[MSetMessageExtension1 messageSetExtension]] i], 123);
|
||||
XCTAssertEqualObjects([[messageSet getExtension:[MSetMessageExtension2 messageSetExtension]] str],
|
||||
@"foo");
|
||||
XCTAssertEqual(
|
||||
[[messageSet
|
||||
getExtension:[TestMessageSetExtension1 messageSetExtension]] i],
|
||||
123);
|
||||
XCTAssertEqualObjects(
|
||||
[[messageSet
|
||||
getExtension:[TestMessageSetExtension2 messageSetExtension]] str],
|
||||
@"foo");
|
||||
|
||||
XCTAssertEqual([messageSet.unknownFields countOfFields], (NSUInteger)1);
|
||||
GPBUnknownField* unknownField = [messageSet.unknownFields getField:kUnknownTypeId];
|
||||
XCTAssertNotNil(unknownField);
|
||||
XCTAssertEqual(unknownField.lengthDelimitedList.count, (NSUInteger)1);
|
||||
XCTAssertEqualObjects(unknownField.lengthDelimitedList[0], [NSData dataWithBytes:"bar" length:3]);
|
||||
XCTAssertEqualObjects(unknownField.lengthDelimitedList[0],
|
||||
[NSData dataWithBytes:"bar" length:3]);
|
||||
}
|
||||
|
||||
- (void)assertFieldsInOrder:(NSData*)data {
|
||||
|
||||
Reference in New Issue
Block a user