ADD: added new version of protobuf
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
#import "GPBTestUtilities.h"
|
||||
|
||||
#import "GPBExtensionRegistry.h"
|
||||
#import "objectivec/Tests/Unittest.pbobjc.h"
|
||||
#import "google/protobuf/Unittest.pbobjc.h"
|
||||
|
||||
@interface GPBExtensionRegistryTest : GPBTestCase
|
||||
@end
|
||||
@@ -42,17 +42,20 @@
|
||||
GPBExtensionRegistry *reg = [[[GPBExtensionRegistry alloc] init] autorelease];
|
||||
XCTAssertNotNil(reg);
|
||||
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1]);
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor] fieldNumber:1]);
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllExtensions descriptor]
|
||||
fieldNumber:1]);
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor]
|
||||
fieldNumber:1]);
|
||||
|
||||
[reg addExtension:[UnittestRoot optionalInt32Extension]];
|
||||
[reg addExtension:[UnittestRoot packedInt64Extension]];
|
||||
|
||||
XCTAssertTrue([reg extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor] fieldNumber:1]);
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor]
|
||||
fieldNumber:1]);
|
||||
XCTAssertTrue([reg extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
}
|
||||
|
||||
- (void)testCopy {
|
||||
@@ -63,9 +66,9 @@
|
||||
XCTAssertNotNil(reg2);
|
||||
|
||||
XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
|
||||
// Message class that had registered extension(s) at the -copy time.
|
||||
|
||||
@@ -73,11 +76,11 @@
|
||||
[reg2 addExtension:[UnittestRoot optionalStringExtension]];
|
||||
|
||||
XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13] ==
|
||||
[UnittestRoot optionalBoolExtension]); // ptr equality
|
||||
[UnittestRoot optionalBoolExtension]); // ptr equality
|
||||
XCTAssertNil([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14]);
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13]);
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14] ==
|
||||
[UnittestRoot optionalStringExtension]); // ptr equality
|
||||
[UnittestRoot optionalStringExtension]); // ptr equality
|
||||
|
||||
// Message class that did not have any registered extensions at the -copy time.
|
||||
|
||||
@@ -85,11 +88,12 @@
|
||||
[reg2 addExtension:[UnittestRoot packedSint32Extension]];
|
||||
|
||||
XCTAssertTrue([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
XCTAssertNil([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94]);
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91]);
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94] ==
|
||||
[UnittestRoot packedSint32Extension]); // ptr equality
|
||||
[UnittestRoot packedSint32Extension]); // ptr equality
|
||||
|
||||
}
|
||||
|
||||
- (void)testAddExtensions {
|
||||
@@ -98,12 +102,13 @@
|
||||
|
||||
GPBExtensionRegistry *reg2 = [[[GPBExtensionRegistry alloc] init] autorelease];
|
||||
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1]);
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor]
|
||||
fieldNumber:1]);
|
||||
|
||||
[reg2 addExtensions:reg1];
|
||||
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
[UnittestRoot optionalInt32Extension]); // ptr equality
|
||||
|
||||
// Confirm adding to the first doesn't add to the second.
|
||||
|
||||
@@ -111,9 +116,9 @@
|
||||
[reg1 addExtension:[UnittestRoot packedInt64Extension]];
|
||||
|
||||
XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13] ==
|
||||
[UnittestRoot optionalBoolExtension]); // ptr equality
|
||||
[UnittestRoot optionalBoolExtension]); // ptr equality
|
||||
XCTAssertTrue([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
[UnittestRoot packedInt64Extension]); // ptr equality
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13]);
|
||||
XCTAssertNil([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91]);
|
||||
|
||||
@@ -125,9 +130,9 @@
|
||||
XCTAssertNil([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14]);
|
||||
XCTAssertNil([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94]);
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14] ==
|
||||
[UnittestRoot optionalStringExtension]); // ptr equality
|
||||
[UnittestRoot optionalStringExtension]); // ptr equality
|
||||
XCTAssertTrue([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94] ==
|
||||
[UnittestRoot packedSint32Extension]); // ptr equality
|
||||
[UnittestRoot packedSint32Extension]); // ptr equality
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
Reference in New Issue
Block a user