CCPackageUnzipper and tests cleansed of installData.

Author: NickyWeber

UnitTests/CCPackageUnzipperTests.m

@@ -9,16 +9,14 @@
 #import <XCTest/XCTest.h>
 #import "CCPackageUnzipper.h"
 #import "CCPackage.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 #import "CCPackageConstants.h"
 #import "CCPackageUnzipperDelegate.h"
 #import "CCUnitTestAssertions.h"
+#import "CCPackage_private.h"
 
 @interface CCPackageUnzipperTests : XCTestCase <CCPackageUnzipperDelegate>
 
 @property (nonatomic, strong) CCPackage *package;
-@property (nonatomic, strong) CCPackageInstallData *installData;
 @property (nonatomic, copy) NSString *unzipFolderPath;
 @property (nonatomic, strong) NSCondition *condition;
 @property (nonatomic) BOOL unzipperReturned;
@@ -38,7 +36,6 @@ - (void)setUp
     self.unzipperReturned = NO;
     self.unzippingError = nil;
     self.unzippingSuccessful = NO;
-
     self.unzipFolderPath = [NSTemporaryDirectory() stringByAppendingPathComponent:PACKAGE_REL_UNZIP_FOLDER];
 
     [self createUnzipFolder];
@@ -48,14 +45,9 @@ - (void)setUp
                                                 os:@"iOS"
                                          remoteURL:[NSURL URLWithString:@"http://foo.fake/Foo-iOS-phonehd.zip"]];
 
-    self.installData = [[CCPackageInstallData alloc] initWithPackage:_package];
-    [_package setInstallData:_installData];
-
     NSString *pathToZip = [[NSBundle mainBundle] pathForResource:@"Resources-shared/Packages/testpackage-iOS-phonehd" ofType:@"zip"];
-    _installData.localDownloadURL = [NSURL fileURLWithPath:pathToZip];
-    _installData.unzipURL = [NSURL fileURLWithPath:[_unzipFolderPath stringByAppendingPathComponent:[_package standardIdentifier]]];
-
-    NSLog(@"%@", _installData.unzipURL.path);
+    _package.localDownloadURL = [NSURL fileURLWithPath:pathToZip];
+    _package.unzipURL = [NSURL fileURLWithPath:[_unzipFolderPath stringByAppendingPathComponent:[_package standardIdentifier]]];
 }
 
 - (void)createUnzipFolder
@@ -92,7 +84,7 @@ - (void)testUnzipping
     [self unzipUntilDelegateMethodsReturn:nil];
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSArray *contents = [fileManager contentsOfDirectoryAtURL:[_installData.unzipURL URLByAppendingPathComponent:@"testpackage-iOS-phonehd"]
+    NSArray *contents = [fileManager contentsOfDirectoryAtURL:[_package.unzipURL URLByAppendingPathComponent:@"testpackage-iOS-phonehd"]
                                    includingPropertiesForKeys:@[NSURLNameKey, NSURLIsDirectoryKey]
                                                       options:NSDirectoryEnumerationSkipsSubdirectoryDescendants
                                                         error:nil];
@@ -103,7 +95,7 @@ - (void)testUnzipping
 
 - (void)testUnzippingOfNonExistingArchive
 {
-    _installData.localDownloadURL = [NSURL fileURLWithPath:@"/foo.zip"];
+    _package.localDownloadURL = [NSURL fileURLWithPath:@"/foo.zip"];
 
     [self unzipUntilDelegateMethodsReturn:nil];
 
@@ -126,11 +118,11 @@ - (void)testUnzippingOfInaccessibleUnzipFolder
 - (void)testUnzipOfPasswordProtectedPackage
 {
     NSString *pathToZip = [[NSBundle mainBundle] pathForResource:@"Resources-shared/Packages/password-iOS-phone" ofType:@"zip"];
-    _installData.localDownloadURL = [NSURL fileURLWithPath:pathToZip];
+    _package.localDownloadURL = [NSURL fileURLWithPath:pathToZip];
 
     [self unzipUntilDelegateMethodsReturn:@"foobar"];
 
-    NSString *secretFilePath = [_installData.unzipURL.path stringByAppendingPathComponent:@"password-iOS-phone/secret.txt"];
+    NSString *secretFilePath = [_package.unzipURL.path stringByAppendingPathComponent:@"password-iOS-phone/secret.txt"];
     NSError *error;
     NSString *contentsOfSecretFile = [NSString stringWithContentsOfFile:secretFilePath encoding:NSUTF8StringEncoding error:&error];
     XCTAssertNil(error);

cocos2d/CCPackageUnzipper.m

@@ -2,8 +2,6 @@
 #import "CCPackageUnzipperDelegate.h"
 #import "CCPackage.h"
 #import "SSZipArchive.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 #import "ccMacros.h"
 
 
@@ -43,12 +41,10 @@ - (void)unpackPackage;
 
 - (void)unpackPackageOnQueue:(dispatch_queue_t)queue
 {
-    CCPackageInstallData *installData = [_package installData];
-
     NSAssert(queue != nil, @"queue must not be nil");
-    NSAssert(installData != nil, @"installData must not be nil");
-    NSAssert(installData.localDownloadURL != nil, @"package.localDownloadURL must not be nil");
-    NSAssert(installData.unzipURL != nil, @"package.unzipURL must not be nil");
+    NSAssert(_package != nil, @"package must not be nil");
+    NSAssert(_package.localDownloadURL != nil, @"package.localDownloadURL must not be nil");
+    NSAssert(_package.unzipURL != nil, @"package.unzipURL must not be nil");
 
     self.queue = queue;
     [_package setValue:@(CCPackageStatusUnzipping) forKey:@"status"];
@@ -58,8 +54,8 @@ - (void)unpackPackageOnQueue:(dispatch_queue_t)queue
         CCLOGINFO(@"[PACKAGE/UNZIP][INFO]: Unzipping package... %@", _package);
 
         NSError *error;
-        BOOL success = [SSZipArchive unzipFileAtPath:installData.localDownloadURL.path
-                                       toDestination:installData.unzipURL.path
+        BOOL success = [SSZipArchive unzipFileAtPath:_package.localDownloadURL.path
+                                       toDestination:_package.unzipURL.path
                                            overwrite:YES
                                             password:_password
                                                error:&error