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 2015-05-22 15:23:09 +00:00
parent d8e9f81945
commit 1b78cfe4bd

View file

@ -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");