Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PINCacheTests compiling in Xcode 12.0b4 #276

Merged
merged 1 commit into from
Aug 12, 2020
Merged

Fix PINCacheTests compiling in Xcode 12.0b4 #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 40 additions & 39 deletions Tests/PINCacheTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ - (void)testObjectSet
__block PINImage *image = nil;
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);

[self.cache setObjectAsync:[self image] forKey:key completion:^(PINCache *cache, NSString *key, id object) {
[self.cache setObjectAsync:[self image] forKey:key completion:^(id<PINCaching> cache, NSString *key, id object) {
image = (PINImage *)object;
dispatch_semaphore_signal(semaphore);
}];
Expand All @@ -148,7 +148,7 @@ - (void)testObjectSetWithCost
PINImage *srcImage = [self image];
NSUInteger cost = (NSUInteger)(srcImage.size.width * srcImage.size.height);

[self.cache setObjectAsync:srcImage forKey:key withCost:cost completion:^(PINCache *cache, NSString *key, id object) {
[self.cache setObjectAsync:srcImage forKey:key withCost:cost completion:^(id<PINCaching> cache, NSString *key, id object) {
image = (PINImage *)object;
dispatch_semaphore_signal(semaphore);
}];
Expand All @@ -170,7 +170,7 @@ - (void)testObjectSetWithDuplicateKey
[self.cache setObject:value1 forKey:key];
[self.cache setObject:value2 forKey:key];

[self.cache objectForKeyAsync:key completion:^(PINCache *cache, NSString *key, id object) {
[self.cache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id object) {
cachedValue = (NSString *)object;
dispatch_semaphore_signal(semaphore);
}];
Expand Down Expand Up @@ -233,7 +233,7 @@ - (void)testObjectGet

self.cache[key] = [self image];

[self.cache objectForKeyAsync:key completion:^(PINCache *cache, NSString *key, id object) {
[self.cache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id object) {
image = (PINImage *)object;
dispatch_semaphore_signal(semaphore);
}];
Expand All @@ -252,7 +252,7 @@ - (void)testObjectGetWithInvalidKey

self.cache[key] = [self image];

[self.cache objectForKeyAsync:invalidKey completion:^(PINCache *cache, NSString *key, id object) {
[self.cache objectForKeyAsync:invalidKey completion:^(id<PINCaching> cache, NSString *key, id object) {
image = (PINImage *)object;
dispatch_semaphore_signal(semaphore);
}];
Expand All @@ -279,7 +279,7 @@ - (void)testObjectRemove
didRemoveObjectBlockCalled = YES;
};

[self.cache removeObjectForKeyAsync:key completion:^(PINCache *cache, NSString *key, id object) {
[self.cache removeObjectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id object) {
dispatch_semaphore_signal(semaphore);
}];

Expand Down Expand Up @@ -311,7 +311,7 @@ - (void)testObjectRemoveAll
didRemoveAllObjectsBlockCalled = YES;
};

[self.cache removeAllObjectsAsync:^(PINCache *cache) {
[self.cache removeAllObjectsAsync:^(id<PINCaching> cache) {
dispatch_semaphore_signal(semaphore);
}];

Expand Down Expand Up @@ -505,9 +505,9 @@ - (void)testOneThousandAndOneWrites
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warc-retain-cycles"
dispatch_group_enter(group);
[self.cache setObjectAsync:obj forKey:key completion:^(PINCache * _Nonnull cache, NSString * _Nonnull key, id _Nullable object) {
[self.cache setObjectAsync:obj forKey:key completion:^(id<PINCaching> _Nonnull cache, NSString * _Nonnull key, id _Nullable object) {
dispatch_async(queue, ^{
[self.cache objectForKeyAsync:key completion:^(PINCache * _Nonnull cache, NSString * _Nonnull key, id _Nullable object) {
[self.cache objectForKeyAsync:key completion:^(id<PINCaching> _Nonnull cache, NSString * _Nonnull key, id _Nullable object) {
NSString *obj = [[NSString alloc] initWithFormat:@"obj %lu", (unsigned long)i];
XCTAssertTrue([object isEqualToString:obj] == YES, @"object returned was not object set");
@synchronized (self) {
Expand Down Expand Up @@ -535,7 +535,7 @@ - (void)testMemoryWarningBlock

__block BOOL blockDidExecute = NO;

self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(PINMemoryCache *cache) {
self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(id<PINCaching> cache) {
blockDidExecute = YES;
dispatch_semaphore_signal(semaphore);
};
Expand All @@ -554,7 +554,7 @@ - (void)testBackgroundBlock

__block BOOL blockDidExecute = NO;

self.cache.memoryCache.didEnterBackgroundBlock = ^(PINMemoryCache *cache) {
self.cache.memoryCache.didEnterBackgroundBlock = ^(id<PINCaching> cache) {
blockDidExecute = YES;
dispatch_semaphore_signal(semaphore);
};
Expand Down Expand Up @@ -591,8 +591,8 @@ - (void)testMemoryWarningProperty

__block id object = nil;

self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(PINMemoryCache *cache) {
object = cache[@"object"];
self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(id<PINCaching> cache) {
object = [cache objectForKey:@"object"];
dispatch_semaphore_signal(semaphore);
};

Expand Down Expand Up @@ -620,12 +620,13 @@ - (void)testMemoryCacheEnumerationWithWarning

__block NSUInteger enumCount = 0;

self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(PINMemoryCache *cache) {
[cache enumerateObjectsWithBlockAsync:^(PINMemoryCache *cache, NSString *key, id object, BOOL *stop) {
self.cache.memoryCache.didReceiveMemoryWarningBlock = ^(id<PINCaching> cache) {
PINMemoryCache *memoryCache = (PINMemoryCache *)cache;
[memoryCache enumerateObjectsWithBlockAsync:^(id<PINCaching> cache, NSString *key, id object, BOOL *stop) {
@synchronized (self) {
enumCount++;
}
} completionBlock:^(PINMemoryCache *cache) {
} completionBlock:^(id<PINCaching> cache) {
dispatch_semaphore_signal(semaphore);
}];
};
Expand Down Expand Up @@ -665,7 +666,7 @@ - (void)testDiskCacheEnumeration
@synchronized (self) {
enumCount++;
}
} completionBlock:^(PINDiskCache *cache) {
} completionBlock:^(id<PINCaching> cache) {
dispatch_semaphore_signal(semaphore);
}];

Expand Down Expand Up @@ -722,25 +723,25 @@ - (void)testAgeLimit
__block id diskObj2 = nil;

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj1 = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj2 = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.diskCache objectForKeyAsync:key1 completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
[self.cache.diskCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
diskObj1 = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.diskCache objectForKeyAsync:key2 completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
[self.cache.diskCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
diskObj2 = object;
dispatch_group_leave(group);
}];
Expand All @@ -765,19 +766,19 @@ - (void)testAgeLimit
sleep(1);

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj1 = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj2 = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.diskCache objectForKeyAsync:key1 completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
[self.cache.diskCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
diskObj1 = object;
dispatch_group_leave(group);
}];
Expand Down Expand Up @@ -902,13 +903,13 @@ - (void)_testTTLCacheObjectAccess {
__block id diskObj = nil;

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.diskCache objectForKeyAsync:key completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
[self.cache.diskCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
diskObj = object;
dispatch_group_leave(group);
}];
Expand All @@ -926,13 +927,13 @@ - (void)_testTTLCacheObjectAccess {
diskObj = nil;

dispatch_group_enter(group);
[self.cache.memoryCache objectForKeyAsync:key completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id object) {
memObj = object;
dispatch_group_leave(group);
}];

dispatch_group_enter(group);
[self.cache.diskCache objectForKeyAsync:key completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
[self.cache.diskCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
diskObj = object;
dispatch_group_leave(group);
}];
Expand Down Expand Up @@ -979,7 +980,7 @@ - (void)_testTTLCacheObjectEnumeration {
XCTAssertEqual(objCount, expectedObjCount, @"Expected %lu objects in the cache", (unsigned long)expectedObjCount);

objCount = 0;
[self.cache.memoryCache enumerateObjectsWithBlock:^(PINMemoryCache *cache, NSString *key, id _Nullable object, BOOL *stop) {
[self.cache.memoryCache enumerateObjectsWithBlock:^(id<PINCaching> cache, NSString *key, id _Nullable object, BOOL *stop) {
objCount++;
}];

Expand All @@ -1005,7 +1006,7 @@ - (void)_testTTLCacheObjectEnumeration {
XCTAssertEqual(objCount, expectedObjCount, @"Expected %lu objects in the cache", (unsigned long)expectedObjCount);

objCount = 0;
[self.cache.memoryCache enumerateObjectsWithBlock:^(PINMemoryCache * _Nonnull cache, NSString * _Nonnull key, id _Nullable object, BOOL *stop) {
[self.cache.memoryCache enumerateObjectsWithBlock:^(id<PINCaching> _Nonnull cache, NSString * _Nonnull key, id _Nullable object, BOOL *stop) {
objCount++;
}];

Expand Down Expand Up @@ -1089,13 +1090,13 @@ - (void)testObjectTTLObjectAccess
// Neither object should be expired at this point and should exist in both caches

XCTestExpectation *memObjectForKey1Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #1"];
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNotNil(object, @"should still be in memory cache");
[memObjectForKey1Expectation fulfill];
}];

XCTestExpectation *memObjectForKey2Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #2"];
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNotNil(object, @"should still be in memory cache");
[memObjectForKey2Expectation fulfill];
}];
Expand All @@ -1120,13 +1121,13 @@ - (void)testObjectTTLObjectAccess
// The first object has been expired for 30 seconds and should not exist in the cache anymore.

memObjectForKey1Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #1"];
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNil(object, @"should not be in memory cache");
[memObjectForKey1Expectation fulfill];
}];

memObjectForKey2Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #2"];
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNotNil(object, @"should not be in memory cache");
[memObjectForKey2Expectation fulfill];
}];
Expand Down Expand Up @@ -1162,7 +1163,7 @@ - (void)testObjectTTLObjectEnumeration
// Neither object should be expired at this point and should exist in both caches

__block NSUInteger objCount = 0;
[self.cache.memoryCache enumerateObjectsWithBlock:^(PINMemoryCache *cache, NSString *key, id _Nullable object, BOOL *stop) {
[self.cache.memoryCache enumerateObjectsWithBlock:^(id<PINCaching> cache, NSString *key, id _Nullable object, BOOL *stop) {
objCount++;
}];
XCTAssertEqual(objCount, 2, @"Expected 2 objects, got %tu.", objCount);
Expand All @@ -1179,7 +1180,7 @@ - (void)testObjectTTLObjectEnumeration
// The first object has been expired for 30 seconds and should not exist in the cache anymore.

objCount = 0;
[self.cache.memoryCache enumerateObjectsWithBlock:^(PINMemoryCache *cache, NSString *key, id _Nullable object, BOOL *stop) {
[self.cache.memoryCache enumerateObjectsWithBlock:^(id<PINCaching> cache, NSString *key, id _Nullable object, BOOL *stop) {
objCount++;
}];
XCTAssertEqual(objCount, 1, @"Expected 1 object, got %tu.", objCount);
Expand Down Expand Up @@ -1215,13 +1216,13 @@ - (void)testRemoveExpiredObjects
[NSDate stopMockingDate];

XCTestExpectation *memObjectForKey1Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #1"];
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNil(object, @"should not be in memory cache");
[memObjectForKey1Expectation fulfill];
}];

XCTestExpectation *memObjectForKey2Expectation = [self expectationWithDescription:@"memoryCache objectForKeyAsync - #2"];
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(PINMemoryCache *cache, NSString *key, id object) {
[self.cache.memoryCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id object) {
XCTAssertNotNil(object, @"should not be in memory cache");
[memObjectForKey2Expectation fulfill];
}];
Expand Down Expand Up @@ -1347,7 +1348,7 @@ - (void)testDiskCacheEmptyTrash
}

dispatch_group_enter(group);
[self.cache.diskCache removeAllObjectsAsync:^(PINDiskCache * _Nonnull cache) {
[self.cache.diskCache removeAllObjectsAsync:^(id<PINCaching> _Nonnull cache) {
// Temporary directory should be bigger now since the trash directory is still inside it
NSError *error = nil;
unsigned long long tempDirSize = [[fileManager attributesOfItemAtPath:trashPath error:&error] fileSize];
Expand Down