Index: tests/OFDNSResolverTests.m ================================================================== --- tests/OFDNSResolverTests.m +++ tests/OFDNSResolverTests.m @@ -24,11 +24,11 @@ { void *pool = objc_autoreleasePoolPush(); OFDNSResolver *resolver = [OFDNSResolver resolver]; OFMutableString *staticHosts = [OFMutableString string]; - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; for (OFString *host in resolver.staticHosts) { OFString *IPs; if (staticHosts.length > 0) Index: tests/OFIPXSocketTests.m ================================================================== --- tests/OFIPXSocketTests.m +++ tests/OFIPXSocketTests.m @@ -38,17 +38,17 @@ R(address1 = [sock bindToPort: 0 packetType: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFIPXSocket] -[bindToPort:packetType:]: " @"IPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFIPXSocket] -[bindToPort:packetType:]: " @"IPX not configured, skipping tests"]; break; default: Index: tests/OFLocaleTests.m ================================================================== --- tests/OFLocaleTests.m +++ tests/OFLocaleTests.m @@ -22,11 +22,11 @@ @implementation TestsAppDelegate (OFLocaleTests) - (void)localeTests { void *pool = objc_autoreleasePoolPush(); - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeFormat: @"[OFLocale] Language: %@\n", [OFLocale language]]; [of_stdout writeFormat: @"[OFLocale] Territory: %@\n", Index: tests/OFPropertyListTests.m ================================================================== --- tests/OFPropertyListTests.m +++ tests/OFPropertyListTests.m @@ -64,11 +64,11 @@ [OFData dataWithItems: "World!" count: 6], [OFDate dateWithTimeIntervalSince1970: 1521030896], [OFNumber numberWithBool: true], [OFNumber numberWithBool: false], - [OFNumber numberWithFloat: 12.25], + [OFNumber numberWithFloat: 12.25f], [OFNumber numberWithInt: -10], nil]; TEST(@"-[objectByParsingPropertyList:] #1", [PLIST1.objectByParsingPropertyList isEqual: @"Hello"]) Index: tests/OFSCTPSocketTests.m ================================================================== --- tests/OFSCTPSocketTests.m +++ tests/OFSCTPSocketTests.m @@ -40,11 +40,11 @@ (port = [server bindToHost: @"127.0.0.1" port: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EPROTONOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout foregroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSCTPSocket] -[bindToHost:port:]: " @"SCTP unsupported, skipping tests"]; break; default: Index: tests/OFSPXSocketTests.m ================================================================== --- tests/OFSPXSocketTests.m +++ tests/OFSPXSocketTests.m @@ -90,23 +90,23 @@ TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"IPX unsupported, skipping tests"]; break; case ESOCKTNOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"SPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"IPX not configured, skipping tests"]; break; default: @@ -176,11 +176,11 @@ TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[asyncAccept] & " @"-[asyncConnectToNode:network:port:]: select() " @"not supported for SPX, skipping test"]; break; Index: tests/OFSPXStreamSocketTests.m ================================================================== --- tests/OFSPXStreamSocketTests.m +++ tests/OFSPXStreamSocketTests.m @@ -90,23 +90,23 @@ TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"IPX unsupported, skipping tests"]; break; case ESOCKTNOSUPPORT: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"SPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"IPX not configured, skipping tests"]; break; default: @@ -180,11 +180,11 @@ TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[asyncAccept] & " @"-[asyncConnectToNode:network:port:]: select() " @"not supported for SPX, skipping test"]; break; Index: tests/OFSystemInfoTests.m ================================================================== --- tests/OFSystemInfoTests.m +++ tests/OFSystemInfoTests.m @@ -25,11 +25,11 @@ void *pool = objc_autoreleasePoolPush(); #ifdef OF_HAVE_FILES OFString *userConfigPath, *userDataPath; #endif - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeFormat: @"[OFSystemInfo] Page size: %zd\n", [OFSystemInfo pageSize]]; [of_stdout writeFormat: @"[OFSystemInfo] Number of CPUs: %zd\n", Index: tests/OFValueTests.m ================================================================== --- tests/OFValueTests.m +++ tests/OFValueTests.m @@ -26,13 +26,14 @@ @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); of_range_t range = of_range(1, 64), range2; - of_point_t point = of_point(1.5, 3), point2; - of_dimension_t dimension = of_dimension(4.5, 5), dimension2; - of_rectangle_t rectangle = of_rectangle(1.5, 3, 4.5, 6), rectangle2; + of_point_t point = of_point(1.5f, 3.0f), point2; + of_dimension_t dimension = of_dimension(4.5f, 5.0f), dimension2; + of_rectangle_t rectangle = of_rectangle(1.5f, 3.0f, 4.5f, 6.0f); + of_rectangle_t rectangle2; OFValue *value; void *pointer = &value; TEST(@"+[valueWithBytes:objCType:]", (value = [OFValue valueWithBytes: &range Index: tests/TestsAppDelegate.m ================================================================== --- tests/TestsAppDelegate.m +++ tests/TestsAppDelegate.m @@ -148,11 +148,11 @@ @"\nRuntime error: Unhandled exception:\n%@\n", e]; OFString *backtrace = [OFString stringWithFormat: @"\nBacktrace:\n %@\n\n", [[e backtrace] componentsJoinedByString: @"\n "]]; - of_stdout.foregroundColor = [OFColor red]; + [of_stdout setForegroundColor: [OFColor red]]; [of_stdout writeString: string]; [of_stdout writeString: backtrace]; # if defined(OF_WII) [of_stdout reset]; @@ -203,21 +203,21 @@ @implementation TestsAppDelegate - (void)outputTesting: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { - of_stdout.foregroundColor = [OFColor yellow]; + [of_stdout setForegroundColor: [OFColor yellow]]; [of_stdout writeFormat: @"[%@] %@: testing...", module, test]; } else [of_stdout writeFormat: @"[%@] %@: ", module, test]; } - (void)outputSuccess: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { - of_stdout.foregroundColor = [OFColor lime]; + [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout eraseLine]; [of_stdout writeFormat: @"\r[%@] %@: ok\n", module, test]; } else [of_stdout writeLine: @"ok"]; } @@ -224,11 +224,11 @@ - (void)outputFailure: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { - of_stdout.foregroundColor = [OFColor red]; + [of_stdout setForegroundColor: [OFColor red]]; [of_stdout eraseLine]; [of_stdout writeFormat: @"\r[%@] %@: failed\n", module, test]; #ifdef OF_WII [of_stdout reset]; Index: tests/terminal/TerminalTests.m ================================================================== --- tests/terminal/TerminalTests.m +++ tests/terminal/TerminalTests.m @@ -42,51 +42,51 @@ [of_stdout writeFormat: @"%dx%d\n", of_stdout.columns, of_stdout.rows]; i = 0; for (OFColor *color in colors) { - of_stdout.foregroundColor = color; + [of_stdout setForegroundColor: color]; [of_stdout writeFormat: @"%zx", i++]; } [of_stdout reset]; [of_stdout writeLine: @"R"]; i = 0; for (OFColor *color in colors) { - of_stdout.backgroundColor = color; + [of_stdout setBackgroundColor: color]; [of_stdout writeFormat: @"%zx", i++]; } [of_stdout reset]; [of_stdout writeLine: @"R"]; i = 0; reverseEnumerator = [colors.reversedArray objectEnumerator]; for (OFColor *color in colors) { - of_stdout.foregroundColor = color; - of_stdout.backgroundColor = [reverseEnumerator nextObject]; + [of_stdout setForegroundColor: color]; + [of_stdout setBackgroundColor: [reverseEnumerator nextObject]]; [of_stdout writeFormat: @"%zx", i++]; } [of_stdout reset]; [of_stdout writeLine: @"R"]; for (i = 0; i < colors.count * 2; i++) { if (i % 2) - of_stdout.backgroundColor = [colors objectAtIndex: - ((i / 2) + 2) % colors.count]; + [of_stdout setBackgroundColor: [colors objectAtIndex: + ((i / 2) + 2) % colors.count]]; else - of_stdout.foregroundColor = - [colors objectAtIndex: i / 2]; + [of_stdout setForegroundColor: + [colors objectAtIndex: i / 2]]; [of_stdout writeFormat: @"%zx", i / 2]; } [of_stdout reset]; [of_stdout writeLine: @"R"]; [of_stdout writeLine: @"Press return"]; [of_stdin readLine]; - of_stdout.backgroundColor = [OFColor green]; + [of_stdout setBackgroundColor: [OFColor green]]; [of_stdout writeString: @"Hello!"]; [OFThread sleepForTimeInterval: 2]; [of_stdout eraseLine]; [of_stdout writeString: @"World!"]; [OFThread sleepForTimeInterval: 2];