CCPackage unit tests added.

Fix for file urls serialization: Prevent prepending of file:// scheme of installURL for de/serialization cycles.

Author: NickyWeber

UnitTests/CCPackageTests.m

@@ -7,28 +7,79 @@
 //
 
 #import <XCTest/XCTest.h>
+#import "CCPackage.h"
+#import "CCUnitTestAssertions.h"
 
 @interface CCPackageTests : XCTestCase
 
 @end
 
+
 @implementation CCPackageTests
 
-- (void)setUp
+- (void)testInitializer
 {
-    [super setUp];
-    // Put setup code here. This method is called before the invocation of each test method in the class.
+    CCPackage *package = [[CCPackage alloc] initWithName:@"DLC"
+                                              resolution:@"tablethd"
+                                                      os:@"iOS"
+                                               remoteURL:[NSURL URLWithString:@"http://foo.fake"]];
+
+    CCAssertEqualStrings(package.name, @"DLC");
+    CCAssertEqualStrings(package.resolution, @"tablethd");
+    CCAssertEqualStrings(package.os, @"iOS");
+    XCTAssertEqualObjects(package.remoteURL, [NSURL URLWithString:@"http://foo.fake"]);
+    XCTAssertEqual(package.status, CCPackageStatusInitial);
 }
 
-- (void)tearDown
+- (void)testStandardIdentifier
 {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
+    CCPackage *package = [[CCPackage alloc] initWithName:@"DLC"
+                                              resolution:@"tablethd"
+                                                      os:@"iOS"
+                                               remoteURL:[NSURL URLWithString:@"http://foo.fake"]];
+
+    CCAssertEqualStrings([package standardIdentifier], @"DLC-iOS-tablethd");
 }
 
-- (void)testExample
+- (void)testInitWithDictionary
 {
-    XCTFail(@"No implementation for \"%s\"", __PRETTY_FUNCTION__);
+    NSDictionary *dictionary = @{
+        @"name" : @"DLC",
+        @"resolution" : @"tablethd",
+        @"os" : @"iOS",
+        @"remoteURL" : @"http://foo.fake",
+        @"installURL" : @"/Library/Caches/Packages",
+        @"status" : @(CCPackageStatusInstalledDisabled),
+    };
+
+    CCPackage *package = [[CCPackage alloc] initWithDictionary:dictionary];
+
+    CCAssertEqualStrings(package.name, @"DLC");
+    CCAssertEqualStrings(package.resolution, @"tablethd");
+    CCAssertEqualStrings(package.os, @"iOS");
+    XCTAssertEqualObjects(package.remoteURL, [NSURL URLWithString:@"http://foo.fake"]);
+    XCTAssertEqualObjects(package.installURL, [NSURL fileURLWithPath:@"/Library/Caches/Packages"]);
+    XCTAssertEqual(package.status, CCPackageStatusInstalledDisabled);
+}
+
+- (void)testToDictionary
+{
+    CCPackage *package = [[CCPackage alloc] initWithName:@"DLC"
+                                              resolution:@"tablethd"
+                                                      os:@"iOS"
+                                               remoteURL:[NSURL URLWithString:@"http://foo.fake"]];
+
+    [package setValue:@(CCPackageStatusInstalledDisabled) forKey:@"status"];
+    [package setValue:[NSURL fileURLWithPath:@"/Library/Caches/Packages"] forKey:@"installURL"];
+
+    NSDictionary *dictionary = [package toDictionary];
+
+    CCAssertEqualStrings(dictionary[@"name"], @"DLC");
+    CCAssertEqualStrings(dictionary[@"resolution"], @"tablethd");
+    CCAssertEqualStrings(dictionary[@"os"], @"iOS");
+    CCAssertEqualStrings(dictionary[@"remoteURL"], @"http://foo.fake");
+    CCAssertEqualStrings(dictionary[@"installURL"], @"/Library/Caches/Packages");
+    XCTAssertEqual([dictionary[@"status"] integerValue], CCPackageStatusInstalledDisabled);
 }
 
 @end

cocos2d/CCPackage.m

@@ -61,7 +61,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                                                       os:dictionary[PACKAGE_SERIALIZATION_KEY_OS]
                                                remoteURL:[NSURL URLWithString:dictionary[PACKAGE_SERIALIZATION_KEY_REMOTE_URL]]];
 
-    package.installURL = [NSURL URLWithString:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
+    package.installURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
     package.status = (CCPackageStatus) [dictionary[PACKAGE_SERIALIZATION_KEY_STATUS] unsignedIntegerValue];
 
     return package;
@@ -84,7 +84,7 @@ - (NSDictionary *)toDictionary
     dictionary[PACKAGE_SERIALIZATION_KEY_VERSION] = @(PACKAGE_SERIALIZATION_VERSION);
     if (_installURL)
     {
-        dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL] = [_installURL absoluteString];
+        dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL] = [_installURL path];
     }
 
     return dictionary;