Merge remote-tracking branch 'upstream/develop' into develop

Author: Thayer J Andrews

UnitTests/CCFileUtilTests.m

@@ -7,7 +7,7 @@
 
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
-
+#import "CCUnitTestAssertions.h"
 
 
 @interface CCFileUtilTests : XCTestCase
@@ -20,10 +20,29 @@ +(void) resetSingleton;
 
 @implementation CCFileUtilTests
 
+- (void)setUp
+{
+    [super setUp];
+
+    [CCFileUtils resetSingleton];
+
+    CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
+
+    sharedFileUtils.directoriesDict =
+            [@{CCFileUtilsSuffixiPad : @"resources-tablet",
+                    CCFileUtilsSuffixiPadHD : @"resources-tablethd",
+                    CCFileUtilsSuffixiPhone : @"resources-phone",
+                    CCFileUtilsSuffixiPhoneHD : @"resources-phonehd",
+                    CCFileUtilsSuffixiPhone5 : @"resources-phone",
+                    CCFileUtilsSuffixiPhone5HD : @"resources-phonehd",
+                    CCFileUtilsSuffixDefault : @""} mutableCopy];
+
+    sharedFileUtils.searchMode = CCFileUtilsSearchModeDirectory;
+    [sharedFileUtils buildSearchResolutionsOrder];
+}
 
 -(void)testFullPathForFilenameMissingFile
 {
-	[CCFileUtils resetSingleton];
 	CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
 
 	NSString *path = [sharedFileUtils fullPathForFilename:@"file that does not exist"];
@@ -33,8 +52,6 @@ -(void)testFullPathForFilenameMissingFile
 	// File does not exist in this directory
 	path = [sharedFileUtils fullPathForFilename:@"powered.png"];
 	XCTAssertTrue(path == nil, @"");
-
-	
 }
 
 // XCode Unit tests look inside the target's test application bundle - not the unit test app bundle, but the "cocos2d-tests-ios.app" bundle.
@@ -48,20 +65,64 @@ -(void)testFullPathForFilename
 	XCTAssertTrue(path != nil, @"");
 }
 
+- (void)testFullPathsOfFileNameInAllSearchPaths
+{
+    NSString *pathToUnzippedPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/testpackage-iOS-phonehd_unzipped/testpackage-iOS-phonehd"];
+    NSString *pathToUnzippedPackage2 = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/anotherpackage-iOS-phonehd_unzipped/anotherpackage-iOS-phonehd"];
+
+    [CCFileUtils sharedFileUtils].searchPath = @[pathToUnzippedPackage, pathToUnzippedPackage2];
+
+    NSArray *paths = [[CCFileUtils sharedFileUtils] fullPathsOfFileNameInAllSearchPaths:@"fileLookup.plist"];
+    XCTAssertEqual(paths.count, 2);
+}
+
+- (void)testLoadFileNameLookupsInAllSearchPaths
+{
+    NSString *pathToPackage = [NSTemporaryDirectory() stringByAppendingPathComponent:@"pack1"];
+    NSString *pathToPackage2 = [NSTemporaryDirectory() stringByAppendingPathComponent:@"pack2"];
+
+    [CCFileUtils sharedFileUtils].searchPath = @[pathToPackage, pathToPackage2];
+
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    [fileManager createDirectoryAtPath:pathToPackage withIntermediateDirectories:YES attributes:nil error:nil];
+    [fileManager createDirectoryAtPath:pathToPackage2 withIntermediateDirectories:YES attributes:nil error:nil];
+
+    NSDictionary *lookup1 = @{
+        @"filenames": @{
+            @"foo.wav" : @"foo.mp4"
+        },
+        @"metadata": @{
+            @"version" : @1
+        }
+    };
+    [lookup1 writeToFile:[pathToPackage stringByAppendingPathComponent:@"fileLookup.plist"] atomically:YES];
+
+    NSDictionary *lookup2 = @{
+        @"filenames": @{
+            @"baa.psd" : @"baa.png"
+        },
+        @"metadata": @{
+            @"version" : @1
+        }
+    };
+    [lookup2 writeToFile:[pathToPackage2 stringByAppendingPathComponent:@"fileLookup.plist"] atomically:YES];
+
+    [[CCFileUtils sharedFileUtils] loadFileNameLookupsInAllSearchPathsWithName:@"fileLookup.plist"];
+    NSDictionary *filenameLookup = [CCFileUtils sharedFileUtils].filenameLookup;
+    CCAssertEqualStrings(filenameLookup[@"baa.psd"], @"baa.png");
+    CCAssertEqualStrings(filenameLookup[@"foo.wav"], @"foo.mp4");
+}
+
 -(void)testCCFileUtilsSearchModeSuffix
 {
-	[CCFileUtils resetSingleton];
 	CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
 	sharedFileUtils.searchMode = CCFileUtilsSearchModeSuffix;
 
 	XCTAssertTrue([sharedFileUtils fullPathForFilename:@"Images/powered.png"] != nil, @"");
-
-	
 }
 
 -(void)testCCFileUtilsSearchModeDirectory
 {
-	[CCFileUtils resetSingleton];
 	CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
 	sharedFileUtils.searchMode = CCFileUtilsSearchModeDirectory;
 
@@ -80,20 +141,16 @@ -(void)testCCFileUtilsSearchModeDirectory
 
 -(void)testCustomSearchPathsForExtensions
 {
-	[CCFileUtils resetSingleton];
 	CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
 	[sharedFileUtils purgeCachedEntries];
 	[sharedFileUtils setSearchPath: @[ @"Images", kCCFileUtilsDefaultSearchPath] ];
 
 	XCTAssertTrue( [sharedFileUtils fullPathForFilename:@"Images/powered.png" contentScale:nil] != nil, @"");
 	XCTAssertTrue( [sharedFileUtils fullPathForFilename:@"powered.png" contentScale:nil] != nil, @"Search path 'Images' didn't work.");
-
 }
 
-
 -(void)testContentScaleLoading
 {
-	[CCFileUtils resetSingleton];
 	CCFileUtils *sharedFileUtils = [CCFileUtils sharedFileUtils];
 	sharedFileUtils.searchMode = CCFileUtilsSearchModeSuffix;
 
@@ -103,15 +160,11 @@ -(void)testContentScaleLoading
 	[ (NSMutableArray*) [sharedFileUtils searchResolutionsOrder] removeAllObjects];
 	[ (NSMutableArray*) [sharedFileUtils searchResolutionsOrder] addObject:CCFileUtilsSuffixiPhoneHD];
 
-	
 	CGFloat scale = 0.0;
 
 	NSString *path1 = [sharedFileUtils fullPathForFilename:@"Images/blocks.png" contentScale:&scale];
 	XCTAssertTrue(scale == 2.0, @"");
 	XCTAssertTrue(path1 != nil, @"");
-
 }
 
-
-
 @end

UnitTests/CCPackageDownloadManagerTests.m

@@ -13,6 +13,7 @@
 #import "CCDirector.h"
 #import "AppDelegate.h"
 #import "CCUnitTestAssertions.h"
+#import "CCPackage_private.h"
 
 @interface CCPackageDownloadManagerTestURLProtocol : NSURLProtocol @end
 
@@ -175,6 +176,22 @@ - (void)testEnqueuePausedPackage
     [self assertPackagesDownloadedAndContentsAreAsExpected:@[package1]];
 }
 
+- (void)testResumeDownloadAfterLoadingPackages
+{
+    // This test aims at the situation when coming back from persistency and
+    // the package manager resume downloads.
+
+    CCPackage *package = [self completePackageWithName:@"package"];
+    package.status = CCPackageStatusDownloadPaused;
+    package.localDownloadURL = [NSURL fileURLWithPath:[_downloadManager.downloadPath stringByAppendingPathComponent:@"foo.zip"]];
+
+    [_downloadManager enqueuePackageForDownload:package];
+
+    [self waitUntilDelegateReturns];
+
+    [self assertPackagesDownloadedAndContentsAreAsExpected:@[package]];
+}
+
 - (void)waitUntilDelegateReturns
 {
     while (!_allDownloadsReturned)

UnitTests/CCPackageDownloadTests.m

@@ -298,6 +298,7 @@ - (void)testCancelDownload
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
     XCTAssertFalse([fileManager fileExistsAtPath:_download.localURL.path]);
+    XCTAssertEqual(_package.status, CCPackageStatusInitial);
 }
 
 - (void)testPauseDownload

UnitTests/CCPackageHelperTests.m

@@ -20,7 +20,6 @@ @interface CCPackageHelperTests : XCTestCase
 
 @implementation CCPackageHelperTests
 
-
 - (void)testDefaultResolution
 {
     // Standard test

UnitTests/CCPackageInstallerTests.m

@@ -122,10 +122,21 @@ - (void)testInstallFailingPackageAlreadyExists
 
 - (void)setupInstallablePackage
 {
+    _package.folderName = @"testpackage-iOS-phonehd";
+
     NSString *pathToPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/testpackage-iOS-phonehd_unzipped"];
+    NSString *unzipPath = [NSTemporaryDirectory() stringByAppendingPathComponent:_package.folderName];
+
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error;
+    [fileManager removeItemAtPath:unzipPath error:nil];
+    if (![fileManager copyItemAtPath:pathToPackage toPath:unzipPath error:&error])
+    {
+        NSLog(@"%@", error);
+    }
+
+    _package.unzipURL = [NSURL fileURLWithPath:unzipPath];
 
-    _package.unzipURL = [NSURL fileURLWithPath:pathToPackage];
-    _package.folderName = @"testpackage-iOS-phonehd";
     _package.enableOnDownload = NO;
 }