@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2022 Jonathan Schleifer + * Copyright (c) 2008-2024 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -355,12 +355,12 @@ TEST(@"+[stringWithContentsOfFile:encoding]", (string = [stringClass stringWithContentsOfFile: @"testfile.txt" encoding: OFStringEncodingISO8859_1]) && [string isEqual: @"testäöü"]) - TEST(@"+[stringWithContentsOfURI:encoding]", (string = [stringClass - stringWithContentsOfURI: [OFURI fileURIWithPath: @"testfile.txt"] + TEST(@"+[stringWithContentsOfIRI:encoding]", (string = [stringClass + stringWithContentsOfIRI: [OFIRI fileIRIWithPath: @"testfile.txt"] encoding: OFStringEncodingISO8859_1]) && [string isEqual: @"testäöü"]) #endif TEST(@"-[appendUTFString:length:]", @@ -1154,11 +1154,11 @@ # if (!defined(OF_SOLARIS) || !defined(OF_X86)) && !defined(OF_AMIGAOS_M68K) # define INPUT @"\t-0.123456789 " # define EXPECTED -0.123456789 # else /* - * Solaris' strtod() has weird rounding on x86, but not on x86_64. + * Solaris' strtod() has weird rounding on x86, but not on AMD64. * AmigaOS 3 with libnix has weird rounding as well. */ # define INPUT @"\t-0.125 " # define EXPECTED -0.125 # endif @@ -1405,20 +1405,10 @@ (mutableString1 = [mutableStringClass stringWithString: whitespace[1]]) && R([mutableString1 deleteEnclosingWhitespaces]) && [mutableString1 isEqual: @""]) -#ifdef OF_HAVE_UNICODE_TABLES - TEST(@"-[decomposedStringWithCanonicalMapping]", - [C(@"H\xC3\xA4llj\xC3\xB6").decomposedStringWithCanonicalMapping - isEqual: @"H\x61\xCC\x88llj\x6F\xCC\x88"]); - - TEST(@"-[decomposedStringWithCompatibilityMapping]", - [C(@"H\xC3\xA4llj\xC3\xB6").decomposedStringWithCompatibilityMapping - isEqual: @"H\x61\xCC\x88llj\x6F\xCC\x88"]); -#endif - TEST(@"-[stringByXMLEscaping]", (string = C(@" &world'\"!&").stringByXMLEscaping) && [string isEqual: @"<hello> &world'"!&"]) TEST(@"-[stringByXMLUnescaping]",