CCPackageInstaller and tests cleansed of install data.

Author: NickyWeber

UnitTests/CCPackageInstallerTests.m

@@ -8,17 +8,14 @@
 
 #import <XCTest/XCTest.h>
 #import "CCPackage.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 #import "CCPackageInstaller.h"
-#import "CCDirector.h"
-#import "CCFileUtils.h"
 #import "CCPackageConstants.h"
+#import "CCPackage_private.h"
+
 
 @interface CCPackageInstallerTests : XCTestCase
 
 @property (nonatomic, strong) CCPackage *package;
-@property (nonatomic, strong) CCPackageInstallData *installData;
 @property (nonatomic, copy) NSString *installPath;
 @property (nonatomic, strong) CCPackageInstaller *installer;
 
@@ -36,9 +33,6 @@ - (void)setUp
                                                 os:@"iOS"
                                          remoteURL:[NSURL URLWithString:@"http://test.foo"]];
 
-    self.installData = [[CCPackageInstallData alloc] initWithPackage:_package];
-    [_package setInstallData:_installData];
-
     NSString *cachesPath = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
     self.installPath = [cachesPath stringByAppendingPathComponent:@"tests.Packages"];
 
@@ -97,7 +91,7 @@ - (void)testInstallWithoutEnablingPackage
 - (void)testInstallFailingUnzippedPackageDoesNotExist
 {
     NSString *pathToPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/DOES_NOT_EXIST"];
-    _installData.unzipURL = [NSURL fileURLWithPath:pathToPackage];
+    _package.unzipURL = [NSURL fileURLWithPath:pathToPackage];
 
     NSError *error;
     BOOL success = [_installer installWithError:&error];
@@ -130,9 +124,9 @@ - (void)setupInstallablePackage
 {
     NSString *pathToPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/testpackage-iOS-phonehd_unzipped"];
 
-    _installData.unzipURL = [NSURL fileURLWithPath:pathToPackage];
-    _installData.folderName = @"testpackage-iOS-phonehd";
-    _installData.enableOnDownload = NO;
+    _package.unzipURL = [NSURL fileURLWithPath:pathToPackage];
+    _package.folderName = @"testpackage-iOS-phonehd";
+    _package.enableOnDownload = NO;
 }
 
 @end

cocos2d/CCPackageInstaller.m

@@ -1,9 +1,6 @@
 #import "CCPackageInstaller.h"
 #import "CCPackageConstants.h"
 #import "CCPackage.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
-#import "CCPackageCocos2dEnabler.h"
 #import "ccMacros.h"
 
 
@@ -34,10 +31,13 @@ - (instancetype)initWithPackage:(CCPackage *)package installPath:(NSString *)ins
 
 - (BOOL)installWithError:(NSError **)error
 {
+
+/*  TODO
     CCPackageInstallData *installData = [_package installData];
 
     NSAssert(installData != nil, @"installData must not be nil");
     NSAssert(installData.unzipURL != nil, @"installData.unzipURL must not be nil");
+*/
 
     if (![self unzippedPackageFolderExists:error])
     {
@@ -58,16 +58,17 @@ - (BOOL)installWithError:(NSError **)error
 
 - (BOOL)movePackageToInstallPathWithError:(NSError **)error
 {
-    CCPackageInstallData *installData = [_package installData];
+    // TODO
+    // CCPackageInstallData *installData = [_package installData];
 
-    NSAssert(installData.unzipURL != nil, @"installData.unzipURL must not be nil.");
-    NSAssert(installData.folderName != nil, @"installData.folderName must not be nil.");
+    NSAssert(_package.unzipURL != nil, @"package.unzipURL must not be nil.");
+    NSAssert(_package.folderName != nil, @"package.folderName must not be nil.");
 
-    [_package setValue:[NSURL fileURLWithPath:[_installPath stringByAppendingPathComponent:installData.folderName]] forKey:@"installURL"];
+    [_package setValue:[NSURL fileURLWithPath:[_installPath stringByAppendingPathComponent:_package.folderName]] forKey:@"installURL"];
 
     NSError *errorMove;
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    if (![fileManager moveItemAtPath:[installData.unzipURL.path stringByAppendingPathComponent:installData.folderName]
+    if (![fileManager moveItemAtPath:[_package.unzipURL.path stringByAppendingPathComponent:_package.folderName]
                               toPath:_package.installURL.path
                                error:&errorMove])
     {
@@ -88,15 +89,18 @@ - (BOOL)movePackageToInstallPathWithError:(NSError **)error
 
 - (BOOL)unzippedPackageFolderExists:(NSError **)error
 {
+/*  TODO
     CCPackageInstallData *installData = [_package installData];
     NSAssert(installData.unzipURL, @"installData.unzipURL must not be nil");
+*/
+    NSAssert(_package.unzipURL != nil, @"package.unzipURL must not be nil.");
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    if (![fileManager fileExistsAtPath:installData.unzipURL.path])
+    if (![fileManager fileExistsAtPath:_package.unzipURL.path])
     {
         [self setNewError:error
                      code:PACKAGE_ERROR_INSTALL_UNZIPPED_PACKAGE_NOT_FOUND
-                  message:[NSString stringWithFormat:@"Package to install not found at path \"%@\"", installData.unzipURL]];
+                  message:[NSString stringWithFormat:@"Package to install not found at path \"%@\"", _package.unzipURL]];
 
         CCLOG(@"[PACKAGE/INSTALL][ERROR] Moving unzipped package to installation folder, package already exists! %@", *error);
         return NO;