Comment: | tests: Fix compiling with Apple GCC 4.2.1 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
33bec58cf4cace4e4894434d4d63dd1e |
User & Date: | js on 2020-09-27 02:29:00 |
Other Links: | manifest | tags |
2020-09-27
| ||
02:31 | tests/terminal: Fix compiling with Apple GCC 4.2.1 check-in: 1535a3770b user: js tags: trunk | |
02:29 | tests: Fix compiling with Apple GCC 4.2.1 check-in: 33bec58cf4 user: js tags: trunk | |
02:12 | ofhttp: Fix compiling with Apple GCC 4.2.1 check-in: 431116c906 user: js tags: trunk | |
Modified tests/OFDNSResolverTests.m from [56b8d9d248] to [e970066231].
︙ | ︙ | |||
22 23 24 25 26 27 28 | @implementation TestsAppDelegate (OFDNSResolverTests) - (void)DNSResolverTests { void *pool = objc_autoreleasePoolPush(); OFDNSResolver *resolver = [OFDNSResolver resolver]; OFMutableString *staticHosts = [OFMutableString string]; | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | @implementation TestsAppDelegate (OFDNSResolverTests) - (void)DNSResolverTests { void *pool = objc_autoreleasePoolPush(); OFDNSResolver *resolver = [OFDNSResolver resolver]; OFMutableString *staticHosts = [OFMutableString string]; [of_stdout setForegroundColor: [OFColor lime]]; for (OFString *host in resolver.staticHosts) { OFString *IPs; if (staticHosts.length > 0) [staticHosts appendString: @"; "]; |
︙ | ︙ |
Modified tests/OFIPXSocketTests.m from [7578ebb381] to [a065806b7f].
︙ | ︙ | |||
36 37 38 39 40 41 42 | @try { TEST(@"-[bindToPort:packetType:]", R(address1 = [sock bindToPort: 0 packetType: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: | | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | @try { TEST(@"-[bindToPort:packetType:]", R(address1 = [sock bindToPort: 0 packetType: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFIPXSocket] -[bindToPort:packetType:]: " @"IPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFIPXSocket] -[bindToPort:packetType:]: " @"IPX not configured, skipping tests"]; break; default: @throw e; } |
︙ | ︙ |
Modified tests/OFLocaleTests.m from [9e55bec70d] to [dbaa1191c5].
︙ | ︙ | |||
20 21 22 23 24 25 26 | #import "TestsAppDelegate.h" @implementation TestsAppDelegate (OFLocaleTests) - (void)localeTests { void *pool = objc_autoreleasePoolPush(); | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "TestsAppDelegate.h" @implementation TestsAppDelegate (OFLocaleTests) - (void)localeTests { void *pool = objc_autoreleasePoolPush(); [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeFormat: @"[OFLocale] Language: %@\n", [OFLocale language]]; [of_stdout writeFormat: @"[OFLocale] Territory: %@\n", [OFLocale territory]]; |
︙ | ︙ |
Modified tests/OFPropertyListTests.m from [0566a8c454] to [f260520db3].
︙ | ︙ | |||
62 63 64 65 66 67 68 | OFArray *array = [OFArray arrayWithObjects: @"Hello", [OFData dataWithItems: "World!" count: 6], [OFDate dateWithTimeIntervalSince1970: 1521030896], [OFNumber numberWithBool: true], [OFNumber numberWithBool: false], | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | OFArray *array = [OFArray arrayWithObjects: @"Hello", [OFData dataWithItems: "World!" count: 6], [OFDate dateWithTimeIntervalSince1970: 1521030896], [OFNumber numberWithBool: true], [OFNumber numberWithBool: false], [OFNumber numberWithFloat: 12.25f], [OFNumber numberWithInt: -10], nil]; TEST(@"-[objectByParsingPropertyList:] #1", [PLIST1.objectByParsingPropertyList isEqual: @"Hello"]) TEST(@"-[objectByParsingPropertyList:] #2", |
︙ | ︙ |
Modified tests/OFSCTPSocketTests.m from [42f1cba28c] to [0dc496f2aa].
︙ | ︙ | |||
38 39 40 41 42 43 44 | @try { TEST(@"-[bindToHost:port:]", (port = [server bindToHost: @"127.0.0.1" port: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EPROTONOSUPPORT: | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | @try { TEST(@"-[bindToHost:port:]", (port = [server bindToHost: @"127.0.0.1" port: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EPROTONOSUPPORT: [of_stdout foregroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSCTPSocket] -[bindToHost:port:]: " @"SCTP unsupported, skipping tests"]; break; default: @throw e; } |
︙ | ︙ |
Modified tests/OFSPXSocketTests.m from [0285d3399d] to [e438c57a59].
︙ | ︙ | |||
88 89 90 91 92 93 94 | @try { TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: | | | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | @try { TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"IPX unsupported, skipping tests"]; break; case ESOCKTNOSUPPORT: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"SPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[bindToPort:]: " @"IPX not configured, skipping tests"]; break; default: @throw e; } |
︙ | ︙ | |||
174 175 176 177 178 179 180 | [OFDate dateWithTimeIntervalSinceNow: 2]]; TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: | | | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | [OFDate dateWithTimeIntervalSinceNow: 2]]; TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXSocket] -[asyncAccept] & " @"-[asyncConnectToNode:network:port:]: select() " @"not supported for SPX, skipping test"]; break; default: @throw e; } } objc_autoreleasePoolPop(pool); } @end |
Modified tests/OFSPXStreamSocketTests.m from [897f2e1598] to [4e87ecb1d0].
︙ | ︙ | |||
88 89 90 91 92 93 94 | @try { TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: | | | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | @try { TEST(@"-[bindToPort:]", R(address1 = [sockServer bindToPort: 0])) } @catch (OFBindFailedException *e) { switch (e.errNo) { case EAFNOSUPPORT: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"IPX unsupported, skipping tests"]; break; case ESOCKTNOSUPPORT: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"SPX unsupported, skipping tests"]; break; case EADDRNOTAVAIL: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[bindToPort:]: " @"IPX not configured, skipping tests"]; break; default: @throw e; } |
︙ | ︙ | |||
178 179 180 181 182 183 184 | [OFDate dateWithTimeIntervalSinceNow: 2]]; TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: | | | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | [OFDate dateWithTimeIntervalSinceNow: 2]]; TEST(@"-[asyncAccept] & -[asyncConnectToNode:network:port:]", delegate->_accepted && delegate->_connected) } @catch (OFObserveFailedException *e) { switch (e.errNo) { case ENOTSOCK: [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeLine: @"[OFSPXStreamSocket] -[asyncAccept] & " @"-[asyncConnectToNode:network:port:]: select() " @"not supported for SPX, skipping test"]; break; default: @throw e; } } objc_autoreleasePoolPop(pool); } @end |
Modified tests/OFSystemInfoTests.m from [fe712afca4] to [62ec592705].
︙ | ︙ | |||
23 24 25 26 27 28 29 | - (void)systemInfoTests { void *pool = objc_autoreleasePoolPush(); #ifdef OF_HAVE_FILES OFString *userConfigPath, *userDataPath; #endif | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | - (void)systemInfoTests { void *pool = objc_autoreleasePoolPush(); #ifdef OF_HAVE_FILES OFString *userConfigPath, *userDataPath; #endif [of_stdout setForegroundColor: [OFColor lime]]; [of_stdout writeFormat: @"[OFSystemInfo] Page size: %zd\n", [OFSystemInfo pageSize]]; [of_stdout writeFormat: @"[OFSystemInfo] Number of CPUs: %zd\n", [OFSystemInfo numberOfCPUs]]; |
︙ | ︙ |
Modified tests/OFValueTests.m from [42cb5a8873] to [d8e22a71e7].
︙ | ︙ | |||
24 25 26 27 28 29 30 | static OFString *module = @"OFValue"; @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); of_range_t range = of_range(1, 64), range2; | | | | > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | static OFString *module = @"OFValue"; @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.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 objCType: @encode(of_range_t)])) |
︙ | ︙ |
Modified tests/TestsAppDelegate.m from [6a1c29e396] to [b1233ca24e].
︙ | ︙ | |||
146 147 148 149 150 151 152 | } @catch (id e) { OFString *string = [OFString stringWithFormat: @"\nRuntime error: Unhandled exception:\n%@\n", e]; OFString *backtrace = [OFString stringWithFormat: @"\nBacktrace:\n %@\n\n", [[e backtrace] componentsJoinedByString: @"\n "]]; | | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | } @catch (id e) { OFString *string = [OFString stringWithFormat: @"\nRuntime error: Unhandled exception:\n%@\n", e]; OFString *backtrace = [OFString stringWithFormat: @"\nBacktrace:\n %@\n\n", [[e backtrace] componentsJoinedByString: @"\n "]]; [of_stdout setForegroundColor: [OFColor red]]; [of_stdout writeString: string]; [of_stdout writeString: backtrace]; # if defined(OF_WII) [of_stdout reset]; [of_stdout writeString: @"Press home button to exit!"]; |
︙ | ︙ | |||
201 202 203 204 205 206 207 | } @implementation TestsAppDelegate - (void)outputTesting: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { | | | | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | } @implementation TestsAppDelegate - (void)outputTesting: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { [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 setForegroundColor: [OFColor lime]]; [of_stdout eraseLine]; [of_stdout writeFormat: @"\r[%@] %@: ok\n", module, test]; } else [of_stdout writeLine: @"ok"]; } - (void)outputFailure: (OFString *)test inModule: (OFString *)module { if (of_stdout.hasTerminal) { [of_stdout setForegroundColor: [OFColor red]]; [of_stdout eraseLine]; [of_stdout writeFormat: @"\r[%@] %@: failed\n", module, test]; #ifdef OF_WII [of_stdout reset]; [of_stdout writeLine: @"Press A to continue!"]; |
︙ | ︙ |
Modified tests/terminal/TerminalTests.m from [3e135bdea5] to [8e3d4d56d3].
︙ | ︙ | |||
40 41 42 43 44 45 46 | size_t i; OFEnumerator OF_GENERIC(OFColor *) *reverseEnumerator; [of_stdout writeFormat: @"%dx%d\n", of_stdout.columns, of_stdout.rows]; i = 0; for (OFColor *color in colors) { | | | | | | | | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | size_t i; OFEnumerator OF_GENERIC(OFColor *) *reverseEnumerator; [of_stdout writeFormat: @"%dx%d\n", of_stdout.columns, of_stdout.rows]; i = 0; for (OFColor *color in colors) { [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 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 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 setBackgroundColor: [colors objectAtIndex: ((i / 2) + 2) % colors.count]]; else [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 setBackgroundColor: [OFColor green]]; [of_stdout writeString: @"Hello!"]; [OFThread sleepForTimeInterval: 2]; [of_stdout eraseLine]; [of_stdout writeString: @"World!"]; [OFThread sleepForTimeInterval: 2]; [of_stdout clear]; |
︙ | ︙ |