Merge branch 'jake' of git@github.com:280north/cappuccino into jake

This commit is contained in:
Francisco Ryan Tolmasky I
2009-11-11 02:14:08 -08:00
2 changed files with 25 additions and 1 deletions
+1 -1
View File
@@ -510,7 +510,7 @@ var CPStringRegexSpecialCharacters = [
*/
- (BOOL)hasSuffix:(CPString)aString
{
return aString && aString != "" && lastIndexOf(aString) == (length - aString.length);
return aString && aString != "" && length >= aString.length && lastIndexOf(aString) == (length - aString.length);
}
/*!
+24
View File
@@ -233,4 +233,28 @@
[self assert:testStrings[i][1] equals:[testStrings[i][0] lastPathComponent]];
}
- (void)testHasPrefix
{
[self assertTrue: ["abc" hasPrefix:"a"]];
[self assertTrue: ["abc" hasPrefix:"ab"]];
[self assertTrue: ["abc" hasPrefix:"abc"]];
[self assertFalse:["abc" hasPrefix:"abcd"]];
[self assertFalse:["abc" hasPrefix:"dbc"]];
[self assertFalse:["abc" hasPrefix:"bc"]];
[self assertFalse:["abc" hasPrefix:"c"]];
[self assertFalse:["abc" hasPrefix:""]];
}
- (void)testHasSuffix
{
[self assertTrue: ["abc" hasSuffix:"c"]];
[self assertTrue: ["abc" hasSuffix:"bc"]];
[self assertTrue: ["abc" hasSuffix:"abc"]];
[self assertFalse:["abc" hasSuffix:"abcd"]];
[self assertFalse:["abc" hasSuffix:"ab"]];
[self assertFalse:["abc" hasSuffix:"b"]];
[self assertFalse:["abc" hasSuffix:"cat"]];
[self assertFalse:["abc" hasSuffix:""]];
}
@end