Index: third_party/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m |
diff --git a/third_party/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m b/third_party/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m |
index 27f77f282f29c5817241623aee6f4af39276eb89..66bc64879df57273ec5708ac9141b5e998a9cdf2 100644 |
--- a/third_party/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m |
+++ b/third_party/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m |
@@ -3363,11 +3363,11 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
@implementation GPBInt64ObjectDictionaryTests |
- (void)testEmpty { |
- GPBInt64ObjectDictionary *dict = [[GPBInt64ObjectDictionary alloc] init]; |
+ GPBInt64ObjectDictionary<NSString*> *dict = [[GPBInt64ObjectDictionary alloc] init]; |
XCTAssertNotNil(dict); |
XCTAssertEqual(dict.count, 0U); |
XCTAssertNil([dict objectForKey:21LL]); |
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, id aObject, BOOL *stop) { |
+ [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) { |
#pragma unused(aKey, aObject, stop) |
XCTFail(@"Shouldn't get here!"); |
}]; |
@@ -3375,12 +3375,12 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
} |
- (void)testOne { |
- GPBInt64ObjectDictionary *dict = [GPBInt64ObjectDictionary dictionaryWithObject:@"abc" forKey:21LL]; |
+ GPBInt64ObjectDictionary<NSString*> *dict = [GPBInt64ObjectDictionary dictionaryWithObject:@"abc" forKey:21LL]; |
XCTAssertNotNil(dict); |
XCTAssertEqual(dict.count, 1U); |
XCTAssertEqualObjects([dict objectForKey:21LL], @"abc"); |
XCTAssertNil([dict objectForKey:22LL]); |
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, id aObject, BOOL *stop) { |
+ [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) { |
XCTAssertEqual(aKey, 21LL); |
XCTAssertEqualObjects(aObject, @"abc"); |
XCTAssertNotEqual(stop, NULL); |
@@ -3389,8 +3389,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testBasics { |
const int64_t kKeys[] = { 21LL, 22LL, 23LL }; |
- const id kObjects[] = { @"abc", @"def", @"ghi" }; |
- GPBInt64ObjectDictionary *dict = |
+ const NSString* kObjects[] = { @"abc", @"def", @"ghi" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
@@ -3403,8 +3403,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
__block NSUInteger idx = 0; |
int64_t *seenKeys = malloc(3 * sizeof(int64_t)); |
- id *seenObjects = malloc(3 * sizeof(id)); |
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, id aObject, BOOL *stop) { |
+ NSString* *seenObjects = malloc(3 * sizeof(NSString*)); |
+ [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) { |
XCTAssertLessThan(idx, 3U); |
seenKeys[idx] = aKey; |
seenObjects[idx] = aObject; |
@@ -3426,7 +3426,7 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
// Stopping the enumeration. |
idx = 0; |
- [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, id aObject, BOOL *stop) { |
+ [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) { |
#pragma unused(aKey, aObject) |
if (idx == 1) *stop = YES; |
XCTAssertNotEqual(idx, 2U); |
@@ -3438,30 +3438,30 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testEquality { |
const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL }; |
const int64_t kKeys2[] = { 22LL, 21LL, 24LL }; |
- const id kObjects1[] = { @"abc", @"def", @"ghi" }; |
- const id kObjects2[] = { @"abc", @"jkl", @"ghi" }; |
- const id kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict1 = |
+ const NSString* kObjects1[] = { @"abc", @"def", @"ghi" }; |
+ const NSString* kObjects2[] = { @"abc", @"jkl", @"ghi" }; |
+ const NSString* kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict1 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1 |
forKeys:kKeys1 |
count:GPBARRAYSIZE(kObjects1)]; |
XCTAssertNotNil(dict1); |
- GPBInt64ObjectDictionary *dict1prime = |
+ GPBInt64ObjectDictionary<NSString*> *dict1prime = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1 |
forKeys:kKeys1 |
count:GPBARRAYSIZE(kObjects1)]; |
XCTAssertNotNil(dict1prime); |
- GPBInt64ObjectDictionary *dict2 = |
+ GPBInt64ObjectDictionary<NSString*> *dict2 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects2 |
forKeys:kKeys1 |
count:GPBARRAYSIZE(kObjects2)]; |
XCTAssertNotNil(dict2); |
- GPBInt64ObjectDictionary *dict3 = |
+ GPBInt64ObjectDictionary<NSString*> *dict3 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1 |
forKeys:kKeys2 |
count:GPBARRAYSIZE(kObjects1)]; |
XCTAssertNotNil(dict3); |
- GPBInt64ObjectDictionary *dict4 = |
+ GPBInt64ObjectDictionary<NSString*> *dict4 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects3 |
forKeys:kKeys1 |
count:GPBARRAYSIZE(kObjects3)]; |
@@ -3491,14 +3491,14 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testCopy { |
const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL }; |
- const id kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict = |
+ const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
XCTAssertNotNil(dict); |
- GPBInt64ObjectDictionary *dict2 = [dict copy]; |
+ GPBInt64ObjectDictionary<NSString*> *dict2 = [dict copy]; |
XCTAssertNotNil(dict2); |
// Should be new object but equal. |
@@ -3512,14 +3512,14 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testDictionaryFromDictionary { |
const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL }; |
- const id kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict = |
+ const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
XCTAssertNotNil(dict); |
- GPBInt64ObjectDictionary *dict2 = |
+ GPBInt64ObjectDictionary<NSString*> *dict2 = |
[GPBInt64ObjectDictionary dictionaryWithDictionary:dict]; |
XCTAssertNotNil(dict2); |
@@ -3530,7 +3530,7 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
} |
- (void)testAdds { |
- GPBInt64ObjectDictionary *dict = [GPBInt64ObjectDictionary dictionary]; |
+ GPBInt64ObjectDictionary<NSString*> *dict = [GPBInt64ObjectDictionary dictionary]; |
XCTAssertNotNil(dict); |
XCTAssertEqual(dict.count, 0U); |
@@ -3538,8 +3538,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
XCTAssertEqual(dict.count, 1U); |
const int64_t kKeys[] = { 22LL, 23LL, 24LL }; |
- const id kObjects[] = { @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict2 = |
+ const NSString* kObjects[] = { @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict2 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
@@ -3556,8 +3556,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testRemove { |
const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL }; |
- const id kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict = |
+ const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
@@ -3597,8 +3597,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
- (void)testInplaceMutation { |
const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL }; |
- const id kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
- GPBInt64ObjectDictionary *dict = |
+ const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects |
forKeys:kKeys |
count:GPBARRAYSIZE(kObjects)]; |
@@ -3624,8 +3624,8 @@ static BOOL TestingEnum_IsValidValue(int32_t value) { |
XCTAssertEqualObjects([dict objectForKey:24LL], @"def"); |
const int64_t kKeys2[] = { 22LL, 23LL }; |
- const id kObjects2[] = { @"ghi", @"abc" }; |
- GPBInt64ObjectDictionary *dict2 = |
+ const NSString* kObjects2[] = { @"ghi", @"abc" }; |
+ GPBInt64ObjectDictionary<NSString*> *dict2 = |
[[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects2 |
forKeys:kKeys2 |
count:GPBARRAYSIZE(kObjects2)]; |