mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 00:30:53 +00:00
tidy and add a couple of tests
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38521 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
d8e9f81945
commit
1b78cfe4bd
1 changed files with 183 additions and 154 deletions
|
|
@ -31,19 +31,19 @@ static void strCompare (char *s0, char *s1, NSComparisonResult ci,
|
|||
us0 = nil;
|
||||
us1 = nil;
|
||||
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString:s0];
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString: s0];
|
||||
l = [cs0 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs0 getCharacters:b];
|
||||
us0 = [NSString stringWithCharacters:b length:l];
|
||||
[cs0 getCharacters: b];
|
||||
us0 = [NSString stringWithCharacters: b length: l];
|
||||
|
||||
cs1 = [NSString stringWithCString:s1];
|
||||
cs1 = [NSString stringWithCString: s1];
|
||||
l = [cs1 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs1 getCharacters:b];
|
||||
us1 = [NSString stringWithCharacters:b length:l];,
|
||||
[cs1 getCharacters: b];
|
||||
us1 = [NSString stringWithCharacters: b length: l];,
|
||||
"create strings for compare is ok");
|
||||
opts = NSCaseInsensitiveSearch;
|
||||
type = "case insensitive comparison for";
|
||||
|
|
@ -63,16 +63,16 @@ static void strCompare (char *s0, char *s1, NSComparisonResult ci,
|
|||
}
|
||||
want = ci;
|
||||
|
||||
res = [cs0 compare:cs1 options:opts range:ra];
|
||||
res = [cs0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "CCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:us1 options:opts range:ra];
|
||||
res = [us0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "UUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:cs1 options:opts range:ra];
|
||||
res = [us0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "UCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [cs0 compare:us1 options:opts range:ra];
|
||||
res = [cs0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "CUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
opts = 0;
|
||||
|
|
@ -90,16 +90,16 @@ static void strCompare (char *s0, char *s1, NSComparisonResult ci,
|
|||
break;
|
||||
}
|
||||
want = cs;
|
||||
res = [cs0 compare:cs1 options:opts range:ra];
|
||||
res = [cs0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "CCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:us1 options:opts range:ra];
|
||||
res = [us0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "UUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:cs1 options:opts range:ra];
|
||||
res = [us0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "UCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [cs0 compare:us1 options:opts range:ra];
|
||||
res = [cs0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "CUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
opts = NSCaseInsensitiveSearch | NSLiteralSearch;
|
||||
|
|
@ -117,16 +117,16 @@ static void strCompare (char *s0, char *s1, NSComparisonResult ci,
|
|||
break;
|
||||
}
|
||||
want = lci;
|
||||
res = [cs0 compare:cs1 options:opts range:ra];
|
||||
res = [cs0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "CCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:us1 options:opts range:ra];
|
||||
res = [us0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "UUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:cs1 options:opts range:ra];
|
||||
res = [us0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "UCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [cs0 compare:us1 options:opts range:ra];
|
||||
res = [cs0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "CUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
opts = NSLiteralSearch;
|
||||
|
|
@ -144,16 +144,16 @@ static void strCompare (char *s0, char *s1, NSComparisonResult ci,
|
|||
break;
|
||||
}
|
||||
want = lcs;
|
||||
res = [cs0 compare:cs1 options:opts range:ra];
|
||||
res = [cs0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "CCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:us1 options:opts range:ra];
|
||||
res = [us0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "UUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [us0 compare:cs1 options:opts range:ra];
|
||||
res = [us0 compare: cs1 options: opts range: ra];
|
||||
PASS(res == want, "UCString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
res = [cs0 compare:us1 options:opts range:ra];
|
||||
res = [cs0 compare: us1 options: opts range: ra];
|
||||
PASS(res == want, "CUString %s '%s' and '%s' %s ", type, s0, s1, txt);
|
||||
|
||||
}
|
||||
|
|
@ -172,31 +172,31 @@ static void strRange(char *s0, char *s1, unsigned int opts,
|
|||
us0 = nil;
|
||||
us1 = nil;
|
||||
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString:s0];
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString: s0];
|
||||
l = [cs0 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs0 getCharacters:b];
|
||||
us0 = [NSString stringWithCharacters:b length:l];
|
||||
[cs0 getCharacters: b];
|
||||
us0 = [NSString stringWithCharacters: b length: l];
|
||||
|
||||
cs1 = [NSString stringWithCString:s1];
|
||||
cs1 = [NSString stringWithCString: s1];
|
||||
l = [cs1 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs1 getCharacters:b];
|
||||
us1 = [NSString stringWithCharacters:b length:l];,
|
||||
[cs1 getCharacters: b];
|
||||
us1 = [NSString stringWithCharacters: b length: l];,
|
||||
"create strings for range is ok");
|
||||
|
||||
res = [cs0 rangeOfString:cs1 options:opts range:range];
|
||||
res = [cs0 rangeOfString: cs1 options: opts range: range];
|
||||
PASS(rangesEqual(res,want), "CCString range for '%s' and '%s' is ok",s0,s1);
|
||||
|
||||
res = [us0 rangeOfString:us1 options:opts range:range];
|
||||
res = [us0 rangeOfString: us1 options: opts range: range];
|
||||
PASS(rangesEqual(res,want), "UUString range for '%s' and '%s' is ok",s0,s1);
|
||||
|
||||
res = [us0 rangeOfString:cs1 options:opts range:range];
|
||||
res = [us0 rangeOfString: cs1 options: opts range: range];
|
||||
PASS(rangesEqual(res,want), "UCString range for '%s' and '%s' is ok",s0,s1);
|
||||
|
||||
res = [cs0 rangeOfString:us1 options:opts range:range];
|
||||
res = [cs0 rangeOfString: us1 options: opts range: range];
|
||||
PASS(rangesEqual(res,want), "CUString range for '%s' and '%s' is ok",s0,s1);
|
||||
}
|
||||
|
||||
|
|
@ -212,31 +212,31 @@ static void strRangeFromSet(char *s, NSCharacterSet *c, unsigned int o, NSRange
|
|||
cs1 = nil;
|
||||
us0 = nil;
|
||||
us1 = nil;
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString:s];
|
||||
PASS_RUNS(cs0 = [NSString stringWithCString: s];
|
||||
l = [cs0 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs0 getCharacters:b];
|
||||
us0 = [NSString stringWithCharacters:b length:l];
|
||||
[cs0 getCharacters: b];
|
||||
us0 = [NSString stringWithCharacters: b length: l];
|
||||
|
||||
cs1 = [NSMutableString stringWithCString:s];
|
||||
cs1 = [NSMutableString stringWithCString: s];
|
||||
l = [cs1 length];
|
||||
d = [NSMutableData dataWithLength:(l * 2)];
|
||||
d = [NSMutableData dataWithLength: (l * 2)];
|
||||
b = [d mutableBytes];
|
||||
[cs1 getCharacters:b];
|
||||
us1 = [NSMutableString stringWithCharacters:b length:l];,
|
||||
[cs1 getCharacters: b];
|
||||
us1 = [NSMutableString stringWithCharacters: b length: l];,
|
||||
"create strings for range");
|
||||
|
||||
res = [cs0 rangeOfCharacterFromSet:c options:o range:range];
|
||||
res = [cs0 rangeOfCharacterFromSet: c options: o range: range];
|
||||
PASS(rangesEqual(res,want), "CString range for '%s' is ok",s);
|
||||
|
||||
res = [us0 rangeOfCharacterFromSet:c options:o range:range];
|
||||
res = [us0 rangeOfCharacterFromSet: c options: o range: range];
|
||||
PASS(rangesEqual(res,want), "UString range for '%s' is ok",s);
|
||||
|
||||
res = [cs1 rangeOfCharacterFromSet:c options:o range:range];
|
||||
res = [cs1 rangeOfCharacterFromSet: c options: o range: range];
|
||||
PASS(rangesEqual(res,want), "MCString range for '%s' is ok",s);
|
||||
|
||||
res = [us1 rangeOfCharacterFromSet:c options:o range:range];
|
||||
res = [us1 rangeOfCharacterFromSet: c options: o range: range];
|
||||
PASS(rangesEqual(res,want), "MUString range for '%s' is ok",s);
|
||||
}
|
||||
static void testLineRange(char *s, NSRange range, NSRange want)
|
||||
|
|
@ -245,9 +245,9 @@ static void testLineRange(char *s, NSRange range, NSRange want)
|
|||
NSString *cs0;
|
||||
int l;
|
||||
|
||||
cs0 = [NSString stringWithCString:s];
|
||||
cs0 = [NSString stringWithCString: s];
|
||||
l = [cs0 length];
|
||||
res = [cs0 lineRangeForRange:range];
|
||||
res = [cs0 lineRangeForRange: range];
|
||||
PASS(rangesEqual(res,want), "lineRangeForRange: with '%s' is ok",s);
|
||||
}
|
||||
|
||||
|
|
@ -279,13 +279,13 @@ int main()
|
|||
NSInvalidArgumentException,
|
||||
"initWithCString raises for NULL");
|
||||
|
||||
PASS_EXCEPTION([@"Hello" substringWithRange:NSMakeRange(6,4)];,
|
||||
PASS_EXCEPTION([@"Hello" substringWithRange: NSMakeRange(6,4)];,
|
||||
NSRangeException,
|
||||
"NSString extracting substring with range beyond end of string");
|
||||
|
||||
PASS_EXCEPTION([@"Hello" compare: @"Hello"
|
||||
options:NSLiteralSearch
|
||||
range:NSMakeRange(4,3)];,
|
||||
options: NSLiteralSearch
|
||||
range: NSMakeRange(4,3)];,
|
||||
NSRangeException,
|
||||
"NSString comparison with range beyond end of string");
|
||||
|
||||
|
|
@ -296,7 +296,8 @@ int main()
|
|||
NSOrderedSame,NSMakeRange(0,5));
|
||||
strCompare("", "",NSOrderedSame, NSOrderedSame, NSOrderedSame, NSOrderedSame,
|
||||
NSMakeRange(0,0));
|
||||
strCompare("hello", "Hello", NSOrderedSame, NSOrderedDescending, NSOrderedSame,
|
||||
strCompare("hello", "Hello",
|
||||
NSOrderedSame, NSOrderedDescending, NSOrderedSame,
|
||||
NSOrderedDescending,NSMakeRange(0,5));
|
||||
strCompare("Hello", "hello", NSOrderedSame, NSOrderedAscending, NSOrderedSame,
|
||||
NSOrderedAscending, NSMakeRange(0,5));
|
||||
|
|
@ -304,12 +305,12 @@ int main()
|
|||
NSOrderedDescending, NSOrderedDescending, NSMakeRange(0,3));
|
||||
strCompare("ab", "abc", NSOrderedAscending, NSOrderedAscending,
|
||||
NSOrderedAscending, NSOrderedAscending, NSMakeRange(0,2));
|
||||
strCompare("", "a", NSOrderedAscending, NSOrderedAscending, NSOrderedAscending,
|
||||
NSOrderedAscending, NSMakeRange(0,0));
|
||||
strCompare("", "a", NSOrderedAscending, NSOrderedAscending,
|
||||
NSOrderedAscending, NSOrderedAscending, NSMakeRange(0,0));
|
||||
strCompare("a", "", NSOrderedDescending, NSOrderedDescending,
|
||||
NSOrderedDescending, NSOrderedDescending, NSMakeRange(0,1));
|
||||
strCompare("a", "", NSOrderedSame, NSOrderedSame, NSOrderedSame, NSOrderedSame,
|
||||
NSMakeRange(0,0));
|
||||
strCompare("a", "", NSOrderedSame, NSOrderedSame, NSOrderedSame,
|
||||
NSOrderedSame, NSMakeRange(0,0));
|
||||
strCompare("Location", "LoCaTiOn", NSOrderedSame, NSOrderedDescending,
|
||||
NSOrderedSame, NSOrderedDescending, NSMakeRange(0,8));
|
||||
strCompare("1234567890_!@$%^&*()QWERTYUIOP{}ASDFGHJKL:;'ZXCVBNM,./<>?",
|
||||
|
|
@ -331,26 +332,51 @@ int main()
|
|||
strCompare("abcdefg", "CDEF", NSOrderedAscending, NSOrderedDescending,
|
||||
NSOrderedAscending, NSOrderedDescending, NSMakeRange(2,3));
|
||||
|
||||
strRange("hello", "hello", NSAnchoredSearch, NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hello", NSAnchoredSearch | NSBackwardsSearch, NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hElLo", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(0,0));
|
||||
strRange("hello", "hElLo", NSCaseInsensitiveSearch, NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hell", NSAnchoredSearch, NSMakeRange(0,5), NSMakeRange(0,4));
|
||||
strRange("hello", "hel", NSBackwardsSearch, NSMakeRange(0,5), NSMakeRange(0,3));
|
||||
strRange("hello", "he", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(0,2));
|
||||
strRange("hello", "h", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(0,1));
|
||||
strRange("hello", "", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(0,0));
|
||||
strRange("hello", "el", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(1,2));
|
||||
strRange("hello", "el", NSLiteralSearch, NSMakeRange(0,2), NSMakeRange(0,0));
|
||||
strRange("hello", "el", NSLiteralSearch, NSMakeRange(2,3), NSMakeRange(0,0));
|
||||
strRange("hello", "ell", NSLiteralSearch, NSMakeRange(0,5), NSMakeRange(1,3));
|
||||
strRange("hello", "lo", NSLiteralSearch, NSMakeRange(2,3), NSMakeRange(3,2));
|
||||
strRange("boaboaboa", "abo", NSLiteralSearch, NSMakeRange(0,9), NSMakeRange(2,3));
|
||||
strRange("boaboaboa", "abo", NSBackwardsSearch, NSMakeRange(0,9), NSMakeRange(5,3));
|
||||
strRange("boaboaboa", "ABO", NSCaseInsensitiveSearch, NSMakeRange(0,9), NSMakeRange(2,3));
|
||||
strRange("hello", "hello", NSAnchoredSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hello", NSAnchoredSearch | NSBackwardsSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hElLo", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(NSNotFound,0));
|
||||
strRange("hello", "hElLo", NSCaseInsensitiveSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,5));
|
||||
strRange("hello", "hell", NSAnchoredSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,4));
|
||||
strRange("hello", "hel", NSBackwardsSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,3));
|
||||
strRange("hello", "he", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,2));
|
||||
strRange("hello", "h", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,1));
|
||||
strRange("hello", "", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(0,0));
|
||||
strRange("hello", "el", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(1,2));
|
||||
strRange("hello", "el", NSLiteralSearch,
|
||||
NSMakeRange(0,2), NSMakeRange(0,0));
|
||||
strRange("hello", "el", NSLiteralSearch,
|
||||
NSMakeRange(2,3), NSMakeRange(0,0));
|
||||
strRange("hello", "ell", NSLiteralSearch,
|
||||
NSMakeRange(0,5), NSMakeRange(1,3));
|
||||
strRange("hello", "lo", NSLiteralSearch,
|
||||
NSMakeRange(2,3), NSMakeRange(3,2));
|
||||
strRange("boaboaboa", "abo", NSLiteralSearch,
|
||||
NSMakeRange(0,9), NSMakeRange(2,3));
|
||||
strRange("boaboaboa", "abo", NSBackwardsSearch,
|
||||
NSMakeRange(0,9), NSMakeRange(5,3));
|
||||
strRange("boaboaboa", "ABO", NSCaseInsensitiveSearch,
|
||||
NSMakeRange(0,9), NSMakeRange(2,3));
|
||||
strRange("boaboaboa", "abo", NSCaseInsensitiveSearch | NSBackwardsSearch,
|
||||
NSMakeRange(0,9), NSMakeRange(5,3));
|
||||
|
||||
strRange("", "", NSLiteralSearch,
|
||||
NSMakeRange(0,0), NSMakeRange(0,0));
|
||||
|
||||
strRange("x", "", NSLiteralSearch,
|
||||
NSMakeRange(0,1), NSMakeRange(0,0));
|
||||
strRange("x", "", NSLiteralSearch|NSBackwardsSearch,
|
||||
NSMakeRange(0,1), NSMakeRange(1,0));
|
||||
|
||||
strRangeFromSet("boaboaboa",
|
||||
[NSCharacterSet alphanumericCharacterSet],
|
||||
NSCaseInsensitiveSearch | NSBackwardsSearch,
|
||||
|
|
@ -381,9 +407,12 @@ int main()
|
|||
NSCaseInsensitiveSearch | NSBackwardsSearch,
|
||||
NSMakeRange(2,6), NSMakeRange(2,1));
|
||||
|
||||
testLineRange("This is a line of text\n", NSMakeRange(10, 10), NSMakeRange(0, 23));
|
||||
testLineRange("This is a line of text\r\n", NSMakeRange(10, 10), NSMakeRange(0, 24));
|
||||
testLineRange("This is a line of text\r\r", NSMakeRange(10, 10), NSMakeRange(0, 23));
|
||||
testLineRange("This is a line of text\n",
|
||||
NSMakeRange(10, 10), NSMakeRange(0, 23));
|
||||
testLineRange("This is a line of text\r\n",
|
||||
NSMakeRange(10, 10), NSMakeRange(0, 24));
|
||||
testLineRange("This is a line of text\r\r",
|
||||
NSMakeRange(10, 10), NSMakeRange(0, 23));
|
||||
|
||||
PASS([@"1.2e3" doubleValue] == 1.2e3, "Simple double conversion works");
|
||||
PASS([@"4.5E6" floatValue] == 4.5e6, "Simple float conversion works");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue