Merge branch 'develop' of github.com:cocos2d/cocos2d-swift into CCDirector/MergeSchedulerAndActionManager

Conflicts:
	cocos2d-tests.xcodeproj/project.pbxproj
	cocos2d.xcodeproj/project.pbxproj

Author: andykorth

.gitmodules

@@ -8,3 +8,6 @@ url=https://github.com/slembcke/Chipmunk2D.git
 [submodule "external/SSZipArchive"]
 	path = external/SSZipArchive
 	url = https://github.com/spritebuilder/ssziparchive.git
+[submodule "external/OCMock"]
+	path = external/OCMock
+	url = https://github.com/erikdoe/ocmock.git

UnitTests/CCFileUtilTests.m

@@ -7,7 +7,7 @@
 
 #import <XCTest/XCTest.h>
 #import "cocos2d.h"
-#import "CCUnitTestAssertions.h"
+#import "CCUnitTestHelperMacros.h"
 
 
 #import "CCFile_Private.h"
@@ -178,8 +178,8 @@ - (void)testLoadFileNameLookupsInAllSearchPaths
 
     [[CCFileUtils sharedFileUtils] loadFileNameLookupsInAllSearchPathsWithName:@"fileLookup.plist"];
     NSDictionary *filenameLookup = [CCFileUtils sharedFileUtils].filenameLookup;
-    CCAssertEqualStrings(filenameLookup[@"baa.psd"], @"baa.png");
-    CCAssertEqualStrings(filenameLookup[@"foo.wav"], @"foo.mp4");
+    XCTAssertEqualObjects(filenameLookup[@"baa.psd"], @"baa.png");
+    XCTAssertEqualObjects(filenameLookup[@"foo.wav"], @"foo.mp4");
 }
 
 -(void)testCCFileUtilsSearchModeSuffix

UnitTests/CCFileUtilsDatabaseTests.m

@@ -0,0 +1,98 @@
+//
+//  CCFileUtilsDatabaseTests.m
+//  cocos2d-tests
+//
+//  Created by Nicky Weber on 13.01.15.
+//  Copyright (c) 2015 Cocos2d. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "CCFileUtilsDatabase.h"
+#import "FileSystemTestCase.h"
+#import "CCUnitTestHelperMacros.h"
+#import "CCFileMetaData.h"
+
+@interface CCFileUtilsDatabaseTests : FileSystemTestCase
+
+@property (nonatomic, strong) CCFileUtilsDatabase *fileUtilsDB;
+@property (nonatomic, copy) NSString *searchPath;
+@property (nonatomic, copy) NSString *dbPath;
+
+@end
+
+@implementation CCFileUtilsDatabaseTests
+
+- (void)setUp
+{
+    [super setUp];
+
+    NSString *json = MULTILINESTRING(
+        {
+            "version" : 1,
+            "data" : {
+                "images/foo.png" : {
+                    "UIScale" : true,
+                    "filename" : "images/foo.jpg",
+                    "localizations" : {
+                        "en" : "images/foo-en.jpg"
+                    }
+                }
+            }
+        }
+    );
+
+    self.searchPath = [self fullPathForFile:@"Resources"];
+    self.dbPath = @"config/filedb.json";
+
+    [self createFilesWithContents:@{@"Resources/config/filedb.json" : [json dataUsingEncoding:NSUTF8StringEncoding]}];
+
+    self.fileUtilsDB = [[CCFileUtilsDatabase alloc] init];
+}
+
+- (void)testAddDatabaseWithFilePathInSearchPath
+{
+    NSError *error;
+    XCTAssertTrue([_fileUtilsDB addJSONWithFilePath:_dbPath forSearchPath:_searchPath error:&error]);
+
+    CCFileMetaData *metaData = [_fileUtilsDB metaDataForFileNamed:@"images/foo.png" inSearchPath:_searchPath];
+
+    XCTAssertNotNil(metaData);
+    XCTAssertNil(error);
+    XCTAssertEqualObjects(metaData.filename, @"images/foo.jpg");
+    XCTAssertEqualObjects(metaData.localizations, @{@"en" : @"images/foo-en.jpg"});
+};
+
+- (void)testRemoveDatabaseWithFilePathInSearchPath
+{
+    XCTAssertTrue([_fileUtilsDB addJSONWithFilePath:_dbPath forSearchPath:_searchPath error:NULL]);
+
+    [_fileUtilsDB removeEntriesForSearchPath:[self fullPathForFile:@"Resources"]];
+
+    CCFileMetaData *metaData = [_fileUtilsDB metaDataForFileNamed:@"images/foo.png" inSearchPath:[self fullPathForFile:@"Resources"]];
+
+    XCTAssertNil(metaData);
+}
+
+- (void)testAddDataBaseWithCorruptJSON
+{
+    NSString *json = MULTILINESTRING(
+        {
+            []  asdasdasd {}
+        };
+    );
+
+    [self createFilesWithContents:@{@"Resources/config/filedb.json" : [json dataUsingEncoding:NSUTF8StringEncoding]}];
+
+    NSError *error;
+    XCTAssertFalse([_fileUtilsDB addJSONWithFilePath:_dbPath forSearchPath:_searchPath error:&error]);
+    XCTAssertNotNil(error);
+}
+
+- (void)testAddDataBaseWithNonExistingDatabaseFile
+{
+    NSError *error;
+    XCTAssertFalse([_fileUtilsDB addJSONWithFilePath:@"/adasdasd/ddddd.json" forSearchPath:_searchPath error:&error]);
+    XCTAssertNotNil(error);
+}
+
+@end