[ObjC] Support MessageSet with `GPBUnknownFields`.
Update the initialization from a message to deal with the current differences.
Update some tests to cover the usage.
PiperOrigin-RevId: 652892603
diff --git a/objectivec/GPBUnknownFields.m b/objectivec/GPBUnknownFields.m
index e24e07b..f3073ad 100644
--- a/objectivec/GPBUnknownFields.m
+++ b/objectivec/GPBUnknownFields.m
@@ -12,6 +12,7 @@
#import "GPBCodedInputStream_PackagePrivate.h"
#import "GPBCodedOutputStream.h"
#import "GPBCodedOutputStream_PackagePrivate.h"
+#import "GPBDescriptor.h"
#import "GPBMessage.h"
#import "GPBUnknownField.h"
#import "GPBUnknownFieldSet_PackagePrivate.h"
@@ -199,8 +200,19 @@
// updated.
GPBUnknownFieldSet *legacyUnknownFields = [message unknownFields];
if (legacyUnknownFields) {
- GPBCodedInputStream *input =
- [[GPBCodedInputStream alloc] initWithData:[legacyUnknownFields data]];
+ NSData *data;
+ if (message.descriptor.isWireFormat) {
+ NSMutableData *mutableData =
+ [NSMutableData dataWithLength:legacyUnknownFields.serializedSizeAsMessageSet];
+ GPBCodedOutputStream *output = [[GPBCodedOutputStream alloc] initWithData:mutableData];
+ [legacyUnknownFields writeAsMessageSetTo:output];
+ [output flush];
+ [output release];
+ data = mutableData;
+ } else {
+ data = [legacyUnknownFields data];
+ }
+ GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
// Parse until the end of the data (tag will be zero).
if (!MergeFromInputStream(self, input, 0)) {
[input release];
diff --git a/objectivec/Tests/GPBWireFormatTests.m b/objectivec/Tests/GPBWireFormatTests.m
index 95b915c..3d32112 100644
--- a/objectivec/Tests/GPBWireFormatTests.m
+++ b/objectivec/Tests/GPBWireFormatTests.m
@@ -11,6 +11,7 @@
#import "GPBUnknownField.h"
#import "GPBUnknownField_PackagePrivate.h"
#import "GPBUnknownFields.h"
+#import "GPBWireFormat.h"
#import "objectivec/Tests/Unittest.pbobjc.h"
#import "objectivec/Tests/UnittestMset.pbobjc.h"
@@ -111,32 +112,43 @@
}
const int kUnknownTypeId = 1550055;
+const int kUnknownTypeId2 = 1550056;
- (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"];
+
GPBUnknownField* unknownField =
[[[GPBUnknownField alloc] initWithNumber:kUnknownTypeId] autorelease];
- [unknownField addLengthDelimited:[NSData dataWithBytes:"bar" length:3]];
+ [unknownField addLengthDelimited:DataFromCStr("bar")];
GPBUnknownFieldSet* unknownFieldSet = [[[GPBUnknownFieldSet alloc] init] autorelease];
[unknownFieldSet addField:unknownField];
[message_set setUnknownFields:unknownFieldSet];
+ GPBUnknownFields* ufs = [[[GPBUnknownFields alloc] init] autorelease];
+ GPBUnknownFields* group = [ufs addGroupWithFieldNumber:GPBWireFormatMessageSetItem];
+ [group addFieldNumber:GPBWireFormatMessageSetTypeId varint:kUnknownTypeId2];
+ [group addFieldNumber:GPBWireFormatMessageSetMessage lengthDelimited:DataFromCStr("baz")];
+ [message_set mergeUnknownFields:ufs extensionRegistry:[MSetUnittestMsetRoot extensionRegistry]];
+
NSData* data = [message_set data];
// Parse back using MSetRawMessageSet and check the contents.
MSetRawMessageSet* raw = [MSetRawMessageSet parseFromData:data error:NULL];
+ GPBUnknownFields* ufs2 = [[[GPBUnknownFields alloc] initFromMessage:raw] autorelease];
+ XCTAssertTrue(ufs2.empty);
XCTAssertEqual([raw.unknownFields countOfFields], (NSUInteger)0);
- XCTAssertEqual(raw.itemArray.count, (NSUInteger)3);
+ XCTAssertEqual(raw.itemArray.count, (NSUInteger)4);
XCTAssertEqual((uint32_t)[raw.itemArray[0] typeId],
[MSetMessageExtension1 messageSetExtension].fieldNumber);
XCTAssertEqual((uint32_t)[raw.itemArray[1] typeId],
[MSetMessageExtension2 messageSetExtension].fieldNumber);
XCTAssertEqual([raw.itemArray[2] typeId], kUnknownTypeId);
+ XCTAssertEqual([raw.itemArray[3] typeId], kUnknownTypeId2);
MSetMessageExtension1* message1 =
[MSetMessageExtension1 parseFromData:[((MSetRawMessageSet_Item*)raw.itemArray[0]) message]
@@ -148,7 +160,8 @@
error:NULL];
XCTAssertEqualObjects(message2.str, @"foo");
- XCTAssertEqualObjects([raw.itemArray[2] message], [NSData dataWithBytes:"bar" length:3]);
+ XCTAssertEqualObjects([raw.itemArray[2] message], DataFromCStr("bar"));
+ XCTAssertEqualObjects([raw.itemArray[3] message], DataFromCStr("baz"));
}
- (void)testParseMessageSet {
@@ -176,7 +189,7 @@
{
MSetRawMessageSet_Item* item = [MSetRawMessageSet_Item message];
item.typeId = kUnknownTypeId;
- item.message = [NSData dataWithBytes:"bar" length:3];
+ item.message = DataFromCStr("bar");
[raw.itemArray addObject:item];
}
@@ -191,11 +204,22 @@
XCTAssertEqualObjects([[messageSet getExtension:[MSetMessageExtension2 messageSetExtension]] str],
@"foo");
+ GPBUnknownFields* ufs = [[[GPBUnknownFields alloc] initFromMessage:messageSet] autorelease];
+ XCTAssertEqual(ufs.count, (NSUInteger)1);
+ GPBUnknownFields* group = [ufs firstGroup:GPBWireFormatMessageSetItem];
+ XCTAssertNotNil(group);
+ XCTAssertEqual(group.count, (NSUInteger)2);
+ uint64_t varint = 0;
+ XCTAssertTrue([group getFirst:GPBWireFormatMessageSetTypeId varint:&varint]);
+ XCTAssertEqual(varint, kUnknownTypeId);
+ XCTAssertEqualObjects([group firstLengthDelimited:GPBWireFormatMessageSetMessage],
+ DataFromCStr("bar"));
+
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], DataFromCStr("bar"));
}
- (void)testParseMessageSet_FirstValueSticks {
