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

Try to fix the test case `test15DownloaderLIFOExecutionOrder`, because the queue dispatch delay, we add the next 8-14 urls just after url 7 start downloading

This commit is contained in:
DreamPiggy 2019-09-30 12:36:24 +08:00
parent 66dc0ee4e8
commit e8ee90b85e
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tests/Tests/SDWebImageDownloaderTests.m
View File

@ -12,6 +12,8 @@
#import "SDWebImageTestCoder.h" #import "SDWebImageTestCoder.h"
#import "SDWebImageTestLoader.h" #import "SDWebImageTestLoader.h"
#define kPlaceholderTestURLTemplate @"https://via.placeholder.com/10000x%d.png"
/** /**
* Category for SDWebImageDownloader so we can access the operationClass * Category for SDWebImageDownloader so we can access the operationClass
*/ */
@ -259,7 +261,7 @@
SDWebImageDownloader *downloader = [[SDWebImageDownloader alloc] initWithConfig:config]; SDWebImageDownloader *downloader = [[SDWebImageDownloader alloc] initWithConfig:config];
self.executionOrderURLs = [NSMutableArray array]; self.executionOrderURLs = [NSMutableArray array];
// Input order: 1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7 (wait for 7 finished and immediately) -> 8 -> 9 -> 10 -> 11 -> 12 -> 13 -> 14 // Input order: 1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7 (wait for 7 started and immediately) -> 8 -> 9 -> 10 -> 11 -> 12 -> 13 -> 14
// Expected result: 1 (first one has no dependency) -> 7 -> 14 -> 13 -> 12 -> 11 -> 10 -> 9 -> 8 -> 6 -> 5 -> 4 -> 3 -> 2 // Expected result: 1 (first one has no dependency) -> 7 -> 14 -> 13 -> 12 -> 11 -> 10 -> 9 -> 8 -> 6 -> 5 -> 4 -> 3 -> 2
int waitIndex = 7; int waitIndex = 7;
int maxIndex = 14; int maxIndex = 14;
@ -272,9 +274,9 @@
for (int i = 1; i <= waitIndex; i++) { for (int i = 1; i <= waitIndex; i++) {
[self createLIFOOperationWithDownloader:downloader expectation:expectations[i-1] index:i]; [self createLIFOOperationWithDownloader:downloader expectation:expectations[i-1] index:i];
} }
[[NSNotificationCenter defaultCenter] addObserverForName:SDWebImageDownloadFinishNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { [[NSNotificationCenter defaultCenter] addObserverForName:SDWebImageDownloadStartNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
SDWebImageDownloaderOperation *operation = note.object; SDWebImageDownloaderOperation *operation = note.object;
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", waitIndex]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, waitIndex]];
if (![operation.request.URL isEqual:url]) { if (![operation.request.URL isEqual:url]) {
return; return;
} }
@ -291,46 +293,40 @@
- (void)createLIFOOperationWithDownloader:(SDWebImageDownloader *)downloader expectation:(XCTestExpectation *)expectation index:(int)index { - (void)createLIFOOperationWithDownloader:(SDWebImageDownloader *)downloader expectation:(XCTestExpectation *)expectation index:(int)index {
int waitIndex = 7; int waitIndex = 7;
int maxIndex = 14; int maxIndex = 14;
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", index]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, index]];
[self.executionOrderURLs addObject:url]; [self.executionOrderURLs addObject:url];
[downloader downloadImageWithURL:url options:0 progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) { [downloader downloadImageWithURL:url options:0 progress:nil completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, BOOL finished) {
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", waitIndex]];
if ([self.executionOrderURLs containsObject:url]) {
return;
}
} completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, BOOL finished) {
printf("URL%d finished\n", index); printf("URL%d finished\n", index);
NSMutableArray *pendingArray = [NSMutableArray array]; NSMutableArray *pendingArray = [NSMutableArray array];
if (index == 1) { if (index == 1) {
// 1 // 1
for (int j = 1; j <= waitIndex; j++) { for (int j = 1; j <= waitIndex; j++) {
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", j]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, j]];
[pendingArray addObject:url]; [pendingArray addObject:url];
} }
} else if (index == waitIndex) { } else if (index == waitIndex) {
// 7 // 7
for (int j = 2; j <= maxIndex; j++) { for (int j = 2; j <= maxIndex; j++) {
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", j]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, j]];
[pendingArray addObject:url]; [pendingArray addObject:url];
} }
} else if (index > waitIndex) { } else if (index > waitIndex) {
// 8-14 // 8-14
for (int j = 2; j <= index; j++) { for (int j = 2; j <= index; j++) {
if (j == waitIndex) continue; if (j == waitIndex) continue;
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", j]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, j]];
[pendingArray addObject:url]; [pendingArray addObject:url];
} }
} else if (index < waitIndex) { } else if (index < waitIndex) {
// 2-6 // 2-6
for (int j = 2; j <= index; j++) { for (int j = 2; j <= index; j++) {
if (j == waitIndex) continue; if (j == waitIndex) continue;
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", j]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, j]];
[pendingArray addObject:url]; [pendingArray addObject:url];
} }
} }
expect(self.executionOrderURLs).equal(pendingArray); expect(self.executionOrderURLs).equal(pendingArray);
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://via.placeholder.com/1000x%d.png", index]]; NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:kPlaceholderTestURLTemplate, index]];
[self.executionOrderURLs removeObject:url]; [self.executionOrderURLs removeObject:url];
[expectation fulfill]; [expectation fulfill];
}]; }];