Tests/GHUnitTestMain.m @@ -39,7 +39,7 @@ #import "GHNSArray+Utils.h" #import "GHNSDictionary+NSNull.h" #import "GHNSDictionary+Utils.h" -#import "GHMutableNSDictionary+Utils.h" +#import "GHNSMutableDictionary+Utils.h" #import "GHNSXMLNode+Utils.h" #import "GHNSXMLElement+Utils.h" #import "GHNSInvocation+Utils.h" Classes/GHKit.h @@ -59,6 +59,7 @@ 00AF11910F2D7EE6009F0ABA /* GHLoggerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 002E759E0F2C45DD00427636 /* GHLoggerTest.m */; }; 00BB7B010F3175E500B3924D /* GHKitMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 00BB7AD80F3173BB00B3924D /* GHKitMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00CBE5C60E24783400E94F7B /* GTMDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 00CBE5C50E24783400E94F7B /* GTMDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 00CDDDE10F77018F0089C60E /* GHUnitTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CDDDE00F77018F0089C60E /* GHUnitTestMain.m */; }; 00CE8AAE0F24028900DD6464 /* GHNSObject+Invocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 00CE8AAB0F24028900DD6464 /* GHNSObject+Invocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00CE8AAF0F24028900DD6464 /* GHNSObject+Invocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CE8AAC0F24028900DD6464 /* GHNSObject+Invocation.m */; }; 00DB2A7A0EECA1C700383FB6 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 00DB2A770EECA1C700383FB6 /* JRSwizzle.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -203,6 +204,7 @@ 00BB7AD80F3173BB00B3924D /* GHKitMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHKitMacros.h; sourceTree = "<group>"; }; 00BB7B060F31769200B3924D /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; }; 00CBE5C50E24783400E94F7B /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; }; + 00CDDDE00F77018F0089C60E /* GHUnitTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHUnitTestMain.m; sourceTree = "<group>"; }; 00CE8AAB0F24028900DD6464 /* GHNSObject+Invocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSObject+Invocation.h"; sourceTree = "<group>"; }; 00CE8AAC0F24028900DD6464 /* GHNSObject+Invocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSObject+Invocation.m"; sourceTree = "<group>"; }; 00DB2A770EECA1C700383FB6 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; }; @@ -514,6 +516,7 @@ 52857D580E199B530011DA5C /* Tests */ = { isa = PBXGroup; children = ( + 00CDDDE00F77018F0089C60E /* GHUnitTestMain.m */, 52857D5A0E199B530011DA5C /* NSString+TimeIntervalTest.m */, 52857D5C0E199B530011DA5C /* NSString+UtilsTest.m */, 005D0C3F0E19C03B003FAB86 /* NSDate+ParsingTest.m */, @@ -676,6 +679,7 @@ 00AF11910F2D7EE6009F0ABA /* GHLoggerTest.m in Sources */, 00939AA30F4CC09600E41365 /* NSDate+UtilsTest.m in Sources */, 0024E7A20F65949A007E5C51 /* NSFileManager+UtilsTest.m in Sources */, + 00CDDDE10F77018F0089C60E /* GHUnitTestMain.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; GHKit.xcodeproj/project.pbxproj @@ -33,9 +33,12 @@ 00970D5A0F29240E00189A9D /* GTMObjC2Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = 00970D570F29240E00189A9D /* GTMObjC2Runtime.m */; }; 009A95820F29320D00C5B773 /* GHNSInvocation+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A957E0F29320D00C5B773 /* GHNSInvocation+Utils.m */; }; 009A95830F29320D00C5B773 /* GHNSObject+Invocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A957F0F29320D00C5B773 /* GHNSObject+Invocation.m */; }; - 00A081280F46266B00932C19 /* GHTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A081260F46266B00932C19 /* GHTestUtils.m */; }; 00A97A140F0C424400B083F6 /* GHUIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A97A100F0C424400B083F6 /* GHUIButton.m */; }; 00A97A1C0F0C436700B083F6 /* GHCGUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A97A1A0F0C436700B083F6 /* GHCGUtils.m */; }; + 00CDDE010F77023C0089C60E /* GHNSDate+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CDDDFC0F77023C0089C60E /* GHNSDate+Utils.m */; }; + 00CDDE020F77023C0089C60E /* GHNSDictionary+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CDDDFE0F77023C0089C60E /* GHNSDictionary+Utils.m */; }; + 00CDDE030F77023C0089C60E /* GHNSMutableDictionary+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CDDE000F77023C0089C60E /* GHNSMutableDictionary+Utils.m */; }; + 00CDDE0C0F7702760089C60E /* GHTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CDDE0B0F7702760089C60E /* GHTesting.m */; }; 00DB2ACC0EECA29900383FB6 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 00DB2AA90EECA29900383FB6 /* JRSwizzle.m */; }; 00DB2ACE0EECA29900383FB6 /* GHNSDate+Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 00DB2AAE0EECA29900383FB6 /* GHNSDate+Parsing.m */; }; 00DB2ACF0EECA29900383FB6 /* GHNSFileManager+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 00DB2AB00EECA29900383FB6 /* GHNSFileManager+Utils.m */; }; @@ -121,12 +124,18 @@ 009A957F0F29320D00C5B773 /* GHNSObject+Invocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSObject+Invocation.m"; sourceTree = "<group>"; }; 009A95800F29320D00C5B773 /* GHNSObject+Invocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSObject+Invocation.h"; sourceTree = "<group>"; }; 009A95810F29320D00C5B773 /* GHNSInvocation+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSInvocation+Utils.h"; sourceTree = "<group>"; }; - 00A081260F46266B00932C19 /* GHTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GHTestUtils.m; path = "../gh-unit/Classes/GHTestUtils.m"; sourceTree = SOURCE_ROOT; }; - 00A081270F46266B00932C19 /* GHTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestUtils.h; path = "../gh-unit/Classes/GHTestUtils.h"; sourceTree = SOURCE_ROOT; }; 00A97A100F0C424400B083F6 /* GHUIButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHUIButton.m; sourceTree = "<group>"; }; 00A97A110F0C424400B083F6 /* GHUIButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHUIButton.h; sourceTree = "<group>"; }; 00A97A1A0F0C436700B083F6 /* GHCGUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHCGUtils.m; sourceTree = "<group>"; }; 00A97A1B0F0C436700B083F6 /* GHCGUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHCGUtils.h; sourceTree = "<group>"; }; + 00CDDDFB0F77023C0089C60E /* GHNSDate+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSDate+Utils.h"; sourceTree = "<group>"; }; + 00CDDDFC0F77023C0089C60E /* GHNSDate+Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSDate+Utils.m"; sourceTree = "<group>"; }; + 00CDDDFD0F77023C0089C60E /* GHNSDictionary+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSDictionary+Utils.h"; sourceTree = "<group>"; }; + 00CDDDFE0F77023C0089C60E /* GHNSDictionary+Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSDictionary+Utils.m"; sourceTree = "<group>"; }; + 00CDDDFF0F77023C0089C60E /* GHNSMutableDictionary+Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSMutableDictionary+Utils.h"; sourceTree = "<group>"; }; + 00CDDE000F77023C0089C60E /* GHNSMutableDictionary+Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSMutableDictionary+Utils.m"; sourceTree = "<group>"; }; + 00CDDE0A0F7702760089C60E /* GHTesting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTesting.h; path = "../gh-unit/Classes/GHTesting.h"; sourceTree = SOURCE_ROOT; }; + 00CDDE0B0F7702760089C60E /* GHTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GHTesting.m; path = "../gh-unit/Classes/GHTesting.m"; sourceTree = SOURCE_ROOT; }; 00DB2AA40EECA29900383FB6 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; }; 00DB2AA80EECA29900383FB6 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; }; 00DB2AA90EECA29900383FB6 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = "<group>"; }; @@ -254,6 +263,12 @@ children = ( 00DB2AA00EECA29900383FB6 /* External */, 00DB2AC50EECA29900383FB6 /* IPhone */, + 00CDDDFB0F77023C0089C60E /* GHNSDate+Utils.h */, + 00CDDDFC0F77023C0089C60E /* GHNSDate+Utils.m */, + 00CDDDFD0F77023C0089C60E /* GHNSDictionary+Utils.h */, + 00CDDDFE0F77023C0089C60E /* GHNSDictionary+Utils.m */, + 00CDDDFF0F77023C0089C60E /* GHNSMutableDictionary+Utils.h */, + 00CDDE000F77023C0089C60E /* GHNSMutableDictionary+Utils.m */, 00DB2AAC0EECA29900383FB6 /* GHKit.h */, 00DB2AAD0EECA29900383FB6 /* GHNSDate+Parsing.h */, 00DB2AAE0EECA29900383FB6 /* GHNSDate+Parsing.m */, @@ -385,8 +400,8 @@ 00E92A010F2FA1B900112D7E /* gh-unit */ = { isa = PBXGroup; children = ( - 00A081260F46266B00932C19 /* GHTestUtils.m */, - 00A081270F46266B00932C19 /* GHTestUtils.h */, + 00CDDE0A0F7702760089C60E /* GHTesting.h */, + 00CDDE0B0F7702760089C60E /* GHTesting.m */, 00E92A020F2FA1B900112D7E /* GHTest.h */, 00E92A030F2FA1B900112D7E /* GHTest.m */, 00E92A040F2FA1B900112D7E /* GHTestCase.h */, @@ -562,7 +577,6 @@ 00E92A290F2FA1B900112D7E /* GHTestRunner.m in Sources */, 00E92A2A0F2FA1B900112D7E /* GHTestSuite.m in Sources */, 00E92A2F0F2FA1B900112D7E /* GHTestViewModel.m in Sources */, - 00A081280F46266B00932C19 /* GHTestUtils.m in Sources */, 000223B40F4BFFBE0046234D /* GHLogger.m in Sources */, 000223B50F4BFFBE0046234D /* GHNSString+URL.m in Sources */, 000223C90F4C00340046234D /* GHUnitIPhoneAppDelegate.m in Sources */, @@ -570,6 +584,10 @@ 000223CB0F4C00340046234D /* GHUnitIPhoneViewController.m in Sources */, 0024E70B0F659183007E5C51 /* GHNSError+Utils.m in Sources */, 0024E7350F6593E1007E5C51 /* GHUnitIPhoneExceptionViewController.m in Sources */, + 00CDDE010F77023C0089C60E /* GHNSDate+Utils.m in Sources */, + 00CDDE020F77023C0089C60E /* GHNSDictionary+Utils.m in Sources */, + 00CDDE030F77023C0089C60E /* GHNSMutableDictionary+Utils.m in Sources */, + 00CDDE0C0F7702760089C60E /* GHTesting.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; GHKitIPhone.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ <key>CFBundleVersion</key> <string>1.0</string> <key>NSMainNibFile</key> - <string>MainMenu</string> - <key>NSPrincipalClass</key> - <string>NSApplication</string> + <string>GHUnitIPhone</string> </dict> </plist> GHKitIPhoneTests-Info.plist @@ -16,9 +16,9 @@ - (void)testEnsureDirectory { NSError *error = nil; - NSString *path = [NSFileManager gh_temporaryFile:nil deleteIfExists:YES error:error]; + NSString *path = [NSFileManager gh_temporaryFile:nil deleteIfExists:YES error:&error]; if (error) GHFail(@"Error: %@", error); - BOOL success = [NSFileManager gh_ensureDirectoryExists:path created:nil error:error]; + BOOL success = [NSFileManager gh_ensureDirectoryExists:path created:nil error:&error]; if (error) GHFail(@"Error: %@", error); GHAssertTrue(success, nil); } Tests/NSFileManager+UtilsTest.m 9fb330bf789d52d3e40c0036656df2207d01895a Gabriel Handford gabrielh@gmail.com http://github.com/gabriel/gh-kit/commit/a31c020eb179e8f554e467191084d07b1c4c2157 a31c020eb179e8f554e467191084d07b1c4c2157 2009-03-22T16:36:11-07:00 2009-03-22T16:36:11-07:00 Updating to work with GHUnit 0.3.1 026585de36e8b4ff5677d9180134cb9fa2255473 Gabriel Handford gabrielh@gmail.com