Refactoring: Unit tests tidying up.

Author: NickyWeber

UnitTests/CCPackage+InstallDataTests.m

@@ -33,6 +33,9 @@ - (void)setUp
     self.installData = [[CCPackageInstallData alloc] initWithPackage:_package];
 }
 
+
+#pragma mark - Tests
+
 - (void)testSetAndGetInstallData
 {
     [_package setInstallData:_installData];

UnitTests/CCPackageCocos2dEnablerTests.m

@@ -39,6 +39,9 @@ - (void)setUp
     [_package setValue:_installURL forKey:NSStringFromSelector(@selector(installURL))];
 }
 
+
+#pragma mark - Tests
+
 - (void)testEnablePackage
 {
     CCPackageCocos2dEnabler *packageEnabler = [[CCPackageCocos2dEnabler alloc] init];
@@ -51,7 +54,6 @@ - (void)testEnablePackage
     XCTAssertNotNil(sprite);
 }
 
-/*
 - (void)testDisablePackage
 {
     [self testEnablePackage];
@@ -68,7 +70,9 @@ - (void)testDisablePackage
     NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:&scale];
     XCTAssertNil(path);
 }
-*/
+
+
+#pragma mark - Helper
 
 - (BOOL)isPackageInSearchPath
 {

UnitTests/CCPackageDownloadManagerTests.m

@@ -100,6 +100,7 @@ - (void)deleteOldDownloads
     [fileManager removeItemAtPath:_downloadPath error:nil];
 }
 
+
 #pragma mark - Tests
 
 - (void)testSetDownloadPath
@@ -209,6 +210,7 @@ - (CCPackage *)completePackageWithName:(NSString *)name
     return package;
 }
 
+
 #pragma mark - CCPackageDownloadManagerDelegate
 
 - (void)downloadFinishedOfPackage:(CCPackage *)package

UnitTests/CCPackageDownloadTests.m

@@ -109,8 +109,6 @@ - (void)stopLoading
 @end
 
 
-#pragma mark - test
-
 @interface CCPackageDownloadTests : XCTestCase <CCPackageDownloadDelegate>
 
 @property (nonatomic, strong) CCPackageDownload *download;
@@ -190,7 +188,7 @@ - (void)createDownloadFolder
 }
 
 
-#pragma mark - tests
+#pragma mark - Tests
 
 - (void)testDownloadPackage
 {
@@ -335,6 +333,7 @@ - (void)testResumeDownload
     XCTAssertEqual([attribs[NSFileSize] unsignedIntegerValue], __fileDownloadSize);
 }
 
+
 #pragma mark - Helper
 
 - (void)setupPartialDownloadOnDisk
@@ -391,5 +390,4 @@ - (BOOL)shouldOverwriteDownloadedFile:(CCPackageDownload *)download
     return _shouldOverwriteDownloadedFile;
 }
 
-
 @end

UnitTests/CCPackageInstallDataTests.m

@@ -38,6 +38,9 @@ - (void)setUp
 
 }
 
+
+#pragma mark - Tests
+
 - (void)testPopulateInstallDataWithDictionary
 {
     // Constants for dict keys are only used internally, not making them public

UnitTests/CCPackageInstallerTests.m

@@ -81,6 +81,9 @@ - (void)deleteInstallData
     }
 }
 
+
+#pragma mark - Tests
+
 - (void)testInstallWithoutEnablingPackage
 {
     [self setupInstallablePackage];
@@ -91,15 +94,6 @@ - (void)testInstallWithoutEnablingPackage
     XCTAssertEqual(_package.status, CCPackageStatusInstalledDisabled);
 }
 
-- (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;
-}
-
 - (void)testInstallFailingUnzippedPackageDoesNotExist
 {
     NSString *pathToPackage = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Resources-shared/Packages/DOES_NOT_EXIST"];
@@ -129,4 +123,16 @@ - (void)testInstallFailingPackageAlreadyExists
     XCTAssertEqual(error.code, PACKAGE_ERROR_INSTALL_COULD_NOT_MOVE_PACKAGE_TO_INSTALL_FOLDER);
 }
 
+
+#pragma mark - Helper
+
+- (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;
+}
+
 @end

UnitTests/CCPackageTests.m

@@ -31,6 +31,9 @@ - (void)testInitializer
     XCTAssertEqual(package.status, CCPackageStatusInitial);
 }
 
+
+#pragma mark - Tests
+
 - (void)testStandardIdentifier
 {
     CCPackage *package = [[CCPackage alloc] initWithName:@"DLC"

UnitTests/CCPackageUnzipperTests.m

@@ -84,6 +84,9 @@ - (void)deleteGeneratedFiles
     [fileManager removeItemAtPath:_unzipFolderPath error:nil];
 }
 
+
+#pragma mark - Tests
+
 - (void)testUnzipping
 {
     [self unzipUntilDelegateMethodsReturn:nil];
@@ -107,16 +110,18 @@ - (void)testUnzippingOfNonExistingArchive
     XCTAssertFalse(_unzippingSuccessful);
 }
 
-// This test is not working as SSZipArchive will return succes although file operations fail
+// This test is not working as SSZipArchive will return success although file operations fail
 // This requires some modifications of SSZipArchive
+/*
 - (void)testUnzippingOfInaccessibleUnzipFolder
 {
     _installData.unzipURL = [NSURL fileURLWithPath:@"/temp/surelynotexistingfolder"];
 
-    // [self unzipUntilDelegateMethodsReturn:];
+    [self unzipUntilDelegateMethodsReturn:];
 
-    // XCTAssertFalse(_unzippingSuccessful);
+    XCTAssertFalse(_unzippingSuccessful);
 }
+*/
 
 - (void)testUnzipOfPasswordProtectedPackage
 {
@@ -132,22 +137,8 @@ - (void)testUnzipOfPasswordProtectedPackage
     CCAssertEqualStrings(contentsOfSecretFile, @"unzipping successful");
 }
 
-- (void)unzipUntilDelegateMethodsReturn:(NSString *)password
-{
-    self.condition = [[NSCondition alloc] init];
-    [_condition lock];
 
-    CCPackageUnzipper *unzipper = [[CCPackageUnzipper alloc] initWithPackage:_package];
-    unzipper.password = password;
-    unzipper.delegate = self;
-    [unzipper unpackPackage];
-
-    while(!_unzipperReturned)
-    {
-        [_condition wait];
-    }
-    [_condition unlock];
-}
+#pragma mark - CCPackageUnzipperDelegate
 
 - (void)unzipFinished:(CCPackageUnzipper *)packageUnzipper
 {
@@ -165,4 +156,24 @@ - (void)unzipFailed:(CCPackageUnzipper *)packageUnzipper error:(NSError *)error
     [_condition signal];
 }
 
+
+#pragma mark - Helper
+
+- (void)unzipUntilDelegateMethodsReturn:(NSString *)password
+{
+    self.condition = [[NSCondition alloc] init];
+    [_condition lock];
+
+    CCPackageUnzipper *unzipper = [[CCPackageUnzipper alloc] initWithPackage:_package];
+    unzipper.password = password;
+    unzipper.delegate = self;
+    [unzipper unpackPackage];
+
+    while(!_unzipperReturned)
+    {
+        [_condition wait];
+    }
+    [_condition unlock];
+}
+
 @end