mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some random unit test failure

This commit is contained in:
DreamPiggy 2024-07-23 17:55:32 +08:00
parent 11271d14ce
commit 368723f8ae
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Tests/Tests/SDImageCacheTests.m
View File

@ -14,6 +14,12 @@
static NSString *kTestImageKeyJPEG = @"TestImageKey.jpg"; static NSString *kTestImageKeyJPEG = @"TestImageKey.jpg";
static NSString *kTestImageKeyPNG = @"TestImageKey.png"; static NSString *kTestImageKeyPNG = @"TestImageKey.png";
@interface SDCallbackQueue ()
@property (nonatomic, strong, nonnull) dispatch_queue_t queue;
@end
@interface SDImageCacheTests : SDTestCase <NSFileManagerDelegate> @interface SDImageCacheTests : SDTestCase <NSFileManagerDelegate>
@end @end
@ -374,12 +380,12 @@ static NSString *kTestImageKeyPNG = @"TestImageKey.png";
[[SDImageCodersManager sharedManager] removeCoder:testDecoder]; [[SDImageCodersManager sharedManager] removeCoder:testDecoder];
[[SDImageCache sharedImageCache] removeImageForKey:key withCompletion:^{ [cache removeImageFromMemoryForKey:key];
[cache removeImageFromDiskForKey:key];
[expectation fulfill]; [expectation fulfill];
}]; }];
}];
[self waitForExpectationsWithCommonTimeout]; [self waitForExpectationsWithTimeout:10 handler:nil];
} }
- (void)test41StoreImageDataToDiskWithCustomFileManager { - (void)test41StoreImageDataToDiskWithCustomFileManager {
@ -671,30 +677,39 @@ static NSString *kTestImageKeyPNG = @"TestImageKey.png";
} }
- (void)test48CacheUseConcurrentIOQueue { - (void)test48CacheUseConcurrentIOQueue {
XCTestExpectation *expectation = [self expectationWithDescription:@"SDImageCache concurrent ioQueue"]; XCTestExpectation *expectation1 = [self expectationWithDescription:@"SDImageCache concurrent ioQueue1"];
expectation.expectedFulfillmentCount = 2; XCTestExpectation *expectation2 = [self expectationWithDescription:@"SDImageCache concurrent ioQueue2"];
SDImageCacheConfig *config = [SDImageCacheConfig new]; SDImageCacheConfig *config = [SDImageCacheConfig new];
dispatch_queue_attr_t attr = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_BACKGROUND, 0); dispatch_queue_attr_t attr = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_BACKGROUND, 0);
config.ioQueueAttributes = attr; config.ioQueueAttributes = attr;
SDImageCache *cache = [[SDImageCache alloc] initWithNamespace:@"Concurrent" diskCacheDirectory:@"/" config:config]; SDImageCache *cache = [[SDImageCache alloc] initWithNamespace:@"Concurrent" diskCacheDirectory:@"/" config:config];
NSData *pngData = [NSData dataWithContentsOfFile:[self testPNGPath]];
// Added test case for custom queue // Added test case for custom queue
[SDCallbackQueue.globalQueue async:^{ SDCallbackQueue *globalQueue = SDCallbackQueue.globalQueue;
SDWebImageContext *context = @{SDWebImageContextCallbackQueue : SDCallbackQueue.currentQueue}; globalQueue.policy = SDCallbackPolicyDispatch;
[globalQueue async:^{
SDCallbackQueue *currentQueue = SDCallbackQueue.currentQueue;
SDWebImageContext *context = @{SDWebImageContextCallbackQueue : currentQueue};
expect(globalQueue.queue).equal(currentQueue.queue);
expect(NSThread.isMainThread).beFalsy(); expect(NSThread.isMainThread).beFalsy();
[cache queryCacheOperationForKey:@"Key1" options:0 context:context done:^(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType) { [cache queryCacheOperationForKey:@"Key1" options:0 context:context done:^(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType) {
expect(data).beNil(); SDCallbackQueue *currentQueue1 = SDCallbackQueue.currentQueue;
expect(globalQueue.queue).equal(currentQueue1.queue);
expect(NSThread.isMainThread).beFalsy(); expect(NSThread.isMainThread).beFalsy();
[expectation fulfill]; [expectation1 fulfill];
}]; }];
[cache storeImageData:pngData forKey:@"Key1" completion:^{ [cache queryCacheOperationForKey:@"Key2" options:0 context:context done:^(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType) {
[expectation fulfill]; SDCallbackQueue *currentQueue2 = SDCallbackQueue.currentQueue;
expect(globalQueue.queue).equal(currentQueue2.queue);
expect(NSThread.isMainThread).beFalsy();
[expectation2 fulfill];
}]; }];
}]; }];
[self waitForExpectationsWithCommonTimeout]; [self waitForExpectationsWithTimeout:10 handler:^(NSError * _Nullable error) {
[cache clearDiskOnCompletion:nil];
}];
} }
#pragma mark - SDImageCache & SDImageCachesManager #pragma mark - SDImageCache & SDImageCachesManager