CCPackageTest: NSURLProtocol removed and turned download into a real http request.

Author: NickyWeber

cocos2d-ui-tests/tests/CCPackageTest.m

@@ -14,64 +14,6 @@
 #import "AppDelegate.h"
 
 
-
-@interface CCPackageTestURLProtocol : NSURLProtocol
-
-@end
-
-
-@implementation CCPackageTestURLProtocol
-
-+ (BOOL)canInitWithRequest:(NSURLRequest*)theRequest
-{
-    return [theRequest.URL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame;
-}
-
-+ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)theRequest
-{
-    return theRequest;
-}
-
-- (void)startLoading
-{
-    NSString *fileName = [self.request.URL lastPathComponent];
-
-    NSString *pathToPackage = [[NSBundle mainBundle] pathForResource:[NSString stringWithFormat:@"Resources-shared/Packages/%@", fileName] ofType:nil];
-    NSData *data = [NSData dataWithContentsOfFile:pathToPackage];
-
-    NSHTTPURLResponse *response;
-    if (pathToPackage)
-    {
-    response = [[NSHTTPURLResponse alloc] initWithURL:self.request.URL
-                                                              statusCode:200
-                                                             HTTPVersion:@"HTTP/1.1"
-                                                            headerFields:nil];
-    }
-    else
-    {
-        response = [[NSHTTPURLResponse alloc] initWithURL:self.request.URL
-                                                                  statusCode:404
-                                                                 HTTPVersion:@"HTTP/1.1"
-                                                                headerFields:nil];
-    }
-
-
-    id<NSURLProtocolClient> client = [self client];
-    [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-    [client URLProtocol:self didLoadData:data];
-    [client URLProtocolDidFinishLoading:self];
-}
-
-- (void)stopLoading
-{
-    // Nothing to do
-}
-
-@end
-
-
-#pragma mark - Test class
-
 @interface CCPackageTest : TestBase <CCPackageManagerDelegate>
 
 @property (nonatomic, strong) CCPackage *package;
@@ -83,8 +25,6 @@ @implementation CCPackageTest
 
 - (void) setupPackageTest
 {
-    [self setupLocalHTTPRequests];
-
     [self.contentNode removeAllChildren];
 
     [self removePersistedPackages];
@@ -101,15 +41,10 @@ - (void) setupPackageTest
 
     self.package = [[CCPackageManager sharedManager] downloadPackageWithName:@"testpackage"
                                                                   resolution:@"phonehd"
-                                                                   remoteURL:[NSURL URLWithString:@"http://package.request.fake/testpackage-iOS-phonehd.zip"]
+                                                                   remoteURL:[NSURL URLWithString:@"https://github.com/NickyWeber/cocos2d_test_resources/blob/master/testpackage-iOS-phonehd.zip?raw=true"]
                                                          enableAfterDownload:YES];
 }
 
-- (void)setupLocalHTTPRequests
-{
-   [NSURLProtocol registerClass:[CCPackageTestURLProtocol class]];
-}
-
 - (void)removePersistedPackages
 {
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:PACKAGE_STORAGE_USERDEFAULTS_KEY];
@@ -209,31 +144,26 @@ - (void)packageInstallationFinished:(CCPackage *)package
 - (void)packageInstallationFailed:(CCPackage *)package error:(NSError *)error
 {
     self.subTitle = [NSString stringWithFormat:@"Test failed: installation failed."];
-    [NSURLProtocol unregisterClass:[CCPackageTestURLProtocol class]];
 }
 
 - (void)packageDownloadFinished:(CCPackage *)package
 {
     self.subTitle = [NSString stringWithFormat:@"Download finished"];
-    [NSURLProtocol unregisterClass:[CCPackageTestURLProtocol class]];
-}
+    }
 
 - (void)packageDownloadFailed:(CCPackage *)package error:(NSError *)error
 {
     self.subTitle = [NSString stringWithFormat:@"Test failed: download failed."];
-    [NSURLProtocol unregisterClass:[CCPackageTestURLProtocol class]];
 }
 
 - (void)packageUnzippingFinished:(CCPackage *)package
 {
     self.subTitle = [NSString stringWithFormat:@"Unzip finished"];
-    [NSURLProtocol unregisterClass:[CCPackageTestURLProtocol class]];
 }
 
 - (void)packageUnzippingFailed:(CCPackage *)package error:(NSError *)error
 {
     self.subTitle = [NSString stringWithFormat:@"Test failed: unzipping failed."];
-    [NSURLProtocol unregisterClass:[CCPackageTestURLProtocol class]];
 }
 
 - (void)packageDownloadProgress:(CCPackage *)package downloadedBytes:(NSUInteger)downloadedBytes totalBytes:(NSUInteger)totalBytes