diff --git a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj index 68627ec7..c7cc1ef0 100644 --- a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj +++ b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj @@ -27,6 +27,10 @@ 323B8E2020862322008952BE /* SDWebImageTestLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 323B8E1E20862322008952BE /* SDWebImageTestLoader.m */; }; 324047442271956F007C53E1 /* TestEXIF.png in Resources */ = {isa = PBXBuildFile; fileRef = 324047432271956F007C53E1 /* TestEXIF.png */; }; 324047452271956F007C53E1 /* TestEXIF.png in Resources */ = {isa = PBXBuildFile; fileRef = 324047432271956F007C53E1 /* TestEXIF.png */; }; + 324371372C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */; }; + 324371382C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */; }; + 324371392C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */; }; + 3243713A2C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */; }; 32464A902B7B1833006BE70E /* 1@2x.gif in Resources */ = {isa = PBXBuildFile; fileRef = 32648066250232F7004FA0FC /* 1@2x.gif */; }; 32464A912B7B1833006BE70E /* TestImage.nef in Resources */ = {isa = PBXBuildFile; fileRef = 32F788A2290D252200B57A1C /* TestImage.nef */; }; 32464A922B7B1833006BE70E /* TestImage.heic in Resources */ = {isa = PBXBuildFile; fileRef = 327A418B211D660600495442 /* TestImage.heic */; }; @@ -190,6 +194,7 @@ 323B8E1D20862322008952BE /* SDWebImageTestLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageTestLoader.h; sourceTree = ""; }; 323B8E1E20862322008952BE /* SDWebImageTestLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageTestLoader.m; sourceTree = ""; }; 324047432271956F007C53E1 /* TestEXIF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TestEXIF.png; sourceTree = ""; }; + 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = TestICCProfile.jpg; sourceTree = ""; }; 32464A892B7B0FF2006BE70E /* Tests Vision.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests Vision.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 32515F9724AF1919005E8F79 /* TestImageStatic.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageStatic.webp; sourceTree = ""; }; 32515F9824AF1919005E8F79 /* TestImageAnimated.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageAnimated.webp; sourceTree = ""; }; @@ -340,6 +345,7 @@ isa = PBXGroup; children = ( 32648066250232F7004FA0FC /* 1@2x.gif */, + 324371362C4F9E0900BEB4F5 /* TestICCProfile.jpg */, 3278F5E12B04C1AC0004A6EE /* IndexedPNG.png */, 32C268272B888A4100CA29AE /* RGBA16PNG.png */, 433BBBBA1D7EFA8B0086B6E9 /* MonochromeTestImage.jpg */, @@ -597,6 +603,7 @@ 32464A992B7B1833006BE70E /* TestEXIF.png in Resources */, 32464A922B7B1833006BE70E /* TestImage.heic in Resources */, 32464A9D2B7B1833006BE70E /* TestImageAnimated.apng in Resources */, + 3243713A2C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */, 32464A9F2B7B1833006BE70E /* IndexedPNG.png in Resources */, 32464AA02B7B1833006BE70E /* TestImage.jpg in Resources */, 32464A932B7B1833006BE70E /* TestImageAnimated.heics in Resources */, @@ -627,6 +634,7 @@ 329922872365DC6C00EAFD97 /* TestLoopCount.gif in Resources */, 3299228C2365DC6C00EAFD97 /* TestImage.heif in Resources */, 3234306423E2BAC800C290C8 /* TestImage.pdf in Resources */, + 324371392C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */, 320224F92440C39B00E5B29D /* TestImageLarge.png in Resources */, 321F311027D0DC490042B274 /* TestImage.bmp in Resources */, 329922892365DC6C00EAFD97 /* TestImageLarge.jpg in Resources */, @@ -657,6 +665,7 @@ 324047452271956F007C53E1 /* TestEXIF.png in Resources */, 32B99EA4203B31360017FD66 /* TestImage.jpg in Resources */, 3234306323E2BAC800C290C8 /* TestImage.pdf in Resources */, + 324371382C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */, 320224F82440C39B00E5B29D /* TestImageLarge.png in Resources */, 321F310F27D0DC490042B274 /* TestImage.bmp in Resources */, 32B99EA6203B31360017FD66 /* TestImage.png in Resources */, @@ -687,6 +696,7 @@ 32905E64211D786E00460FCF /* TestImage.heif in Resources */, 43828A451DA67F9900000E62 /* TestImageLarge.jpg in Resources */, 3234306223E2BAC800C290C8 /* TestImage.pdf in Resources */, + 324371372C4F9E0900BEB4F5 /* TestICCProfile.jpg in Resources */, 320224F72440C39B00E5B29D /* TestImageLarge.png in Resources */, 321F310E27D0DC490042B274 /* TestImage.bmp in Resources */, 433BBBB71D7EF8200086B6E9 /* TestImage.gif in Resources */, diff --git a/Tests/Tests/Images/TestICCProfile.jpg b/Tests/Tests/Images/TestICCProfile.jpg new file mode 100644 index 00000000..8c36e70c Binary files /dev/null and b/Tests/Tests/Images/TestICCProfile.jpg differ diff --git a/Tests/Tests/SDAnimatedImageTest.m b/Tests/Tests/SDAnimatedImageTest.m index aa569199..a2916ae5 100644 --- a/Tests/Tests/SDAnimatedImageTest.m +++ b/Tests/Tests/SDAnimatedImageTest.m @@ -325,7 +325,7 @@ static BOOL _isCalled; - (void)test23AnimatedImageViewCategoryProgressive { XCTestExpectation *expectation = [self expectationWithDescription:@"test SDAnimatedImageView view category progressive"]; SDAnimatedImageView *imageView = [SDAnimatedImageView new]; - NSURL *testURL = [NSURL URLWithString:kTestGIFURL]; + NSURL *testURL = [NSURL URLWithString:@"https://raw.githubusercontent.com/onevcat/APNGKit/2.2.0/Tests/APNGKitTests/Resources/General/APNG-cube.apng"]; [SDImageCache.sharedImageCache removeImageFromMemoryForKey:testURL.absoluteString]; [SDImageCache.sharedImageCache removeImageFromDiskForKey:testURL.absoluteString]; [imageView sd_setImageWithURL:testURL placeholderImage:nil options:SDWebImageProgressiveLoad progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) { diff --git a/Tests/Tests/SDTestCase.m b/Tests/Tests/SDTestCase.m index ae7e4550..80afd4e3 100644 --- a/Tests/Tests/SDTestCase.m +++ b/Tests/Tests/SDTestCase.m @@ -14,7 +14,7 @@ const int64_t kMinDelayNanosecond = NSEC_PER_MSEC * 100; // 0.1s NSString *const kTestJPEGURL = @"https://placehold.co/50x50.jpg"; NSString *const kTestProgressiveJPEGURL = @"https://raw.githubusercontent.com/ibireme/YYImage/master/Demo/YYImageDemo/mew_progressive.jpg"; NSString *const kTestPNGURL = @"https://placehold.co/50x50.png"; -NSString *const kTestGIFURL = @"https://media.giphy.com/media/UEsrLdv7ugRTq/giphy.gif"; +NSString *const kTestGIFURL = @"https://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"; NSString *const kTestAPNGPURL = @"https://upload.wikimedia.org/wikipedia/commons/1/14/Animated_PNG_example_bouncing_beach_ball.png"; @implementation SDTestCase diff --git a/Tests/Tests/SDWebImageManagerTests.m b/Tests/Tests/SDWebImageManagerTests.m index d0c009d8..95a12c22 100644 --- a/Tests/Tests/SDWebImageManagerTests.m +++ b/Tests/Tests/SDWebImageManagerTests.m @@ -640,7 +640,8 @@ - (void)test22ThatForceDecodePolicyAutomatic { XCTestExpectation *expectation = [self expectationWithDescription:@"Automatic policy with ICC profile colorspace image should force-decode"]; - NSURL *url = [NSURL URLWithString:@"http://photodb.illusdolphin.net/media/15292/browsertest.jpg"]; + NSString * testImagePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"TestICCProfile" ofType:@"jpg"]; + NSURL *url = [NSURL fileURLWithPath:testImagePath]; SDImageCoderHelper.defaultDecodeSolution = SDImageCoderDecodeSolutionCoreGraphics; // Temp set [SDWebImageManager.sharedManager loadImageWithURL:url options:SDWebImageFromLoaderOnly context:@{SDWebImageContextImageForceDecodePolicy : @(SDImageForceDecodePolicyAutomatic)} progress:nil completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { expect(image).notTo.beNil();