ADD: added new version of protobuf
This commit is contained in:
Henry Winkel
@@ -34,12 +34,12 @@
|
||||
|
||||
#import "GPBMessage.h"
|
||||
|
||||
#import "objectivec/Tests/MapUnittest.pbobjc.h"
|
||||
#import "objectivec/Tests/Unittest.pbobjc.h"
|
||||
#import "objectivec/Tests/UnittestCycle.pbobjc.h"
|
||||
#import "objectivec/Tests/UnittestObjcStartup.pbobjc.h"
|
||||
#import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
|
||||
#import "objectivec/Tests/UnittestRuntimeProto3.pbobjc.h"
|
||||
#import "google/protobuf/MapUnittest.pbobjc.h"
|
||||
#import "google/protobuf/Unittest.pbobjc.h"
|
||||
#import "google/protobuf/UnittestCycle.pbobjc.h"
|
||||
#import "google/protobuf/UnittestObjcStartup.pbobjc.h"
|
||||
#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
|
||||
#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
|
||||
|
||||
@interface MessageRuntimeTests : GPBTestCase
|
||||
@end
|
||||
@@ -98,10 +98,14 @@
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:setHasSel], @"field: %@",
|
||||
name);
|
||||
}
|
||||
|
||||
// Repeated fields
|
||||
@@ -110,24 +114,33 @@
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasRepeatedInt32Array/setHasRepeatedInt32Array:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasRepeated%@Array", name]);
|
||||
SEL setHasSel =
|
||||
NSSelectorFromString([NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasRepeated%@Array", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
// build the selector, i.e. - repeatedInt32Array_Count
|
||||
SEL countSel = NSSelectorFromString([NSString stringWithFormat:@"repeated%@Array_Count", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@", name);
|
||||
SEL countSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"repeated%@Array_Count", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@",
|
||||
name);
|
||||
}
|
||||
|
||||
// OneOf fields - no has*/setHas*
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOneof%@:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel =
|
||||
NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasOneof%@:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
}
|
||||
|
||||
// map<> fields
|
||||
@@ -135,23 +148,44 @@
|
||||
// - *Count
|
||||
|
||||
NSArray *mapNames = @[
|
||||
@"Int32Int32", @"Int64Int64", @"Uint32Uint32", @"Uint64Uint64",
|
||||
@"Sint32Sint32", @"Sint64Sint64", @"Fixed32Fixed32", @"Fixed64Fixed64",
|
||||
@"Sfixed32Sfixed32", @"Sfixed64Sfixed64", @"Int32Float", @"Int32Double",
|
||||
@"BoolBool", @"StringString", @"StringBytes", @"StringMessage",
|
||||
@"Int32Bytes", @"Int32Enum", @"Int32Message",
|
||||
@"Int32Int32",
|
||||
@"Int64Int64",
|
||||
@"Uint32Uint32",
|
||||
@"Uint64Uint64",
|
||||
@"Sint32Sint32",
|
||||
@"Sint64Sint64",
|
||||
@"Fixed32Fixed32",
|
||||
@"Fixed64Fixed64",
|
||||
@"Sfixed32Sfixed32",
|
||||
@"Sfixed64Sfixed64",
|
||||
@"Int32Float",
|
||||
@"Int32Double",
|
||||
@"BoolBool",
|
||||
@"StringString",
|
||||
@"StringBytes",
|
||||
@"StringMessage",
|
||||
@"Int32Bytes",
|
||||
@"Int32Enum",
|
||||
@"Int32Message",
|
||||
];
|
||||
|
||||
for (NSString *name in mapNames) {
|
||||
// build the selector, i.e. - hasMapInt32Int32/setHasMapInt32Int32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasMap%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasMap%@:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasMap%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasMap%@:", name]);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
// build the selector, i.e. - mapInt32Int32Count
|
||||
SEL countSel = NSSelectorFromString([NSString stringWithFormat:@"map%@_Count", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@", name);
|
||||
SEL countSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"map%@_Count", name]);
|
||||
XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@",
|
||||
name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
- (void)testProto3HasMethodSupport {
|
||||
@@ -183,15 +217,21 @@
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
if ([name isEqual:@"Message"]) {
|
||||
// Sub messages/groups are the exception.
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
} else {
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,24 +241,33 @@
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasRepeatedInt32Array/setHasRepeatedInt32Array:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasRepeated%@Array", name]);
|
||||
SEL setHasSel =
|
||||
NSSelectorFromString([NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasRepeated%@Array", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
// build the selector, i.e. - repeatedInt32Array_Count
|
||||
SEL countSel = NSSelectorFromString([NSString stringWithFormat:@"repeated%@Array_Count", name]);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@", name);
|
||||
SEL countSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"repeated%@Array_Count", name]);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@",
|
||||
name);
|
||||
}
|
||||
|
||||
// OneOf fields - no has*/setHas*
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOneof%@:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel =
|
||||
NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasOneof%@:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
}
|
||||
|
||||
// Single Optional fields
|
||||
@@ -228,10 +277,14 @@
|
||||
|
||||
for (NSString *name in names) {
|
||||
// build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
XCTAssertTrue([Message3Optional instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertTrue([Message3Optional instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasOptional%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasOptional%@:", name]);
|
||||
XCTAssertTrue([Message3Optional instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertTrue([Message3Optional instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
}
|
||||
|
||||
// map<> fields
|
||||
@@ -239,22 +292,42 @@
|
||||
// - *Count
|
||||
|
||||
NSArray *mapNames = @[
|
||||
@"Int32Int32", @"Int64Int64", @"Uint32Uint32", @"Uint64Uint64",
|
||||
@"Sint32Sint32", @"Sint64Sint64", @"Fixed32Fixed32", @"Fixed64Fixed64",
|
||||
@"Sfixed32Sfixed32", @"Sfixed64Sfixed64", @"Int32Float", @"Int32Double",
|
||||
@"BoolBool", @"StringString", @"StringBytes", @"StringMessage",
|
||||
@"Int32Bytes", @"Int32Enum", @"Int32Message",
|
||||
@"Int32Int32",
|
||||
@"Int64Int64",
|
||||
@"Uint32Uint32",
|
||||
@"Uint64Uint64",
|
||||
@"Sint32Sint32",
|
||||
@"Sint64Sint64",
|
||||
@"Fixed32Fixed32",
|
||||
@"Fixed64Fixed64",
|
||||
@"Sfixed32Sfixed32",
|
||||
@"Sfixed64Sfixed64",
|
||||
@"Int32Float",
|
||||
@"Int32Double",
|
||||
@"BoolBool",
|
||||
@"StringString",
|
||||
@"StringBytes",
|
||||
@"StringMessage",
|
||||
@"Int32Bytes",
|
||||
@"Int32Enum",
|
||||
@"Int32Message",
|
||||
];
|
||||
|
||||
for (NSString *name in mapNames) {
|
||||
// build the selector, i.e. - hasMapInt32Int32/setHasMapInt32Int32:
|
||||
SEL hasSel = NSSelectorFromString([NSString stringWithFormat:@"hasMap%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString([NSString stringWithFormat:@"setHasMap%@:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@", name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel], @"field: %@", name);
|
||||
SEL hasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"hasMap%@", name]);
|
||||
SEL setHasSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"setHasMap%@:", name]);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
|
||||
name);
|
||||
XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
|
||||
@"field: %@", name);
|
||||
// build the selector, i.e. - mapInt32Int32Count
|
||||
SEL countSel = NSSelectorFromString([NSString stringWithFormat:@"map%@_Count", name]);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@", name);
|
||||
SEL countSel = NSSelectorFromString(
|
||||
[NSString stringWithFormat:@"map%@_Count", name]);
|
||||
XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@",
|
||||
name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,9 +337,6 @@
|
||||
// being true.
|
||||
//
|
||||
|
||||
// Disable clang-format for the macros.
|
||||
// clang-format off
|
||||
|
||||
//%PDDM-DEFINE PROTO2_TEST_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
|
||||
//% { // optional##FIELD :: NON_ZERO_VALUE
|
||||
//% Message2 *msg = [[Message2 alloc] init];
|
||||
@@ -329,6 +399,7 @@
|
||||
//%PROTO2_TEST_CLEAR_FIELD_WITH_NIL(Message, [Message2 message])
|
||||
//%PDDM-EXPAND PROTO2_TEST_HAS_FIELDS()
|
||||
// This block of code is generated, do not edit it directly.
|
||||
// clang-format off
|
||||
|
||||
{ // optionalInt32 :: 1
|
||||
Message2 *msg = [[Message2 alloc] init];
|
||||
@@ -682,9 +753,8 @@
|
||||
[msg release];
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
//%PDDM-EXPAND-END PROTO2_TEST_HAS_FIELDS()
|
||||
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
- (void)testProto3SingleFieldHasBehavior {
|
||||
@@ -693,9 +763,6 @@
|
||||
// being true. When set to the default, shouldn't be true.
|
||||
//
|
||||
|
||||
// Disable clang-format for the macros.
|
||||
// clang-format off
|
||||
|
||||
//%PDDM-DEFINE PROTO3_TEST_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
|
||||
//% { // optional##FIELD
|
||||
//% Message3 *msg = [[Message3 alloc] init];
|
||||
@@ -748,6 +815,7 @@
|
||||
//%PROTO3_TEST_CLEAR_FIELD_WITH_NIL(Message, [Message3 message])
|
||||
//%PDDM-EXPAND PROTO3_TEST_HAS_FIELDS()
|
||||
// This block of code is generated, do not edit it directly.
|
||||
// clang-format off
|
||||
|
||||
{ // optionalInt32
|
||||
Message3 *msg = [[Message3 alloc] init];
|
||||
@@ -947,9 +1015,8 @@
|
||||
[msg release];
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
//%PDDM-EXPAND-END PROTO3_TEST_HAS_FIELDS()
|
||||
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
- (void)testProto3SingleOptionalFieldHasBehavior {
|
||||
@@ -957,9 +1024,6 @@
|
||||
// Setting to any value including the default (0) should result in true.
|
||||
//
|
||||
|
||||
// Disable clang-format for the macros.
|
||||
// clang-format off
|
||||
|
||||
//%PDDM-DEFINE PROTO3_TEST_OPTIONAL_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
|
||||
//% { // optional##FIELD
|
||||
//% Message3Optional *msg = [[Message3Optional alloc] init];
|
||||
@@ -996,6 +1060,7 @@
|
||||
//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Enum, Message3Optional_Enum_Bar, Message3Optional_Enum_Foo)
|
||||
//%PDDM-EXPAND PROTO3_TEST_OPTIONAL_HAS_FIELDS()
|
||||
// This block of code is generated, do not edit it directly.
|
||||
// clang-format off
|
||||
|
||||
{ // optionalInt32
|
||||
Message3Optional *msg = [[Message3Optional alloc] init];
|
||||
@@ -1193,9 +1258,8 @@
|
||||
[msg release];
|
||||
}
|
||||
|
||||
// clang-format on
|
||||
//%PDDM-EXPAND-END PROTO3_TEST_OPTIONAL_HAS_FIELDS()
|
||||
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
- (void)testAccessingProto2UnknownEnumValues {
|
||||
@@ -1204,11 +1268,13 @@
|
||||
// Set it to something non zero, try and confirm it doesn't change.
|
||||
|
||||
msg.optionalEnum = Message2_Enum_Bar;
|
||||
XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException, NSInvalidArgumentException);
|
||||
XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException,
|
||||
NSInvalidArgumentException);
|
||||
XCTAssertEqual(msg.optionalEnum, Message2_Enum_Bar);
|
||||
|
||||
msg.oneofEnum = Message2_Enum_Bar;
|
||||
XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException, NSInvalidArgumentException);
|
||||
XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException,
|
||||
NSInvalidArgumentException);
|
||||
XCTAssertEqual(msg.oneofEnum, Message2_Enum_Bar);
|
||||
|
||||
[msg release];
|
||||
@@ -1220,17 +1286,20 @@
|
||||
// Set it to something non zero, try and confirm it doesn't change.
|
||||
|
||||
msg.optionalEnum = Message3_Enum_Bar;
|
||||
XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException, NSInvalidArgumentException);
|
||||
XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException,
|
||||
NSInvalidArgumentException);
|
||||
XCTAssertEqual(msg.optionalEnum, Message3_Enum_Bar);
|
||||
|
||||
msg.oneofEnum = Message3_Enum_Bar;
|
||||
XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException, NSInvalidArgumentException);
|
||||
XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException,
|
||||
NSInvalidArgumentException);
|
||||
XCTAssertEqual(msg.oneofEnum, Message3_Enum_Bar);
|
||||
|
||||
// Set via raw api to confirm it works.
|
||||
|
||||
SetMessage3_OptionalEnum_RawValue(msg, 666);
|
||||
XCTAssertEqual(msg.optionalEnum, Message3_Enum_GPBUnrecognizedEnumeratorValue);
|
||||
XCTAssertEqual(msg.optionalEnum,
|
||||
Message3_Enum_GPBUnrecognizedEnumeratorValue);
|
||||
XCTAssertEqual(Message3_OptionalEnum_RawValue(msg), 666);
|
||||
|
||||
SetMessage3_OneofEnum_RawValue(msg, 666);
|
||||
@@ -1594,7 +1663,8 @@
|
||||
XCTAssertEqual(msg.oneofDouble, 111.0);
|
||||
XCTAssertEqual(msg.oneofBool, YES);
|
||||
XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
|
||||
XCTAssertEqualObjects(msg.oneofBytes, [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
|
||||
XCTAssertEqualObjects(msg.oneofBytes,
|
||||
[@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
|
||||
XCTAssertNotNil(msg.oneofGroup);
|
||||
XCTAssertNotNil(msg.oneofMessage);
|
||||
XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
|
||||
@@ -1677,15 +1747,24 @@
|
||||
msg = [[Message2 alloc] init];
|
||||
|
||||
int32_t values[] = {
|
||||
Message2_O_OneOfCase_OneofInt32, Message2_O_OneOfCase_OneofInt64,
|
||||
Message2_O_OneOfCase_OneofUint32, Message2_O_OneOfCase_OneofUint64,
|
||||
Message2_O_OneOfCase_OneofSint32, Message2_O_OneOfCase_OneofSint64,
|
||||
Message2_O_OneOfCase_OneofFixed32, Message2_O_OneOfCase_OneofFixed64,
|
||||
Message2_O_OneOfCase_OneofSfixed32, Message2_O_OneOfCase_OneofSfixed64,
|
||||
Message2_O_OneOfCase_OneofFloat, Message2_O_OneOfCase_OneofDouble,
|
||||
Message2_O_OneOfCase_OneofBool, Message2_O_OneOfCase_OneofString,
|
||||
Message2_O_OneOfCase_OneofBytes, Message2_O_OneOfCase_OneofGroup,
|
||||
Message2_O_OneOfCase_OneofMessage, Message2_O_OneOfCase_OneofEnum,
|
||||
Message2_O_OneOfCase_OneofInt32,
|
||||
Message2_O_OneOfCase_OneofInt64,
|
||||
Message2_O_OneOfCase_OneofUint32,
|
||||
Message2_O_OneOfCase_OneofUint64,
|
||||
Message2_O_OneOfCase_OneofSint32,
|
||||
Message2_O_OneOfCase_OneofSint64,
|
||||
Message2_O_OneOfCase_OneofFixed32,
|
||||
Message2_O_OneOfCase_OneofFixed64,
|
||||
Message2_O_OneOfCase_OneofSfixed32,
|
||||
Message2_O_OneOfCase_OneofSfixed64,
|
||||
Message2_O_OneOfCase_OneofFloat,
|
||||
Message2_O_OneOfCase_OneofDouble,
|
||||
Message2_O_OneOfCase_OneofBool,
|
||||
Message2_O_OneOfCase_OneofString,
|
||||
Message2_O_OneOfCase_OneofBytes,
|
||||
Message2_O_OneOfCase_OneofGroup,
|
||||
Message2_O_OneOfCase_OneofMessage,
|
||||
Message2_O_OneOfCase_OneofEnum,
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
|
||||
@@ -1753,7 +1832,8 @@
|
||||
// No need to check the value was set, the above tests did that.
|
||||
Message2_ClearOOneOfCase(msg);
|
||||
// Nothing in the case.
|
||||
XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase, "Loop: %zd", i);
|
||||
XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase,
|
||||
"Loop: %zd", i);
|
||||
// Confirm everything is back to defaults after a clear.
|
||||
XCTAssertEqual(msg.oneofInt32, 100, "Loop: %zd", i);
|
||||
XCTAssertEqual(msg.oneofInt64, 101, "Loop: %zd", i);
|
||||
@@ -2121,7 +2201,8 @@
|
||||
XCTAssertEqual(msg.oneofDouble, 0.0);
|
||||
XCTAssertEqual(msg.oneofBool, NO);
|
||||
XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
|
||||
XCTAssertEqualObjects(msg.oneofBytes, [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
|
||||
XCTAssertEqualObjects(msg.oneofBytes,
|
||||
[@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
|
||||
XCTAssertNotNil(msg.oneofMessage);
|
||||
XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
|
||||
XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
|
||||
@@ -2176,15 +2257,23 @@
|
||||
msg = [[Message3 alloc] init];
|
||||
|
||||
int32_t values[] = {
|
||||
Message3_O_OneOfCase_OneofInt32, Message3_O_OneOfCase_OneofInt64,
|
||||
Message3_O_OneOfCase_OneofUint32, Message3_O_OneOfCase_OneofUint64,
|
||||
Message3_O_OneOfCase_OneofSint32, Message3_O_OneOfCase_OneofSint64,
|
||||
Message3_O_OneOfCase_OneofFixed32, Message3_O_OneOfCase_OneofFixed64,
|
||||
Message3_O_OneOfCase_OneofSfixed32, Message3_O_OneOfCase_OneofSfixed64,
|
||||
Message3_O_OneOfCase_OneofFloat, Message3_O_OneOfCase_OneofDouble,
|
||||
Message3_O_OneOfCase_OneofBool, Message3_O_OneOfCase_OneofString,
|
||||
Message3_O_OneOfCase_OneofBytes, Message3_O_OneOfCase_OneofMessage,
|
||||
Message3_O_OneOfCase_OneofEnum,
|
||||
Message3_O_OneOfCase_OneofInt32,
|
||||
Message3_O_OneOfCase_OneofInt64,
|
||||
Message3_O_OneOfCase_OneofUint32,
|
||||
Message3_O_OneOfCase_OneofUint64,
|
||||
Message3_O_OneOfCase_OneofSint32,
|
||||
Message3_O_OneOfCase_OneofSint64,
|
||||
Message3_O_OneOfCase_OneofFixed32,
|
||||
Message3_O_OneOfCase_OneofFixed64,
|
||||
Message3_O_OneOfCase_OneofSfixed32,
|
||||
Message3_O_OneOfCase_OneofSfixed64,
|
||||
Message3_O_OneOfCase_OneofFloat,
|
||||
Message3_O_OneOfCase_OneofDouble,
|
||||
Message3_O_OneOfCase_OneofBool,
|
||||
Message3_O_OneOfCase_OneofString,
|
||||
Message3_O_OneOfCase_OneofBytes,
|
||||
Message3_O_OneOfCase_OneofMessage,
|
||||
Message3_O_OneOfCase_OneofEnum,
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
|
||||
@@ -2249,7 +2338,8 @@
|
||||
// No need to check the value was set, the above tests did that.
|
||||
Message3_ClearOOneOfCase(msg);
|
||||
// Nothing in the case.
|
||||
XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase, "Loop: %zd", i);
|
||||
XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase,
|
||||
"Loop: %zd", i);
|
||||
// Confirm everything is back to defaults after a clear.
|
||||
XCTAssertEqual(msg.oneofInt32, 0, "Loop: %zd", i);
|
||||
XCTAssertEqual(msg.oneofInt64, 0, "Loop: %zd", i);
|
||||
@@ -2276,6 +2366,7 @@
|
||||
}
|
||||
|
||||
- (void)testProto2OneofSetToDefault {
|
||||
|
||||
// proto3 doesn't normally write out zero (default) fields, but if they are
|
||||
// in a oneof it does. proto2 doesn't have this special behavior, but we
|
||||
// still confirm setting to the explicit default does set the case to be
|
||||
@@ -2287,24 +2378,24 @@
|
||||
Message2 *msg = [[Message2 alloc] init];
|
||||
|
||||
int32_t values[] = {
|
||||
Message2_O_OneOfCase_OneofInt32,
|
||||
Message2_O_OneOfCase_OneofInt64,
|
||||
Message2_O_OneOfCase_OneofUint32,
|
||||
Message2_O_OneOfCase_OneofUint64,
|
||||
Message2_O_OneOfCase_OneofSint32,
|
||||
Message2_O_OneOfCase_OneofSint64,
|
||||
Message2_O_OneOfCase_OneofFixed32,
|
||||
Message2_O_OneOfCase_OneofFixed64,
|
||||
Message2_O_OneOfCase_OneofSfixed32,
|
||||
Message2_O_OneOfCase_OneofSfixed64,
|
||||
Message2_O_OneOfCase_OneofFloat,
|
||||
Message2_O_OneOfCase_OneofDouble,
|
||||
Message2_O_OneOfCase_OneofBool,
|
||||
Message2_O_OneOfCase_OneofString,
|
||||
Message2_O_OneOfCase_OneofBytes,
|
||||
// Skip group
|
||||
// Skip message
|
||||
Message2_O_OneOfCase_OneofEnum,
|
||||
Message2_O_OneOfCase_OneofInt32,
|
||||
Message2_O_OneOfCase_OneofInt64,
|
||||
Message2_O_OneOfCase_OneofUint32,
|
||||
Message2_O_OneOfCase_OneofUint64,
|
||||
Message2_O_OneOfCase_OneofSint32,
|
||||
Message2_O_OneOfCase_OneofSint64,
|
||||
Message2_O_OneOfCase_OneofFixed32,
|
||||
Message2_O_OneOfCase_OneofFixed64,
|
||||
Message2_O_OneOfCase_OneofSfixed32,
|
||||
Message2_O_OneOfCase_OneofSfixed64,
|
||||
Message2_O_OneOfCase_OneofFloat,
|
||||
Message2_O_OneOfCase_OneofDouble,
|
||||
Message2_O_OneOfCase_OneofBool,
|
||||
Message2_O_OneOfCase_OneofString,
|
||||
Message2_O_OneOfCase_OneofBytes,
|
||||
// Skip group
|
||||
// Skip message
|
||||
Message2_O_OneOfCase_OneofEnum,
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
|
||||
@@ -2405,6 +2496,7 @@
|
||||
}
|
||||
|
||||
- (void)testProto3OneofSetToZero {
|
||||
|
||||
// Normally setting a proto3 field to the zero value should result in it being
|
||||
// reset/cleared. But in a oneof, it still gets recorded so it can go out
|
||||
// over the wire and the other side can see what was set in the oneof.
|
||||
@@ -2415,15 +2507,23 @@
|
||||
Message3 *msg = [[Message3 alloc] init];
|
||||
|
||||
int32_t values[] = {
|
||||
Message3_O_OneOfCase_OneofInt32, Message3_O_OneOfCase_OneofInt64,
|
||||
Message3_O_OneOfCase_OneofUint32, Message3_O_OneOfCase_OneofUint64,
|
||||
Message3_O_OneOfCase_OneofSint32, Message3_O_OneOfCase_OneofSint64,
|
||||
Message3_O_OneOfCase_OneofFixed32, Message3_O_OneOfCase_OneofFixed64,
|
||||
Message3_O_OneOfCase_OneofSfixed32, Message3_O_OneOfCase_OneofSfixed64,
|
||||
Message3_O_OneOfCase_OneofFloat, Message3_O_OneOfCase_OneofDouble,
|
||||
Message3_O_OneOfCase_OneofBool, Message3_O_OneOfCase_OneofString,
|
||||
Message3_O_OneOfCase_OneofBytes, Message3_O_OneOfCase_OneofMessage,
|
||||
Message3_O_OneOfCase_OneofEnum,
|
||||
Message3_O_OneOfCase_OneofInt32,
|
||||
Message3_O_OneOfCase_OneofInt64,
|
||||
Message3_O_OneOfCase_OneofUint32,
|
||||
Message3_O_OneOfCase_OneofUint64,
|
||||
Message3_O_OneOfCase_OneofSint32,
|
||||
Message3_O_OneOfCase_OneofSint64,
|
||||
Message3_O_OneOfCase_OneofFixed32,
|
||||
Message3_O_OneOfCase_OneofFixed64,
|
||||
Message3_O_OneOfCase_OneofSfixed32,
|
||||
Message3_O_OneOfCase_OneofSfixed64,
|
||||
Message3_O_OneOfCase_OneofFloat,
|
||||
Message3_O_OneOfCase_OneofDouble,
|
||||
Message3_O_OneOfCase_OneofBool,
|
||||
Message3_O_OneOfCase_OneofString,
|
||||
Message3_O_OneOfCase_OneofBytes,
|
||||
Message3_O_OneOfCase_OneofMessage,
|
||||
Message3_O_OneOfCase_OneofEnum,
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
|
||||
@@ -2554,19 +2654,27 @@
|
||||
XCTAssertNotEqual(msg1.repeatedStringArray, msg2.repeatedStringArray);
|
||||
XCTAssertNotEqual(msg1.repeatedBytesArray, msg2.repeatedBytesArray);
|
||||
XCTAssertNotEqual(msg1.repeatedGroupArray, msg2.repeatedGroupArray);
|
||||
XCTAssertNotEqual(msg1.repeatedNestedMessageArray, msg2.repeatedNestedMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignMessageArray, msg2.repeatedForeignMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedImportMessageArray, msg2.repeatedImportMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedNestedMessageArray,
|
||||
msg2.repeatedNestedMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignMessageArray,
|
||||
msg2.repeatedForeignMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedImportMessageArray,
|
||||
msg2.repeatedImportMessageArray);
|
||||
XCTAssertNotEqual(msg1.repeatedNestedEnumArray, msg2.repeatedNestedEnumArray);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignEnumArray, msg2.repeatedForeignEnumArray);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignEnumArray,
|
||||
msg2.repeatedForeignEnumArray);
|
||||
XCTAssertNotEqual(msg1.repeatedImportEnumArray, msg2.repeatedImportEnumArray);
|
||||
XCTAssertNotEqual(msg1.repeatedStringPieceArray, msg2.repeatedStringPieceArray);
|
||||
XCTAssertNotEqual(msg1.repeatedStringPieceArray,
|
||||
msg2.repeatedStringPieceArray);
|
||||
XCTAssertNotEqual(msg1.repeatedCordArray, msg2.repeatedCordArray);
|
||||
|
||||
for (int i = 0; i < repeatCount; i++) {
|
||||
XCTAssertNotEqual(msg1.repeatedNestedMessageArray[i], msg2.repeatedNestedMessageArray[i]);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignMessageArray[i], msg2.repeatedForeignMessageArray[i]);
|
||||
XCTAssertNotEqual(msg1.repeatedImportMessageArray[i], msg2.repeatedImportMessageArray[i]);
|
||||
XCTAssertNotEqual(msg1.repeatedNestedMessageArray[i],
|
||||
msg2.repeatedNestedMessageArray[i]);
|
||||
XCTAssertNotEqual(msg1.repeatedForeignMessageArray[i],
|
||||
msg2.repeatedForeignMessageArray[i]);
|
||||
XCTAssertNotEqual(msg1.repeatedImportMessageArray[i],
|
||||
msg2.repeatedImportMessageArray[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2600,7 +2708,8 @@
|
||||
|
||||
// Ensure the messages are unique per map.
|
||||
[msg1.mapInt32ForeignMessage
|
||||
enumerateKeysAndObjectsUsingBlock:^(int32_t key, id value, __unused BOOL *stop) {
|
||||
enumerateKeysAndObjectsUsingBlock:^(int32_t key, id value, BOOL *stop) {
|
||||
#pragma unused(stop)
|
||||
ForeignMessage *subMsg2 = [msg2.mapInt32ForeignMessage objectForKey:key];
|
||||
XCTAssertNotEqual(value, subMsg2); // Ptr compare, new object.
|
||||
}];
|
||||
@@ -2611,7 +2720,7 @@
|
||||
GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"repeatedStringArray"];
|
||||
XCTAssertNotNil(fieldDescriptor);
|
||||
NSMutableArray *fieldArray = GPBGetMessageRepeatedField(message, fieldDescriptor);
|
||||
XCTAssertNotNil(fieldArray); // Should have autocreated.
|
||||
XCTAssertNotNil(fieldArray); // Should have autocreated.
|
||||
XCTAssertTrue(fieldArray == message.repeatedStringArray); // Same pointer
|
||||
}
|
||||
|
||||
@@ -2631,7 +2740,7 @@
|
||||
GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"mapStringString"];
|
||||
XCTAssertNotNil(fieldDescriptor);
|
||||
NSMutableDictionary *fieldMap = GPBGetMessageMapField(message, fieldDescriptor);
|
||||
XCTAssertNotNil(fieldMap); // Should have autocreated.
|
||||
XCTAssertNotNil(fieldMap); // Should have autocreated.
|
||||
XCTAssertTrue(fieldMap == message.mapStringString); // Same pointer
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user