@@ -292,29 +292,26 @@ [mutableString1 characterAtIndex: 5] == 0x1D11E) EXPECT_EXCEPTION(@"Detect out of range in -[characterAtIndex:]", OFOutOfRangeException, [mutableString1 characterAtIndex: 7]) - TEST(@"-[reverse]", - R([mutableString1 reverse]) && [mutableString1 isEqual: @"3𝄞1€sät"]) - mutableString2 = [mutableStringClass stringWithString: @"abc"]; #ifdef OF_HAVE_UNICODE_TABLES TEST(@"-[uppercase]", R([mutableString1 uppercase]) && - [mutableString1 isEqual: @"3𝄞1€SÄT"] && + [mutableString1 isEqual: @"TÄS€1𝄞3"] && R([mutableString2 uppercase]) && [mutableString2 isEqual: @"ABC"]) TEST(@"-[lowercase]", R([mutableString1 lowercase]) && - [mutableString1 isEqual: @"3𝄞1€sät"] && + [mutableString1 isEqual: @"täs€1𝄞3"] && R([mutableString2 lowercase]) && [mutableString2 isEqual: @"abc"]) TEST(@"-[uppercaseString]", - [[mutableString1 uppercaseString] isEqual: @"3𝄞1€SÄT"]) + [[mutableString1 uppercaseString] isEqual: @"TÄS€1𝄞3"]) TEST(@"-[lowercaseString]", R([mutableString1 uppercase]) && - [[mutableString1 lowercaseString] isEqual: @"3𝄞1€sät"]) + [[mutableString1 lowercaseString] isEqual: @"täs€1𝄞3"]) TEST(@"-[capitalizedString]", [C(@"džbla tdžst TDŽST").capitalizedString isEqual: @"Džbla Tdžst Tdžst"]) #else TEST(@"-[uppercase]", R([mutableString1 uppercase]) && @@ -358,12 +355,12 @@ TEST(@"+[stringWithContentsOfFile:encoding]", (string = [stringClass stringWithContentsOfFile: @"testfile.txt" encoding: OFStringEncodingISO8859_1]) && [string isEqual: @"testäöü"]) - TEST(@"+[stringWithContentsOfURL:encoding]", (string = [stringClass - stringWithContentsOfURL: [OFURL fileURLWithPath: @"testfile.txt"] + TEST(@"+[stringWithContentsOfURI:encoding]", (string = [stringClass + stringWithContentsOfURI: [OFURI fileURIWithPath: @"testfile.txt"] encoding: OFStringEncodingISO8859_1]) && [string isEqual: @"testäöü"]) #endif TEST(@"-[appendUTFString:length:]", @@ -507,11 +504,11 @@ options: OFStringSearchBackwards].location == OFNotFound) EXPECT_EXCEPTION( @"Detect out of range in -[rangeOfString:options:range:]", OFOutOfRangeException, - [C(@"𝄞öö") rangeOfString: @"ö" options: 0 range: OFRangeMake(3, 1)]) + [C(@"𝄞öö") rangeOfString: @"ö" options: 0 range: OFMakeRange(3, 1)]) characterSet = [OFCharacterSet characterSetWithCharactersInString: @"cđ"]; TEST(@"-[indexOfCharacterFromSet:]", [C(@"abcđabcđe") indexOfCharacterFromSet: characterSet] == 2 && @@ -518,40 +515,37 @@ [C(@"abcđabcđë") indexOfCharacterFromSet: characterSet options: OFStringSearchBackwards] == 7 && [C(@"abcđabcđë") indexOfCharacterFromSet: characterSet options: 0 - range: OFRangeMake(4, 4)] == 6 && + range: OFMakeRange(4, 4)] == 6 && [C(@"abcđabcđëf") indexOfCharacterFromSet: characterSet options: 0 - range: OFRangeMake(8, 2)] == OFNotFound) + range: OFMakeRange(8, 2)] == OFNotFound) EXPECT_EXCEPTION( @"Detect out of range in -[indexOfCharacterFromSet:options:range:]", OFOutOfRangeException, [C(@"𝄞öö") indexOfCharacterFromSet: characterSet options: 0 - range: OFRangeMake(3, 1)]) + range: OFMakeRange(3, 1)]) TEST(@"-[substringWithRange:]", - [[C(@"𝄞öö") substringWithRange: OFRangeMake(1, 1)] isEqual: @"ö"] && - [[C(@"𝄞öö") substringWithRange: OFRangeMake(3, 0)] isEqual: @""]) + [[C(@"𝄞öö") substringWithRange: OFMakeRange(1, 1)] isEqual: @"ö"] && + [[C(@"𝄞öö") substringWithRange: OFMakeRange(3, 0)] isEqual: @""]) EXPECT_EXCEPTION(@"Detect out of range in -[substringWithRange:] #1", OFOutOfRangeException, - [C(@"𝄞öö") substringWithRange: OFRangeMake(2, 2)]) + [C(@"𝄞öö") substringWithRange: OFMakeRange(2, 2)]) EXPECT_EXCEPTION(@"Detect out of range in -[substringWithRange:] #2", OFOutOfRangeException, - [C(@"𝄞öö") substringWithRange: OFRangeMake(4, 0)]) + [C(@"𝄞öö") substringWithRange: OFMakeRange(4, 0)]) TEST(@"-[stringByAppendingString:]", [[C(@"foo") stringByAppendingString: @"bar"] isEqual: @"foobar"]) - TEST(@"-[stringByPrependingString:]", - [[C(@"foo") stringByPrependingString: @"bar"] isEqual: @"barfoo"]) - #ifdef OF_HAVE_FILES # if defined(OF_WINDOWS) TEST(@"-[isAbsolutePath]", C(@"C:\\foo").absolutePath && C(@"a:/foo").absolutePath && !C(@"foo").absolutePath && !C(@"b:foo").absolutePath && @@ -602,10 +596,16 @@ isEqual: @"foo.bar"] && [[C(@"c:\\tmp\\foo") stringByAppendingPathExtension: @"bar"] isEqual: @"c:\\tmp\\foo.bar"] && [[C(@"c:\\tmp\\/\\") stringByAppendingPathExtension: @"bar"] isEqual: @"c:\\tmp.bar"]) +# elif defined(OF_AMIGAOS) + TEST(@"-[stringByAppendingPathExtension:]", + [[C(@"foo") stringByAppendingPathExtension: @"bar"] + isEqual: @"foo.bar"] && + [[C(@"foo/bar") stringByAppendingPathExtension: @"baz"] + isEqual: @"foo/bar.baz"]) # else TEST(@"-[stringByAppendingPathExtension:]", [[C(@"foo") stringByAppendingPathExtension: @"bar"] isEqual: @"foo.bar"] && [[C(@"foo/bar") stringByAppendingPathExtension: @"baz"] @@ -1275,30 +1275,33 @@ @"412a9247c3579a329e53a5dc74676b106755e3394f9454a2d4227324" @"2615d32f80437d61"]) characterSet = [OFCharacterSet characterSetWithCharactersInString: @"abfo'_~$🍏"]; - TEST(@"-[stringByURLEncodingWithAllowedCharacters:]", - [[C(@"foo\"ba'_~$]🍏🍌") stringByURLEncodingWithAllowedCharacters: - characterSet] isEqual: @"foo%22ba'_~$%5D🍏%F0%9F%8D%8C"]) + TEST(@"-[stringByAddingPercentEncodingWithAllowedCharacters:]", + [[C(@"foo\"ba'_~$]🍏🍌") + stringByAddingPercentEncodingWithAllowedCharacters: characterSet] + isEqual: @"foo%22ba'_~$%5D🍏%F0%9F%8D%8C"]) - TEST(@"-[stringByURLDecoding]", - [C(@"foo%20bar%22+%24%F0%9F%8D%8C").stringByURLDecoding + TEST(@"-[stringByRemovingPercentEncoding]", + [C(@"foo%20bar%22+%24%F0%9F%8D%8C").stringByRemovingPercentEncoding isEqual: @"foo bar\"+$🍌"]) TEST(@"-[insertString:atIndex:]", (mutableString1 = [mutableStringClass stringWithString: @"𝄞öööbä€"]) && R([mutableString1 insertString: @"äöü" atIndex: 3]) && [mutableString1 isEqual: @"𝄞ööäöüöbä€"]) - EXPECT_EXCEPTION(@"Detect invalid format in -[stringByURLDecoding] " - @"#1", OFInvalidFormatException, - [C(@"foo%xbar") stringByURLDecoding]) - EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] " - @"#2", OFInvalidEncodingException, - [C(@"foo%FFbar") stringByURLDecoding]) + EXPECT_EXCEPTION(@"Detect invalid format in " + @"-[stringByRemovingPercentEncoding] #1", + OFInvalidFormatException, + [C(@"foo%xbar") stringByRemovingPercentEncoding]) + EXPECT_EXCEPTION(@"Detect invalid encoding in " + @"-[stringByRemovingPercentEncoding] #2", + OFInvalidEncodingException, + [C(@"foo%FFbar") stringByRemovingPercentEncoding]) TEST(@"-[setCharacter:atIndex:]", (mutableString1 = [mutableStringClass stringWithString: @"abäde"]) && R([mutableString1 setCharacter: 0xF6 atIndex: 2]) && @@ -1311,49 +1314,49 @@ [mutableString1 isEqual: @"axc€e"]) TEST(@"-[deleteCharactersInRange:]", (mutableString1 = [mutableStringClass stringWithString: @"𝄞öööbä€"]) && - R([mutableString1 deleteCharactersInRange: OFRangeMake(1, 3)]) && + R([mutableString1 deleteCharactersInRange: OFMakeRange(1, 3)]) && [mutableString1 isEqual: @"𝄞bä€"] && - R([mutableString1 deleteCharactersInRange: OFRangeMake(0, 4)]) && + R([mutableString1 deleteCharactersInRange: OFMakeRange(0, 4)]) && [mutableString1 isEqual: @""]) TEST(@"-[replaceCharactersInRange:withString:]", (mutableString1 = [mutableStringClass stringWithString: @"𝄞öööbä€"]) && - R([mutableString1 replaceCharactersInRange: OFRangeMake(1, 3) + R([mutableString1 replaceCharactersInRange: OFMakeRange(1, 3) withString: @"äöüß"]) && [mutableString1 isEqual: @"𝄞äöüßbä€"] && - R([mutableString1 replaceCharactersInRange: OFRangeMake(4, 2) + R([mutableString1 replaceCharactersInRange: OFMakeRange(4, 2) withString: @"b"]) && [mutableString1 isEqual: @"𝄞äöübä€"] && - R([mutableString1 replaceCharactersInRange: OFRangeMake(0, 7) + R([mutableString1 replaceCharactersInRange: OFMakeRange(0, 7) withString: @""]) && [mutableString1 isEqual: @""]) EXPECT_EXCEPTION(@"Detect OoR in -[deleteCharactersInRange:] #1", OFOutOfRangeException, { mutableString1 = [mutableStringClass stringWithString: @"𝄞öö"]; - [mutableString1 deleteCharactersInRange: OFRangeMake(2, 2)]; + [mutableString1 deleteCharactersInRange: OFMakeRange(2, 2)]; }) EXPECT_EXCEPTION(@"Detect OoR in -[deleteCharactersInRange:] #2", OFOutOfRangeException, - [mutableString1 deleteCharactersInRange: OFRangeMake(4, 0)]) + [mutableString1 deleteCharactersInRange: OFMakeRange(4, 0)]) EXPECT_EXCEPTION(@"Detect OoR in " @"-[replaceCharactersInRange:withString:] #1", OFOutOfRangeException, - [mutableString1 replaceCharactersInRange: OFRangeMake(2, 2) + [mutableString1 replaceCharactersInRange: OFMakeRange(2, 2) withString: @""]) EXPECT_EXCEPTION(@"Detect OoR in " @"-[replaceCharactersInRange:withString:] #2", OFOutOfRangeException, - [mutableString1 replaceCharactersInRange: OFRangeMake(4, 0) + [mutableString1 replaceCharactersInRange: OFMakeRange(4, 0) withString: @""]) TEST(@"-[replaceOccurrencesOfString:withString:]", (mutableString1 = [mutableStringClass stringWithString: @"asd fo asd fofo asd"]) && @@ -1369,11 +1372,11 @@ (mutableString1 = [mutableStringClass stringWithString: @"foofoobarfoobarfoo"]) && R([mutableString1 replaceOccurrencesOfString: @"oo" withString: @"óò" options: 0 - range: OFRangeMake(2, 15)]) && + range: OFMakeRange(2, 15)]) && [mutableString1 isEqual: @"foofóòbarfóòbarfoo"]) TEST(@"-[deleteLeadingWhitespaces]", (mutableString1 = [mutableStringClass stringWithString: whitespace[0]]) &&