GHKitTests-Info.plist GHKitTests_Prefix.pch Tests/TestsMain.m @@ -114,7 +114,7 @@ @method gh_subStringSegmentsWithinStart @param start Start token @param end End token - @result Array of GHStringSegment's + @result Array of GHNSStringSegment's Use a regex engine if you can. Note: This exists because regex.h is posix only and does not support non-greedy expressions. @@ -132,7 +132,7 @@ /*! Class used by gh_substringSegmentsWithinStart:end: */ -@interface GHStringSegment : NSObject { +@interface GHNSStringSegment : NSObject { NSString *string_; BOOL isMatch_; } @@ -143,6 +143,6 @@ - (id)initWithString:(NSString *)string isMatch:(BOOL)isMatch; -+ (GHStringSegment *)string:(NSString *)string isMatch:(BOOL)isMatch; ++ (GHNSStringSegment *)string:(NSString *)string isMatch:(BOOL)isMatch; @end Classes/GHNSString+Utils.h @@ -288,7 +288,7 @@ static NSDictionary *gh_gTruncateMiddle = nil; while([scanner scanUpToString:(within ? end : start) intoString:&scanned]) { if (scanned && [scanned length] > 0) - [segments addObject:[GHStringSegment string:scanned isMatch:within]]; + [segments addObject:[GHNSStringSegment string:scanned isMatch:within]]; [scanner scanString:(within ? end : start) intoString:&scanned]; // Eat start or end token scanned = nil; @@ -296,13 +296,13 @@ static NSDictionary *gh_gTruncateMiddle = nil; } NSUInteger length = [self length] - [scanner scanLocation]; if (length > 0) - [segments addObject:[GHStringSegment string:[self substringWithRange:NSMakeRange([scanner scanLocation], length)] isMatch:NO]]; + [segments addObject:[GHNSStringSegment string:[self substringWithRange:NSMakeRange([scanner scanLocation], length)] isMatch:NO]]; return segments; } @end -@implementation GHStringSegment +@implementation GHNSStringSegment @synthesize string=string_, match=isMatch_; @@ -314,7 +314,7 @@ static NSDictionary *gh_gTruncateMiddle = nil; return self; } -+ (GHStringSegment *)string:(NSString *)string isMatch:(BOOL)isMatch { ++ (GHNSStringSegment *)string:(NSString *)string isMatch:(BOOL)isMatch { return [[[self alloc] initWithString:string isMatch:isMatch] autorelease]; } Classes/GHNSString+Utils.m @@ -17,40 +17,6 @@ 0058AAEF0EF8C4D900C44386 /* GHKeychainStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0058AAED0EF8C4D900C44386 /* GHKeychainStore.m */; }; 005B0A9F0F22B7A80004F351 /* GHNSInvocation+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 005B0A9D0F22B7A80004F351 /* GHNSInvocation+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 005B0AA00F22B7A80004F351 /* GHNSInvocation+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 005B0A9E0F22B7A80004F351 /* GHNSInvocation+Utils.m */; }; - 0062B69A0F2C08AD00B0562A /* DebugiPhone.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6760F2C08AD00B0562A /* DebugiPhone.xcconfig */; }; - 0062B69B0F2C08AD00B0562A /* DebugiPhone20.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6770F2C08AD00B0562A /* DebugiPhone20.xcconfig */; }; - 0062B69C0F2C08AD00B0562A /* DebugiPhone21.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6780F2C08AD00B0562A /* DebugiPhone21.xcconfig */; }; - 0062B69D0F2C08AD00B0562A /* DebugLeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6790F2C08AD00B0562A /* DebugLeopardOrLater.xcconfig */; }; - 0062B69E0F2C08AD00B0562A /* DebugSnowLeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67A0F2C08AD00B0562A /* DebugSnowLeopardOrLater.xcconfig */; }; - 0062B69F0F2C08AD00B0562A /* DebugTigerOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67B0F2C08AD00B0562A /* DebugTigerOrLater.xcconfig */; }; - 0062B6A00F2C08AD00B0562A /* ReleaseiPhone.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67C0F2C08AD00B0562A /* ReleaseiPhone.xcconfig */; }; - 0062B6A10F2C08AD00B0562A /* ReleaseiPhone20.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67D0F2C08AD00B0562A /* ReleaseiPhone20.xcconfig */; }; - 0062B6A20F2C08AD00B0562A /* ReleaseiPhone21.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67E0F2C08AD00B0562A /* ReleaseiPhone21.xcconfig */; }; - 0062B6A30F2C08AD00B0562A /* ReleaseLeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B67F0F2C08AD00B0562A /* ReleaseLeopardOrLater.xcconfig */; }; - 0062B6A40F2C08AD00B0562A /* ReleaseSnowLeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6800F2C08AD00B0562A /* ReleaseSnowLeopardOrLater.xcconfig */; }; - 0062B6A50F2C08AD00B0562A /* ReleaseTigerOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6810F2C08AD00B0562A /* ReleaseTigerOrLater.xcconfig */; }; - 0062B6A60F2C08AD00B0562A /* CodeCoverage.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6830F2C08AD00B0562A /* CodeCoverage.xcconfig */; }; - 0062B6A70F2C08AD00B0562A /* CodeCoverageStatic.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6840F2C08AD00B0562A /* CodeCoverageStatic.xcconfig */; }; - 0062B6A80F2C08AD00B0562A /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6850F2C08AD00B0562A /* Debug.xcconfig */; }; - 0062B6A90F2C08AD00B0562A /* GCSupported.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6860F2C08AD00B0562A /* GCSupported.xcconfig */; }; - 0062B6AA0F2C08AD00B0562A /* General.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6870F2C08AD00B0562A /* General.xcconfig */; }; - 0062B6AB0F2C08AD00B0562A /* GTMMerge.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6880F2C08AD00B0562A /* GTMMerge.xcconfig */; }; - 0062B6AC0F2C08AD00B0562A /* iPhone20.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6890F2C08AD00B0562A /* iPhone20.xcconfig */; }; - 0062B6AD0F2C08AD00B0562A /* iPhone21.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68A0F2C08AD00B0562A /* iPhone21.xcconfig */; }; - 0062B6AE0F2C08AD00B0562A /* LeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68B0F2C08AD00B0562A /* LeopardOrLater.xcconfig */; }; - 0062B6AF0F2C08AD00B0562A /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68C0F2C08AD00B0562A /* Release.xcconfig */; }; - 0062B6B00F2C08AD00B0562A /* SnowLeopardOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68D0F2C08AD00B0562A /* SnowLeopardOrLater.xcconfig */; }; - 0062B6B10F2C08AD00B0562A /* TigerOrLater.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68E0F2C08AD00B0562A /* TigerOrLater.xcconfig */; }; - 0062B6B20F2C08AD00B0562A /* Unittest.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B68F0F2C08AD00B0562A /* Unittest.xcconfig */; }; - 0062B6B30F2C08AD00B0562A /* DebugUnittest.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6910F2C08AD00B0562A /* DebugUnittest.xcconfig */; }; - 0062B6B40F2C08AD00B0562A /* LoadableBundle.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6920F2C08AD00B0562A /* LoadableBundle.xcconfig */; }; - 0062B6B50F2C08AD00B0562A /* LoadableBundleGCSupported.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6930F2C08AD00B0562A /* LoadableBundleGCSupported.xcconfig */; }; - 0062B6B60F2C08AD00B0562A /* ReleaseUnittest.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6940F2C08AD00B0562A /* ReleaseUnittest.xcconfig */; }; - 0062B6B70F2C08AD00B0562A /* SharedLibrary.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6950F2C08AD00B0562A /* SharedLibrary.xcconfig */; }; - 0062B6B80F2C08AD00B0562A /* SharedLibraryGCSupported.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6960F2C08AD00B0562A /* SharedLibraryGCSupported.xcconfig */; }; - 0062B6B90F2C08AD00B0562A /* StaticLibrary.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6970F2C08AD00B0562A /* StaticLibrary.xcconfig */; }; - 0062B6BA0F2C08AD00B0562A /* StaticLibraryGCSupported.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6980F2C08AD00B0562A /* StaticLibraryGCSupported.xcconfig */; }; - 0062B6BB0F2C08AD00B0562A /* xcconfigs-readme.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0062B6990F2C08AD00B0562A /* xcconfigs-readme.txt */; }; 007F598E0EF2438900B3005D /* GHNSArray+Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 007F59850EF2438900B3005D /* GHNSArray+Utils.h */; settings = {ATTRIBUTES = (Public, ); }; }; 007F598F0EF2438900B3005D /* GHNSArray+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 007F59860EF2438900B3005D /* GHNSArray+Utils.m */; }; 007F59900EF2438900B3005D /* GHNSDictionary+NSNull.h in Headers */ = {isa = PBXBuildFile; fileRef = 007F59870EF2438900B3005D /* GHNSDictionary+NSNull.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -70,6 +36,16 @@ 00A97A880F0C467600B083F6 /* GTMRegex.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A97A790F0C467600B083F6 /* GTMRegex.m */; }; 00A97A890F0C467600B083F6 /* GTMStackTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A97A7A0F0C467600B083F6 /* GTMStackTrace.h */; settings = {ATTRIBUTES = (Public, ); }; }; 00A97A8A0F0C467600B083F6 /* GTMStackTrace.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A97A7B0F0C467600B083F6 /* GTMStackTrace.m */; }; + 00AF10E70F2D5277009F0ABA /* TestsMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 00AF10E60F2D5277009F0ABA /* TestsMain.m */; }; + 00AF116C0F2D7D22009F0ABA /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00AF11400F2D555F009F0ABA /* GHUnit.framework */; }; + 00AF116F0F2D7D43009F0ABA /* NSURL+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B599E30F1D259200359A10 /* NSURL+UtilsTest.m */; }; + 00AF118C0F2D7EE2009F0ABA /* NSString+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52857D5C0E199B530011DA5C /* NSString+UtilsTest.m */; }; + 00AF118D0F2D7EE3009F0ABA /* NSString+TimeIntervalTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52857D5A0E199B530011DA5C /* NSString+TimeIntervalTest.m */; }; + 00AF118E0F2D7EE4009F0ABA /* NSString+HMACTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52D57E550E1C0E8200709FB4 /* NSString+HMACTest.m */; }; + 00AF118F0F2D7EE5009F0ABA /* NSInvocation+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 005B0AAC0F22C09F0004F351 /* NSInvocation+UtilsTest.m */; }; + 00AF11900F2D7EE6009F0ABA /* NSDate+ParsingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 005D0C3F0E19C03B003FAB86 /* NSDate+ParsingTest.m */; }; + 00AF11910F2D7EE6009F0ABA /* GHLoggerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 002E759E0F2C45DD00427636 /* GHLoggerTest.m */; }; + 00AF12580F2D8389009F0ABA /* GHKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00970A140F2836A100189A9D /* GHKit.framework */; }; 00CBE5C60E24783400E94F7B /* GTMDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 00CBE5C50E24783400E94F7B /* GTMDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; 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 */; }; @@ -105,6 +81,16 @@ 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 00AF11640F2D7CD2009F0ABA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* GHKit */; + remoteInfo = GHKit; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 002E757E0F2C424C00427636 /* GHLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHLogger.h; sourceTree = "<group>"; }; 002E757F0F2C424C00427636 /* GHLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHLogger.m; sourceTree = "<group>"; }; @@ -174,6 +160,11 @@ 00A97A790F0C467600B083F6 /* GTMRegex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMRegex.m; sourceTree = "<group>"; }; 00A97A7A0F0C467600B083F6 /* GTMStackTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMStackTrace.h; sourceTree = "<group>"; }; 00A97A7B0F0C467600B083F6 /* GTMStackTrace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMStackTrace.m; sourceTree = "<group>"; }; + 00AF10D00F2D5179009F0ABA /* GHKitTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GHKitTests.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 00AF10D20F2D5179009F0ABA /* GHKitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GHKitTests-Info.plist"; sourceTree = "<group>"; }; + 00AF10E60F2D5277009F0ABA /* TestsMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestsMain.m; sourceTree = "<group>"; }; + 00AF11400F2D555F009F0ABA /* GHUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GHUnit.framework; path = Library/Frameworks/GHUnit.framework; sourceTree = SDKROOT; }; + 00AF11760F2D7DF8009F0ABA /* GHKitTests_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHKitTests_Prefix.pch; sourceTree = "<group>"; }; 00B599E30F1D259200359A10 /* NSURL+UtilsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+UtilsTest.m"; sourceTree = "<group>"; }; 00CBE5C50E24783400E94F7B /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; }; 00CE8AAB0F24028900DD6464 /* GHNSObject+Invocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHNSObject+Invocation.h"; sourceTree = "<group>"; }; @@ -220,6 +211,15 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 00AF10CE0F2D5179009F0ABA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 00AF116C0F2D7D22009F0ABA /* GHUnit.framework in Frameworks */, + 00AF12580F2D8389009F0ABA /* GHKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DC2EF560486A6940098B216 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -348,6 +348,7 @@ isa = PBXGroup; children = ( 00970A140F2836A100189A9D /* GHKit.framework */, + 00AF10D00F2D5179009F0ABA /* GHKitTests.app */, ); name = Products; sourceTree = "<group>"; @@ -364,6 +365,8 @@ 034768DFFF38A50411DB9C8B /* Products */, 52857D700E199B940011DA5C /* Tests-Info.plist */, 004D508D0F21D91D00C916F1 /* TestApp-Info.plist */, + 00AF10D20F2D5179009F0ABA /* GHKitTests-Info.plist */, + 00AF11400F2D555F009F0ABA /* GHUnit.framework */, ); name = GHKit; sourceTree = "<group>"; @@ -458,6 +461,7 @@ isa = PBXGroup; children = ( 32DBCF5E0370ADEE00C91783 /* GHKit_Prefix.pch */, + 00AF11760F2D7DF8009F0ABA /* GHKitTests_Prefix.pch */, ); name = "Other Sources"; sourceTree = "<group>"; @@ -472,6 +476,7 @@ 00B599E30F1D259200359A10 /* NSURL+UtilsTest.m */, 005B0AAC0F22C09F0004F351 /* NSInvocation+UtilsTest.m */, 002E759E0F2C45DD00427636 /* GHLoggerTest.m */, + 00AF10E60F2D5277009F0ABA /* TestsMain.m */, ); path = Tests; sourceTree = "<group>"; @@ -530,6 +535,24 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 00AF10CF0F2D5179009F0ABA /* GHKitTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 00AF10D50F2D517A009F0ABA /* Build configuration list for PBXNativeTarget "GHKitTests" */; + buildPhases = ( + 00AF10CC0F2D5179009F0ABA /* Resources */, + 00AF10CD0F2D5179009F0ABA /* Sources */, + 00AF10CE0F2D5179009F0ABA /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 00AF11650F2D7CD2009F0ABA /* PBXTargetDependency */, + ); + name = GHKitTests; + productName = GHKitTests; + productReference = 00AF10D00F2D5179009F0ABA /* GHKitTests.app */; + productType = "com.apple.product-type.application"; + }; 8DC2EF4F0486A6940098B216 /* GHKit */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "GHKit" */; @@ -563,56 +586,45 @@ projectRoot = ""; targets = ( 8DC2EF4F0486A6940098B216 /* GHKit */, + 00AF10CF0F2D5179009F0ABA /* GHKitTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 00AF10CC0F2D5179009F0ABA /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DC2EF520486A6940098B216 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, - 0062B69A0F2C08AD00B0562A /* DebugiPhone.xcconfig in Resources */, - 0062B69B0F2C08AD00B0562A /* DebugiPhone20.xcconfig in Resources */, - 0062B69C0F2C08AD00B0562A /* DebugiPhone21.xcconfig in Resources */, - 0062B69D0F2C08AD00B0562A /* DebugLeopardOrLater.xcconfig in Resources */, - 0062B69E0F2C08AD00B0562A /* DebugSnowLeopardOrLater.xcconfig in Resources */, - 0062B69F0F2C08AD00B0562A /* DebugTigerOrLater.xcconfig in Resources */, - 0062B6A00F2C08AD00B0562A /* ReleaseiPhone.xcconfig in Resources */, - 0062B6A10F2C08AD00B0562A /* ReleaseiPhone20.xcconfig in Resources */, - 0062B6A20F2C08AD00B0562A /* ReleaseiPhone21.xcconfig in Resources */, - 0062B6A30F2C08AD00B0562A /* ReleaseLeopardOrLater.xcconfig in Resources */, - 0062B6A40F2C08AD00B0562A /* ReleaseSnowLeopardOrLater.xcconfig in Resources */, - 0062B6A50F2C08AD00B0562A /* ReleaseTigerOrLater.xcconfig in Resources */, - 0062B6A60F2C08AD00B0562A /* CodeCoverage.xcconfig in Resources */, - 0062B6A70F2C08AD00B0562A /* CodeCoverageStatic.xcconfig in Resources */, - 0062B6A80F2C08AD00B0562A /* Debug.xcconfig in Resources */, - 0062B6A90F2C08AD00B0562A /* GCSupported.xcconfig in Resources */, - 0062B6AA0F2C08AD00B0562A /* General.xcconfig in Resources */, - 0062B6AB0F2C08AD00B0562A /* GTMMerge.xcconfig in Resources */, - 0062B6AC0F2C08AD00B0562A /* iPhone20.xcconfig in Resources */, - 0062B6AD0F2C08AD00B0562A /* iPhone21.xcconfig in Resources */, - 0062B6AE0F2C08AD00B0562A /* LeopardOrLater.xcconfig in Resources */, - 0062B6AF0F2C08AD00B0562A /* Release.xcconfig in Resources */, - 0062B6B00F2C08AD00B0562A /* SnowLeopardOrLater.xcconfig in Resources */, - 0062B6B10F2C08AD00B0562A /* TigerOrLater.xcconfig in Resources */, - 0062B6B20F2C08AD00B0562A /* Unittest.xcconfig in Resources */, - 0062B6B30F2C08AD00B0562A /* DebugUnittest.xcconfig in Resources */, - 0062B6B40F2C08AD00B0562A /* LoadableBundle.xcconfig in Resources */, - 0062B6B50F2C08AD00B0562A /* LoadableBundleGCSupported.xcconfig in Resources */, - 0062B6B60F2C08AD00B0562A /* ReleaseUnittest.xcconfig in Resources */, - 0062B6B70F2C08AD00B0562A /* SharedLibrary.xcconfig in Resources */, - 0062B6B80F2C08AD00B0562A /* SharedLibraryGCSupported.xcconfig in Resources */, - 0062B6B90F2C08AD00B0562A /* StaticLibrary.xcconfig in Resources */, - 0062B6BA0F2C08AD00B0562A /* StaticLibraryGCSupported.xcconfig in Resources */, - 0062B6BB0F2C08AD00B0562A /* xcconfigs-readme.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 00AF10CD0F2D5179009F0ABA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 00AF10E70F2D5277009F0ABA /* TestsMain.m in Sources */, + 00AF116F0F2D7D43009F0ABA /* NSURL+UtilsTest.m in Sources */, + 00AF118C0F2D7EE2009F0ABA /* NSString+UtilsTest.m in Sources */, + 00AF118D0F2D7EE3009F0ABA /* NSString+TimeIntervalTest.m in Sources */, + 00AF118E0F2D7EE4009F0ABA /* NSString+HMACTest.m in Sources */, + 00AF118F0F2D7EE5009F0ABA /* NSInvocation+UtilsTest.m in Sources */, + 00AF11900F2D7EE6009F0ABA /* NSDate+ParsingTest.m in Sources */, + 00AF11910F2D7EE6009F0ABA /* GHLoggerTest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DC2EF540486A6940098B216 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -650,6 +662,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 00AF11650F2D7CD2009F0ABA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* GHKit */; + targetProxy = 00AF11640F2D7CD2009F0ABA /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -662,6 +682,64 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 00AF10D30F2D517A009F0ABA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../gh-unit/Frameworks\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = GHKitTests_Prefix.pch; + INFOPLIST_FILE = "GHKitTests-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = GHKitTests; + }; + name = Debug; + }; + 00AF10D40F2D517A009F0ABA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../gh-unit/Frameworks\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = GHKitTests_Prefix.pch; + INFOPLIST_FILE = "GHKitTests-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = GHKitTests; + ZERO_LINK = NO; + }; + name = Release; + }; 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 0062B6790F2C08AD00B0562A /* DebugLeopardOrLater.xcconfig */; @@ -744,6 +822,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 00AF10D50F2D517A009F0ABA /* Build configuration list for PBXNativeTarget "GHKitTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 00AF10D30F2D517A009F0ABA /* Debug */, + 00AF10D40F2D517A009F0ABA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "GHKit" */ = { isa = XCConfigurationList; buildConfigurations = ( GHKit.xcodeproj/project.pbxproj @@ -25,12 +25,6 @@ 00970D4F0F29234900189A9D /* GHNSStringUIKitUtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 00970D4E0F29234900189A9D /* GHNSStringUIKitUtilsTest.m */; }; 00970D590F29240E00189A9D /* GTMStackTrace.m in Sources */ = {isa = PBXBuildFile; fileRef = 00970D550F29240E00189A9D /* GTMStackTrace.m */; }; 00970D5A0F29240E00189A9D /* GTMObjC2Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = 00970D570F29240E00189A9D /* GTMObjC2Runtime.m */; }; - 009A95720F2930C300C5B773 /* NSInvocation+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A95660F2930C300C5B773 /* NSInvocation+UtilsTest.m */; }; - 009A95730F2930C300C5B773 /* NSURL+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A95670F2930C300C5B773 /* NSURL+UtilsTest.m */; }; - 009A95740F2930C300C5B773 /* NSString+UtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A95690F2930C300C5B773 /* NSString+UtilsTest.m */; }; - 009A95750F2930C300C5B773 /* NSString+TimeIntervalTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A956B0F2930C300C5B773 /* NSString+TimeIntervalTest.m */; }; - 009A95760F2930C300C5B773 /* NSString+HMACTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A956D0F2930C300C5B773 /* NSString+HMACTest.m */; }; - 009A95770F2930C300C5B773 /* NSDate+ParsingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 009A956F0F2930C300C5B773 /* NSDate+ParsingTest.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 */; }; 00A97A140F0C424400B083F6 /* GHUIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A97A100F0C424400B083F6 /* GHUIButton.m */; }; @@ -99,12 +93,6 @@ 00970D560F29240E00189A9D /* GTMStackTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMStackTrace.h; sourceTree = "<group>"; }; 00970D570F29240E00189A9D /* GTMObjC2Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMObjC2Runtime.m; sourceTree = "<group>"; }; 00970D580F29240E00189A9D /* GTMObjC2Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMObjC2Runtime.h; sourceTree = "<group>"; }; - 009A95660F2930C300C5B773 /* NSInvocation+UtilsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+UtilsTest.m"; sourceTree = "<group>"; }; - 009A95670F2930C300C5B773 /* NSURL+UtilsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+UtilsTest.m"; sourceTree = "<group>"; }; - 009A95690F2930C300C5B773 /* NSString+UtilsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+UtilsTest.m"; sourceTree = "<group>"; }; - 009A956B0F2930C300C5B773 /* NSString+TimeIntervalTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+TimeIntervalTest.m"; sourceTree = "<group>"; }; - 009A956D0F2930C300C5B773 /* NSString+HMACTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+HMACTest.m"; sourceTree = "<group>"; }; - 009A956F0F2930C300C5B773 /* NSDate+ParsingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+ParsingTest.m"; sourceTree = "<group>"; }; 009A957E0F29320D00C5B773 /* GHNSInvocation+Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GHNSInvocation+Utils.m"; sourceTree = "<group>"; }; 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>"; }; @@ -329,12 +317,6 @@ 00DB2AE10EECA3BA00383FB6 /* Tests */ = { isa = PBXGroup; children = ( - 009A95660F2930C300C5B773 /* NSInvocation+UtilsTest.m */, - 009A95670F2930C300C5B773 /* NSURL+UtilsTest.m */, - 009A95690F2930C300C5B773 /* NSString+UtilsTest.m */, - 009A956B0F2930C300C5B773 /* NSString+TimeIntervalTest.m */, - 009A956D0F2930C300C5B773 /* NSString+HMACTest.m */, - 009A956F0F2930C300C5B773 /* NSDate+ParsingTest.m */, 00DB2AE20EECA3BA00383FB6 /* IPhone */, ); path = Tests; @@ -492,12 +474,6 @@ 00970D4F0F29234900189A9D /* GHNSStringUIKitUtilsTest.m in Sources */, 00970D590F29240E00189A9D /* GTMStackTrace.m in Sources */, 00970D5A0F29240E00189A9D /* GTMObjC2Runtime.m in Sources */, - 009A95720F2930C300C5B773 /* NSInvocation+UtilsTest.m in Sources */, - 009A95730F2930C300C5B773 /* NSURL+UtilsTest.m in Sources */, - 009A95740F2930C300C5B773 /* NSString+UtilsTest.m in Sources */, - 009A95750F2930C300C5B773 /* NSString+TimeIntervalTest.m in Sources */, - 009A95760F2930C300C5B773 /* NSString+HMACTest.m in Sources */, - 009A95770F2930C300C5B773 /* NSDate+ParsingTest.m in Sources */, 009A95820F29320D00C5B773 /* GHNSInvocation+Utils.m in Sources */, 009A95830F29320D00C5B773 /* GHNSObject+Invocation.m in Sources */, ); GHKitIPhone.xcodeproj/project.pbxproj @@ -6,7 +6,7 @@ // Copyright 2009. All rights reserved. // -@interface GHLoggerTest : SenTestCase { } +@interface GHLoggerTest : GHTestCase { } @end @implementation GHLoggerTest Tests/GHLoggerTest.m @@ -8,7 +8,7 @@ #import "GHNSDate+Parsing.h" -@interface NSDateParsingTest : SenTestCase { } +@interface NSDateParsingTest : GHTestCase { } @end @implementation NSDateParsingTest @@ -17,7 +17,7 @@ NSString *rfc822 = @"Sun, 06 Nov 1994 08:49:37 +0000"; NSDate *date = [[NSDate alloc] initWithString:@"1994-11-06 08:49:37 +0000"]; NSString *formatted = [date gh_formatRFC822]; - STAssertEqualObjects(formatted, rfc822, @"Should conform to RFC822 date"); + GHAssertEqualObjects(formatted, rfc822, @"Should conform to RFC822 date"); } - (void)testParseHTTPDate { @@ -30,13 +30,13 @@ NSDate *parsed = nil; parsed = [NSDate gh_parseHTTP:rfc1123]; - STAssertEqualObjects(parsed, date, @"Should conform to RFC1123 date"); + GHAssertEqualObjects(parsed, date, @"Should conform to RFC1123 date"); parsed = [NSDate gh_parseHTTP:rfc850]; - STAssertEqualObjects(parsed, date, @"Should conform to RFC850/1036 date"); + GHAssertEqualObjects(parsed, date, @"Should conform to RFC850/1036 date"); parsed = [NSDate gh_parseHTTP:ascTime]; - STAssertEqualObjects(parsed, date, @"Should conform to ASCTime date"); + GHAssertEqualObjects(parsed, date, @"Should conform to ASCTime date"); } @end Tests/NSDate+ParsingTest.m @@ -8,7 +8,7 @@ #import "GHNSInvocation+Utils.h" -@interface NSInvocationUtilsTest : SenTestCase { +@interface NSInvocationUtilsTest : GHTestCase { BOOL invokeTesting1Called_; BOOL invokeTesting2Called_; } @@ -22,13 +22,13 @@ [NSInvocation gh_invokeWithTarget:self selector:@selector(_invokeTesting1:withObject:withObject:) withObjects:[NSNumber numberWithInteger:1], [NSNumber numberWithInteger:2], [NSNumber numberWithInteger:3], nil]; - STAssertTrue(invokeTesting1Called_, @"Method was not called"); + GHAssertTrue(invokeTesting1Called_, @"Method was not called"); } - (void)_invokeTesting1:(NSNumber *)number1 withObject:number2 withObject:number3 { - STAssertEqualObjects([NSNumber numberWithInteger:1], number1, nil); - STAssertEqualObjects([NSNumber numberWithInteger:2], number2, nil); - STAssertEqualObjects([NSNumber numberWithInteger:3], number3, nil); + GHAssertEqualObjects([NSNumber numberWithInteger:1], number1, nil); + GHAssertEqualObjects([NSNumber numberWithInteger:2], number2, nil); + GHAssertEqualObjects([NSNumber numberWithInteger:3], number3, nil); invokeTesting1Called_ = YES; } @@ -36,13 +36,13 @@ NSArray *arguments = [NSArray arrayWithObjects:[NSNumber numberWithInteger:1], [NSNull null], [NSNumber numberWithInteger:3], nil]; [NSInvocation gh_invokeWithTarget:self selector:@selector(_invokeTesting2:withObject:withObject:) arguments:arguments]; - STAssertTrue(invokeTesting2Called_, @"Method was not called"); + GHAssertTrue(invokeTesting2Called_, @"Method was not called"); } - (void)_invokeTesting2:(NSNumber *)number1 withObject:nilValue withObject:number3 { - STAssertEqualObjects([NSNumber numberWithInteger:1], number1, nil); - STAssertNULL(nilValue, @"Should be nil"); - STAssertEqualObjects([NSNumber numberWithInteger:3], number3, nil); + GHAssertEqualObjects([NSNumber numberWithInteger:1], number1, nil); + GHAssertNULL(nilValue, @"Should be nil"); + GHAssertEqualObjects([NSNumber numberWithInteger:3], number3, nil); invokeTesting2Called_ = YES; } Tests/NSInvocation+UtilsTest.m @@ -8,7 +8,7 @@ #import "GHNSString+HMAC.h" -@interface NSStringHMACTest : SenTestCase { } +@interface NSStringHMACTest : GHTestCase { } @end @implementation NSStringHMACTest @@ -18,11 +18,11 @@ // http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAuthentication.html NSString *stringToSign = @"GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/johnsmith/photos/puppy.jpg"; - NSLog(@"String to sign: %@", stringToSign); + GHDebug(@"String to sign: %@", stringToSign); NSString *secretKey = @"uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"; NSString *signature = [stringToSign gh_hmacSha1:secretKey]; - STAssertEqualObjects(@"xXjDGYUmKxnwqr5KXNPGldn5LbA=", signature, @"HMAC SHA1 signature is not correct"); + GHAssertEqualObjects(@"xXjDGYUmKxnwqr5KXNPGldn5LbA=", signature, @"HMAC SHA1 signature is not correct"); } @end Tests/NSString+HMACTest.m @@ -7,39 +7,39 @@ #import "GHNSString+TimeInterval.h" -@interface NSStringTimeIntervalTest : SenTestCase { } +@interface NSStringTimeIntervalTest : GHTestCase { } @end @implementation NSStringTimeIntervalTest - (void)testStringForTimeInterval { - STAssertEqualObjects(@"less than a minute", [NSString gh_stringForTimeInterval:29.0 includeSeconds:NO], @"Invalid string for time interval"); - STAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:30.0 includeSeconds:NO], @"Invalid string for time interval"); + GHAssertEqualObjects(@"less than a minute", [NSString gh_stringForTimeInterval:29.0 includeSeconds:NO], @"Invalid string for time interval"); + GHAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:30.0 includeSeconds:NO], @"Invalid string for time interval"); - STAssertEqualObjects(@"less than 5 seconds", [NSString gh_stringForTimeInterval:4.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"less than 10 seconds", [NSString gh_stringForTimeInterval:5.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"less than 20 seconds", [NSString gh_stringForTimeInterval:19.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"half a minute", [NSString gh_stringForTimeInterval:29.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"less than a minute", [NSString gh_stringForTimeInterval:59.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:60.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"less than 5 seconds", [NSString gh_stringForTimeInterval:4.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"less than 10 seconds", [NSString gh_stringForTimeInterval:5.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"less than 20 seconds", [NSString gh_stringForTimeInterval:19.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"half a minute", [NSString gh_stringForTimeInterval:29.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"less than a minute", [NSString gh_stringForTimeInterval:59.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:60.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:89.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"2 minutes", [NSString gh_stringForTimeInterval:90.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"1 minute", [NSString gh_stringForTimeInterval:89.0 includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"2 minutes", [NSString gh_stringForTimeInterval:90.0 includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"44 minutes", [NSString gh_stringForTimeInterval:(44.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"about 1 hour", [NSString gh_stringForTimeInterval:(45.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"about 1 hour", [NSString gh_stringForTimeInterval:(89.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"about 2 hours", [NSString gh_stringForTimeInterval:(90.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"1 day", [NSString gh_stringForTimeInterval:(47.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"2 days", [NSString gh_stringForTimeInterval:(48.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"3 days", [NSString gh_stringForTimeInterval:(60.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"3 days", [NSString gh_stringForTimeInterval:(72.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"15 days", [NSString gh_stringForTimeInterval:(15.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"about 1 month", [NSString gh_stringForTimeInterval:(30.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"2 months", [NSString gh_stringForTimeInterval:(60.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"44 minutes", [NSString gh_stringForTimeInterval:(44.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"about 1 hour", [NSString gh_stringForTimeInterval:(45.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"about 1 hour", [NSString gh_stringForTimeInterval:(89.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"about 2 hours", [NSString gh_stringForTimeInterval:(90.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"1 day", [NSString gh_stringForTimeInterval:(47.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"2 days", [NSString gh_stringForTimeInterval:(48.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"3 days", [NSString gh_stringForTimeInterval:(60.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"3 days", [NSString gh_stringForTimeInterval:(72.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"15 days", [NSString gh_stringForTimeInterval:(15.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"about 1 month", [NSString gh_stringForTimeInterval:(30.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"2 months", [NSString gh_stringForTimeInterval:(60.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"about 1 year", [NSString gh_stringForTimeInterval:(365.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); - STAssertEqualObjects(@"over 2 years", [NSString gh_stringForTimeInterval:(2.0 * 365.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"about 1 year", [NSString gh_stringForTimeInterval:(365.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); + GHAssertEqualObjects(@"over 2 years", [NSString gh_stringForTimeInterval:(2.0 * 365.0 * 24.0 * 60.0 * 60.0) includeSeconds:YES], @"Invalid string for time interval"); } @end Tests/NSString+TimeIntervalTest.m @@ -9,70 +9,70 @@ #import "GHNSString+Utils.h" #import "GHNSString+Validation.h" -@interface NSStringUtilsTest : SenTestCase { } +@interface NSStringUtilsTest : GHTestCase { } @end @implementation NSStringUtilsTest - (void)testMimeTypes { NSString *mimeType = [@"pdf" gh_mimeTypeForExtension]; - STAssertEqualObjects(@"application/pdf", mimeType, @"Should be pdf mime type"); + GHAssertEqualObjects(@"application/pdf", mimeType, @"Should be pdf mime type"); } - (void)testValidateEmail { NSString *valid = @"gabrielh@gmail.com"; - STAssertTrue([valid gh_isEmailAddress], @"Should be valid email"); + GHAssertTrue([valid gh_isEmailAddress], @"Should be valid email"); NSString *invalid = @"foo"; - STAssertFalse([invalid gh_isEmailAddress], @"Should be invalid email"); + GHAssertFalse([invalid gh_isEmailAddress], @"Should be invalid email"); NSString *invalid2 = @"~gabrielh@gmail.com"; - STAssertFalse([invalid2 gh_isEmailAddress], @"Should be invalid email"); + GHAssertFalse([invalid2 gh_isEmailAddress], @"Should be invalid email"); NSString *valid3 = @"gabrielh@gmail.commmmmmm"; - STAssertTrue([valid3 gh_isEmailAddress], @"Should be valid email"); + GHAssertTrue([valid3 gh_isEmailAddress], @"Should be valid email"); } - (void)testLastSplitWithString { - STAssertEqualObjects(@"bar", [@"foo:bar" gh_lastSplitWithString:@":" options:NSCaseInsensitiveSearch], @"Split is invalid"); - STAssertEqualObjects(@"foobar", [@"foobar" gh_lastSplitWithString:@":" options:NSCaseInsensitiveSearch], @"Split is invalid"); + GHAssertEqualObjects(@"bar", [@"foo:bar" gh_lastSplitWithString:@":" options:NSCaseInsensitiveSearch], @"Split is invalid"); + GHAssertEqualObjects(@"foobar", [@"foobar" gh_lastSplitWithString:@":" options:NSCaseInsensitiveSearch], @"Split is invalid"); - STAssertEqualObjects(@"foobar", [@"foobar" gh_lastSplitWithString:@"" options:NSCaseInsensitiveSearch], @"Split is invalid"); - STAssertEqualObjects(@"ar", [@"foobar" gh_lastSplitWithString:@"oob" options:NSCaseInsensitiveSearch], @"Split is invalid"); + GHAssertEqualObjects(@"foobar", [@"foobar" gh_lastSplitWithString:@"" options:NSCaseInsensitiveSearch], @"Split is invalid"); + GHAssertEqualObjects(@"ar", [@"foobar" gh_lastSplitWithString:@"oob" options:NSCaseInsensitiveSearch], @"Split is invalid"); } - (void)testCutWithString { NSArray *expected = [NSArray arrayWithObjects:@"foo:", @"bar", nil]; NSArray *cuts = [@"foo:bar" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected, cuts, @"Cut is invalid"); + GHAssertEqualObjects(expected, cuts, @"Cut is invalid"); NSArray *expected2 = [NSArray arrayWithObjects:@"foobar", nil]; NSArray *cuts2 = [@"foobar" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected2, cuts2, @"Cut is invalid"); + GHAssertEqualObjects(expected2, cuts2, @"Cut is invalid"); NSArray *expected3 = [NSArray arrayWithObjects:@"foo:", nil]; NSArray *cuts3 = [@"foo:" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected3, cuts3, @"Cut is invalid"); + GHAssertEqualObjects(expected3, cuts3, @"Cut is invalid"); NSArray *expected4 = [NSArray arrayWithObjects:@"", nil]; NSArray *cuts4 = [@"" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected4, cuts4, @"Cut is invalid"); + GHAssertEqualObjects(expected4, cuts4, @"Cut is invalid"); NSArray *expected5 = [NSArray arrayWithObjects:@":", nil]; NSArray *cuts5 = [@":" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected5, cuts5, @"Cut is invalid"); + GHAssertEqualObjects(expected5, cuts5, @"Cut is invalid"); NSArray *expected6 = [NSArray arrayWithObjects:@":", @":", nil]; NSArray *cuts6 = [@"::" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected6, cuts6, @"Cut is invalid"); + GHAssertEqualObjects(expected6, cuts6, @"Cut is invalid"); NSArray *expected7 = [NSArray arrayWithObjects:@":", @"foo:", nil]; NSArray *cuts7 = [@":foo:" gh_cutWithString:@":" options:0]; - STAssertEqualObjects(expected7, cuts7, @"Cut is invalid"); + GHAssertEqualObjects(expected7, cuts7, @"Cut is invalid"); NSArray *expected8 = [NSArray arrayWithObjects:@"foo---", @"bar", nil]; NSArray *cuts8 = [@"foo---bar" gh_cutWithString:@"---" options:0]; - STAssertEqualObjects(expected8, cuts8, @"Cut is invalid"); + GHAssertEqualObjects(expected8, cuts8, @"Cut is invalid"); } - (void)testCut { @@ -80,69 +80,76 @@ NSString *text = @"Lorem ipsum dolor sit amet"; NSArray *cuts = [text gh_cutWithString:@" " options:0 cutAfter:YES]; NSArray *expected = [NSArray arrayWithObjects:@"Lorem ", @"ipsum ", @"dolor ", @"sit ", @"amet", nil]; - STAssertEqualObjects(cuts, expected, nil); + GHAssertEqualObjects(cuts, expected, nil); } - (void)testCutBefore { - NSString *text = @"Lorem ipsum dolor sit amet"; - NSArray *cuts = [text gh_cutWithString:@" " options:0 cutAfter:NO]; - NSArray *expected = [NSArray arrayWithObjects:@"Lorem", @" ipsum", @" dolor", @" sit", @" amet", nil]; - - //STAssertEqualObjects(cuts, expected, nil); +// NSString *text = @"Lorem ipsum dolor sit amet"; +// NSArray *cuts = [text gh_cutWithString:@" " options:0 cutAfter:NO]; +// NSArray *expected = [NSArray arrayWithObjects:@"Lorem", @" ipsum", @" dolor", @" sit", @" amet", nil]; + //GHAssertEqualObjects(cuts, expected, nil); } - (void)testSubStringSegmentsWithin { NSString *test1 = @"This <START>is a<END> test."; NSArray *segments1 = [test1 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected1 = [NSArray arrayWithObjects:[GHStringSegment string:@"This " isMatch:NO], [GHStringSegment string:@"is a" isMatch:YES], [GHStringSegment string:@" test." isMatch:NO], nil]; - STAssertEqualObjects(segments1, expected1, @"Segments is invalid"); + NSArray *expected1 = [NSArray arrayWithObjects: + [GHNSStringSegment string:@"This " isMatch:NO], + [GHNSStringSegment string:@"is a" isMatch:YES], + [GHNSStringSegment string:@" test." isMatch:NO], nil]; + GHAssertEqualObjects(segments1, expected1, @"Segments is invalid"); NSString *test2 = @"This is a test."; NSArray *segments2 = [test2 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected2 = [NSArray arrayWithObjects:[GHStringSegment string:@"This is a test." isMatch:NO], nil]; - STAssertEqualObjects(segments2, expected2, @"Segments is invalid"); + NSArray *expected2 = [NSArray arrayWithObjects:[GHNSStringSegment string:@"This is a test." isMatch:NO], nil]; + GHAssertEqualObjects(segments2, expected2, @"Segments is invalid"); NSString *test3 = @"<START>This is a test.<END>"; NSArray *segments3 = [test3 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected3 = [NSArray arrayWithObjects:[GHStringSegment string:@"This is a test." isMatch:YES], nil]; - STAssertEqualObjects(segments3, expected3, @"Segments is invalid"); + NSArray *expected3 = [NSArray arrayWithObjects:[GHNSStringSegment string:@"This is a test." isMatch:YES], nil]; + GHAssertEqualObjects(segments3, expected3, @"Segments is invalid"); NSString *test4 = @"<START>This is a test.<END> "; NSArray *segments4 = [test4 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected4 = [NSArray arrayWithObjects:[GHStringSegment string:@"This is a test." isMatch:YES], [GHStringSegment string:@" " isMatch:NO], nil]; - STAssertEqualObjects(segments4, expected4, @"Segments is invalid"); + NSArray *expected4 = [NSArray arrayWithObjects: + [GHNSStringSegment string:@"This is a test." isMatch:YES], + [GHNSStringSegment string:@" " isMatch:NO], nil]; + GHAssertEqualObjects(segments4, expected4, @"Segments is invalid"); NSString *test5 = @" <START>This is a test.<END> <END>"; NSArray *segments5 = [test5 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected5 = [NSArray arrayWithObjects:[GHStringSegment string:@" " isMatch:NO], [GHStringSegment string:@"This is a test." isMatch:YES], [GHStringSegment string:@" <END>" isMatch:NO], nil]; - STAssertEqualObjects(segments5, expected5, @"Segments is invalid"); + NSArray *expected5 = [NSArray arrayWithObjects: + [GHNSStringSegment string:@" " isMatch:NO], + [GHNSStringSegment string:@"This is a test." isMatch:YES], + [GHNSStringSegment string:@" <END>" isMatch:NO], nil]; + GHAssertEqualObjects(segments5, expected5, @"Segments is invalid"); // TODO: Ok to kill the start token? NSString *test6 = @"<START>This is a test."; NSArray *segments6 = [test6 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; - NSArray *expected6 = [NSArray arrayWithObjects:[GHStringSegment string:@"This is a test." isMatch:YES], nil]; - STAssertEqualObjects(segments6, expected6, @"Segments is invalid"); + NSArray *expected6 = [NSArray arrayWithObjects:[GHNSStringSegment string:@"This is a test." isMatch:YES], nil]; + GHAssertEqualObjects(segments6, expected6, @"Segments is invalid"); // TODO: Return nil on empty string input? NSString *test7 = @""; NSArray *segments7 = [test7 gh_substringSegmentsWithinStart:@"<START>" end:@"<END>"]; NSArray *expected7 = [NSArray arrayWithObjects:nil]; - STAssertEqualObjects(segments7, expected7, @"Segments is invalid"); + GHAssertEqualObjects(segments7, expected7, @"Segments is invalid"); } - (void)testRightStrip { NSString *text = @"this is a string to right strip "; NSString *expected = @"this is a string to right strip"; - STAssertEqualStrings([text gh_rightStrip], expected, nil); + GHAssertEqualStrings([text gh_rightStrip], expected, nil); } - (void)testLeftStrip { NSString *text = @" this is a string to left strip"; NSString *expected = @"this is a string to left strip"; - STAssertEqualStrings([text gh_leftStrip], expected, nil); + GHAssertEqualStrings([text gh_leftStrip], expected, nil); } Tests/NSString+UtilsTest.m @@ -7,7 +7,7 @@ #import "GHNSURL+Utils.h" -@interface NSURLUtilsTest : SenTestCase { } +@interface NSURLUtilsTest : GHTestCase { } @end @implementation NSURLUtilsTest @@ -16,35 +16,35 @@ NSString *test1 = @"~!@#$%^&*(){}[]=:/,;?+'\"\\"; NSString *escaped1 = [NSURL gh_encode:test1]; NSArray *expected1 = @"~!@#$%25%5E&*()%7B%7D%5B%5D=:/,;?+'%22%5C"; - STAssertEqualObjects(escaped1, expected1, nil); + GHAssertEqualObjects(escaped1, expected1, nil); } - (void)testEncodeAll { NSString *test1 = @"~!@#$%^&*(){}[]=:/,;?+'\"\\"; NSString *escaped1 = [NSURL gh_encodeAll:test1]; NSArray *expected1 = @"~!%40%23%24%25%5E%26*()%7B%7D%5B%5D%3D%3A%2F%2C%3B%3F%2B'%22%5C"; - STAssertEqualObjects(escaped1, expected1, nil); + GHAssertEqualObjects(escaped1, expected1, nil); } - (void)testParamsToString { NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil]; NSString *s = [NSURL gh_paramsToString:dict]; - STAssertEqualObjects(s, @"key1=value1&key2=value2", nil); + GHAssertEqualObjects(s, @"key1=value1&key2=value2", nil); NSDictionary *dict2 = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"AAA", @"value2", @"BBB", @"value3", @"CCC", nil]; NSString *s2 = [NSURL gh_paramsToString:dict2 sort:YES]; - STAssertEqualObjects(s2, @"AAA=value1&BBB=value2&CCC=value3", nil); + GHAssertEqualObjects(s2, @"AAA=value1&BBB=value2&CCC=value3", nil); } - (void)testStringToParams { NSDictionary *dict = [NSURL gh_stringToParams:@"key1=value1&key2=value2"]; - STAssertEqualObjects(@"value1", [dict objectForKey:@"key1"], nil); - STAssertEqualObjects(@"value2", [dict objectForKey:@"key2"], nil); + GHAssertEqualObjects(@"value1", [dict objectForKey:@"key1"], nil); + GHAssertEqualObjects(@"value2", [dict objectForKey:@"key2"], nil); NSDictionary *dict2 = [NSURL gh_stringToParams:@"key1==value1&&key2=value2&key3=value3=more"]; - STAssertEqualObjects(@"=value1", [dict2 objectForKey:@"key1"], nil); - STAssertEqualObjects(@"value2", [dict2 objectForKey:@"key2"], nil); - STAssertEqualObjects(@"value3=more", [dict2 objectForKey:@"key3"], nil); + GHAssertEqualObjects(@"=value1", [dict2 objectForKey:@"key1"], nil); + GHAssertEqualObjects(@"value2", [dict2 objectForKey:@"key2"], nil); + GHAssertEqualObjects(@"value3=more", [dict2 objectForKey:@"key3"], nil); } Tests/NSURL+UtilsTest.m b2797f7fa8cae1edb7b7cf7ee4badb1e6b602e45 Gabriel Handford gabrielh@gmail.com http://github.com/gabriel/gh-kit/commit/6815762cb8a738aaa82e5b7ce241b24de620efe1 6815762cb8a738aaa82e5b7ce241b24de620efe1 2009-01-25T23:13:51-08:00 2009-01-25T23:13:51-08:00 Integrating with GHUnit 7c532f07ce286ce24d56c7ee2b4b6b86c4420032 Gabriel Handford gabrielh@gmail.com