ios / yh_sdwebimage · Commits

Go to a project

Authored by Bogdan Poplauschi
Commit 460c2e01a151abaeaefb2aa94eef0eff0a1677d1 1 parent e1840c32

Tests project: CocoaPods 1.1.0, dynamic frameworks, include all the code from SD… 

…WebImage (MapKit and GIF), updated imports so they work fine
Inline Side-by-side
Showing 8 changed files with 34 additions and 32 deletions
1 source 'https://github.com/CocoaPods/Specs.git' 1 source 'https://github.com/CocoaPods/Specs.git'
2 2
  3 +use_frameworks!
  4 +
3 xcodeproj 'SDWebImage Tests' 5 xcodeproj 'SDWebImage Tests'
4 workspace '../SDWebImage' 6 workspace '../SDWebImage'
5 7
6 target 'Tests' do 8 target 'Tests' do
7 - platform :ios, '7.0' 9 + platform :ios, '8.0'
8 pod 'Expecta' 10 pod 'Expecta'
9 - pod 'OCMockito'  
10 pod 'SDWebImage/WebP', :path => '../' 11 pod 'SDWebImage/WebP', :path => '../'
  12 + pod 'SDWebImage/MapKit', :path => '../'
  13 + pod 'SDWebImage/GIF', :path => '../'
11 14
12 end 15 end
@@ -7,13 +7,13 @@ @@ -7,13 +7,13 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - 0D87E1F83BD319CEC7622E9F /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0462A7F023A057322E59B3C5 /* libPods-Tests.a */; };  
11 1E3C51E919B46E370092B5E6 /* SDWebImageDownloaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E3C51E819B46E370092B5E6 /* SDWebImageDownloaderTests.m */; }; 10 1E3C51E919B46E370092B5E6 /* SDWebImageDownloaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E3C51E819B46E370092B5E6 /* SDWebImageDownloaderTests.m */; };
12 433BBBB51D7EF5C00086B6E9 /* SDWebImageDecoderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 433BBBB41D7EF5C00086B6E9 /* SDWebImageDecoderTests.m */; }; 11 433BBBB51D7EF5C00086B6E9 /* SDWebImageDecoderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 433BBBB41D7EF5C00086B6E9 /* SDWebImageDecoderTests.m */; };
13 433BBBB71D7EF8200086B6E9 /* TestImage.gif in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBB61D7EF8200086B6E9 /* TestImage.gif */; }; 12 433BBBB71D7EF8200086B6E9 /* TestImage.gif in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBB61D7EF8200086B6E9 /* TestImage.gif */; };
14 433BBBB91D7EF8260086B6E9 /* TestImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBB81D7EF8260086B6E9 /* TestImage.png */; }; 13 433BBBB91D7EF8260086B6E9 /* TestImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBB81D7EF8260086B6E9 /* TestImage.png */; };
15 433BBBBB1D7EFA8B0086B6E9 /* MonochromeTestImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBBA1D7EFA8B0086B6E9 /* MonochromeTestImage.jpg */; }; 14 433BBBBB1D7EFA8B0086B6E9 /* MonochromeTestImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 433BBBBA1D7EFA8B0086B6E9 /* MonochromeTestImage.jpg */; };
16 4369C1D11D97F80F007E863A /* SDWebImagePrefetcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4369C1D01D97F80F007E863A /* SDWebImagePrefetcherTests.m */; }; 15 4369C1D11D97F80F007E863A /* SDWebImagePrefetcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4369C1D01D97F80F007E863A /* SDWebImagePrefetcherTests.m */; };
  16 + 53F0240D24D359127872F512 /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DAAA77E3CA7387F702040D9 /* Pods_Tests.framework */; };
17 5F7F38AD1AE2A77A00B0E330 /* TestImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5F7F38AC1AE2A77A00B0E330 /* TestImage.jpg */; }; 17 5F7F38AD1AE2A77A00B0E330 /* TestImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5F7F38AC1AE2A77A00B0E330 /* TestImage.jpg */; };
18 DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D56195472AA00390AB0 /* XCTest.framework */; }; 18 DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D56195472AA00390AB0 /* XCTest.framework */; };
19 DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D58195472AA00390AB0 /* Foundation.framework */; }; 19 DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA248D58195472AA00390AB0 /* Foundation.framework */; };
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 /* End PBXBuildFile section */ 25 /* End PBXBuildFile section */
26 26
27 /* Begin PBXFileReference section */ 27 /* Begin PBXFileReference section */
28 - 0462A7F023A057322E59B3C5 /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 28 + 1DAAA77E3CA7387F702040D9 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
29 1E3C51E819B46E370092B5E6 /* SDWebImageDownloaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderTests.m; sourceTree = "<group>"; }; 29 1E3C51E819B46E370092B5E6 /* SDWebImageDownloaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderTests.m; sourceTree = "<group>"; };
30 433BBBB41D7EF5C00086B6E9 /* SDWebImageDecoderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDecoderTests.m; sourceTree = "<group>"; }; 30 433BBBB41D7EF5C00086B6E9 /* SDWebImageDecoderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDecoderTests.m; sourceTree = "<group>"; };
31 433BBBB61D7EF8200086B6E9 /* TestImage.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = TestImage.gif; sourceTree = "<group>"; }; 31 433BBBB61D7EF8200086B6E9 /* TestImage.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = TestImage.gif; sourceTree = "<group>"; };
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */, 55 DA248D57195472AA00390AB0 /* XCTest.framework in Frameworks */,
56 DA248D5B195472AA00390AB0 /* UIKit.framework in Frameworks */, 56 DA248D5B195472AA00390AB0 /* UIKit.framework in Frameworks */,
57 DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */, 57 DA248D59195472AA00390AB0 /* Foundation.framework in Frameworks */,
58 - 0D87E1F83BD319CEC7622E9F /* libPods-Tests.a in Frameworks */, 58 + 53F0240D24D359127872F512 /* Pods_Tests.framework in Frameworks */,
59 ); 59 );
60 runOnlyForDeploymentPostprocessing = 0; 60 runOnlyForDeploymentPostprocessing = 0;
61 }; 61 };
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 DA248D56195472AA00390AB0 /* XCTest.framework */, 95 DA248D56195472AA00390AB0 /* XCTest.framework */,
96 DA248D58195472AA00390AB0 /* Foundation.framework */, 96 DA248D58195472AA00390AB0 /* Foundation.framework */,
97 DA248D5A195472AA00390AB0 /* UIKit.framework */, 97 DA248D5A195472AA00390AB0 /* UIKit.framework */,
98 - 0462A7F023A057322E59B3C5 /* libPods-Tests.a */, 98 + 1DAAA77E3CA7387F702040D9 /* Pods_Tests.framework */,
99 ); 99 );
100 name = Frameworks; 100 name = Frameworks;
101 sourceTree = "<group>"; 101 sourceTree = "<group>";
@@ -135,12 +135,12 @@ @@ -135,12 +135,12 @@
135 isa = PBXNativeTarget; 135 isa = PBXNativeTarget;
136 buildConfigurationList = DA248D67195472AA00390AB0 /* Build configuration list for PBXNativeTarget "Tests" */; 136 buildConfigurationList = DA248D67195472AA00390AB0 /* Build configuration list for PBXNativeTarget "Tests" */;
137 buildPhases = ( 137 buildPhases = (
138 - 09522B7196293172D6408744 /* 📦 Check Pods Manifest.lock */, 138 + 09522B7196293172D6408744 /* [CP] Check Pods Manifest.lock */,
139 DA248D4F195472AA00390AB0 /* Sources */, 139 DA248D4F195472AA00390AB0 /* Sources */,
140 DA248D50195472AA00390AB0 /* Frameworks */, 140 DA248D50195472AA00390AB0 /* Frameworks */,
141 DA248D51195472AA00390AB0 /* Resources */, 141 DA248D51195472AA00390AB0 /* Resources */,
142 - C86216497B5A0BA9501E2C07 /* 📦 Embed Pods Frameworks */,  
143 - 85E5D3885A03BFC23B050908 /* 📦 Copy Pods Resources */, 142 + C86216497B5A0BA9501E2C07 /* [CP] Embed Pods Frameworks */,
  143 + 85E5D3885A03BFC23B050908 /* [CP] Copy Pods Resources */,
144 ); 144 );
145 buildRules = ( 145 buildRules = (
146 ); 146 );
@@ -192,29 +192,29 @@ @@ -192,29 +192,29 @@
192 /* End PBXResourcesBuildPhase section */ 192 /* End PBXResourcesBuildPhase section */
193 193
194 /* Begin PBXShellScriptBuildPhase section */ 194 /* Begin PBXShellScriptBuildPhase section */
195 - 09522B7196293172D6408744 /* 📦 Check Pods Manifest.lock */ = { 195 + 09522B7196293172D6408744 /* [CP] Check Pods Manifest.lock */ = {
196 isa = PBXShellScriptBuildPhase; 196 isa = PBXShellScriptBuildPhase;
197 buildActionMask = 2147483647; 197 buildActionMask = 2147483647;
198 files = ( 198 files = (
199 ); 199 );
200 inputPaths = ( 200 inputPaths = (
201 ); 201 );
202 - name = "📦 Check Pods Manifest.lock"; 202 + name = "[CP] Check Pods Manifest.lock";
203 outputPaths = ( 203 outputPaths = (
204 ); 204 );
205 runOnlyForDeploymentPostprocessing = 0; 205 runOnlyForDeploymentPostprocessing = 0;
206 shellPath = /bin/sh; 206 shellPath = /bin/sh;
207 - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; 207 + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
208 showEnvVarsInLog = 0; 208 showEnvVarsInLog = 0;
209 }; 209 };
210 - 85E5D3885A03BFC23B050908 /* 📦 Copy Pods Resources */ = { 210 + 85E5D3885A03BFC23B050908 /* [CP] Copy Pods Resources */ = {
211 isa = PBXShellScriptBuildPhase; 211 isa = PBXShellScriptBuildPhase;
212 buildActionMask = 2147483647; 212 buildActionMask = 2147483647;
213 files = ( 213 files = (
214 ); 214 );
215 inputPaths = ( 215 inputPaths = (
216 ); 216 );
217 - name = "📦 Copy Pods Resources"; 217 + name = "[CP] Copy Pods Resources";
218 outputPaths = ( 218 outputPaths = (
219 ); 219 );
220 runOnlyForDeploymentPostprocessing = 0; 220 runOnlyForDeploymentPostprocessing = 0;
@@ -222,14 +222,14 @@ @@ -222,14 +222,14 @@
222 shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n"; 222 shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n";
223 showEnvVarsInLog = 0; 223 showEnvVarsInLog = 0;
224 }; 224 };
225 - C86216497B5A0BA9501E2C07 /* 📦 Embed Pods Frameworks */ = { 225 + C86216497B5A0BA9501E2C07 /* [CP] Embed Pods Frameworks */ = {
226 isa = PBXShellScriptBuildPhase; 226 isa = PBXShellScriptBuildPhase;
227 buildActionMask = 2147483647; 227 buildActionMask = 2147483647;
228 files = ( 228 files = (
229 ); 229 );
230 inputPaths = ( 230 inputPaths = (
231 ); 231 );
232 - name = "📦 Embed Pods Frameworks"; 232 + name = "[CP] Embed Pods Frameworks";
233 outputPaths = ( 233 outputPaths = (
234 ); 234 );
235 runOnlyForDeploymentPostprocessing = 0; 235 runOnlyForDeploymentPostprocessing = 0;
@@ -271,7 +271,7 @@ @@ -271,7 +271,7 @@
271 isa = XCBuildConfiguration; 271 isa = XCBuildConfiguration;
272 buildSettings = { 272 buildSettings = {
273 ENABLE_TESTABILITY = YES; 273 ENABLE_TESTABILITY = YES;
274 - IPHONEOS_DEPLOYMENT_TARGET = 7.0; 274 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
275 ONLY_ACTIVE_ARCH = YES; 275 ONLY_ACTIVE_ARCH = YES;
276 }; 276 };
277 name = Debug; 277 name = Debug;
@@ -279,7 +279,7 @@ @@ -279,7 +279,7 @@
279 DA248D4B1954721A00390AB0 /* Release */ = { 279 DA248D4B1954721A00390AB0 /* Release */ = {
280 isa = XCBuildConfiguration; 280 isa = XCBuildConfiguration;
281 buildSettings = { 281 buildSettings = {
282 - IPHONEOS_DEPLOYMENT_TARGET = 7.0; 282 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
283 }; 283 };
284 name = Release; 284 name = Release;
285 }; 285 };
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 10
11 11
12 #import <XCTest/XCTest.h> 12 #import <XCTest/XCTest.h>
13 -#import <Expecta.h> 13 +#import <Expecta/Expecta.h>
14 14
15 -#import "SDImageCache.h" 15 +#import <SDWebImage/SDImageCache.h>
16 16
17 NSString *kImageTestKey = @"TestImageKey.jpg"; 17 NSString *kImageTestKey = @"TestImageKey.jpg";
18 18
@@ -11,9 +11,8 @@ @@ -11,9 +11,8 @@
11 11
12 12
13 #import <XCTest/XCTest.h> 13 #import <XCTest/XCTest.h>
14 -#import <Expecta.h>  
15 -  
16 -#import "SDWebImageDecoder.h" 14 +#import <Expecta/Expecta.h>
  15 +#import <SDWebImage/SDWebImageDecoder.h>
17 16
18 @interface SDWebImageDecoderTests : XCTestCase 17 @interface SDWebImageDecoderTests : XCTestCase
19 18
@@ -11,10 +11,10 @@ @@ -11,10 +11,10 @@
11 11
12 12
13 #import <XCTest/XCTest.h> 13 #import <XCTest/XCTest.h>
14 -#import <Expecta.h> 14 +#import <Expecta/Expecta.h>
15 15
16 -#import "SDWebImageDownloader.h"  
17 -#import "SDWebImageDownloaderOperation.h" 16 +#import <SDWebImage/SDWebImageDownloader.h>
  17 +#import <SDWebImage/SDWebImageDownloaderOperation.h>
18 18
19 /** 19 /**
20 * Category for SDWebImageDownloader so we can access the operationClass 20 * Category for SDWebImageDownloader so we can access the operationClass
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 10
11 11
12 #import <XCTest/XCTest.h> 12 #import <XCTest/XCTest.h>
13 -#import <Expecta.h> 13 +#import <Expecta/Expecta.h>
14 14
15 -#import "SDWebImageManager.h" 15 +#import <SDWebImage/SDWebImageManager.h>
16 16
17 NSString *workingImageURL = @"http://s3.amazonaws.com/fast-image-cache/demo-images/FICDDemoImage001.jpg"; 17 NSString *workingImageURL = @"http://s3.amazonaws.com/fast-image-cache/demo-images/FICDDemoImage001.jpg";
18 18
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 11
12 12
13 #import <XCTest/XCTest.h> 13 #import <XCTest/XCTest.h>
14 -#import <Expecta.h> 14 +#import <Expecta/Expecta.h>
15 15
16 -#import "SDWebImagePrefetcher.h" 16 +#import <SDWebImage/SDWebImagePrefetcher.h>
17 17
18 @interface SDWebImagePrefetcherTests : XCTestCase 18 @interface SDWebImagePrefetcherTests : XCTestCase
19 19
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 10
11 11
12 #import <XCTest/XCTest.h> 12 #import <XCTest/XCTest.h>
13 -#import <Expecta.h> 13 +#import <Expecta/Expecta.h>
14 14
15 -#import "UIImage+MultiFormat.h" 15 +#import <SDWebImage/UIImage+MultiFormat.h>
16 16
17 17
18 @interface UIImageMultiFormatTests : XCTestCase 18 @interface UIImageMultiFormatTests : XCTestCase