From 0cd0210518c338a044bb9df0b5cf90369cf39a1c Mon Sep 17 00:00:00 2001 From: rfm Date: Wed, 16 Mar 2011 15:25:09 +0000 Subject: [PATCH] check for failures git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32615 72102866-910b-0410-8b05-ffd578937521 --- Tests/base/NSString/order.m | 62 +++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/Tests/base/NSString/order.m b/Tests/base/NSString/order.m index 6c3576c29..19f5e3844 100644 --- a/Tests/base/NSString/order.m +++ b/Tests/base/NSString/order.m @@ -20,39 +20,53 @@ int main(int argc, char **argv) d = [s1 dataUsingEncoding: NSUTF16BigEndianStringEncoding]; b = [d bytes]; - PASS(b[0] == 0 && b[1] == 65, "UTF-16 BE OK"); - s2 = [[NSString alloc] initWithBytes: b - length: 2 - encoding: NSUTF16BigEndianStringEncoding]; - PASS([s1 isEqual: s2], "UTF-16 BE reverse OK"); - [s2 release]; + PASS([d length] > 1 && b[0] == 0 && b[1] == 65, "UTF-16 BE OK"); + if (testPassed) + { + s2 = [[NSString alloc] initWithBytes: b + length: 2 + encoding: NSUTF16BigEndianStringEncoding]; + PASS([s1 isEqual: s2], "UTF-16 BE reverse OK"); + [s2 release]; + } d = [s1 dataUsingEncoding: NSUTF16LittleEndianStringEncoding]; b = [d bytes]; - PASS(b[0] == 65 && b[1] == 0, "UTF-16 LE OK"); - s2 = [[NSString alloc] initWithBytes: b - length: 2 - encoding: NSUTF16LittleEndianStringEncoding]; - PASS([s1 isEqual: s2], "UTF-16 LE reverse OK"); - [s2 release]; + PASS([d length] > 1 && b[0] == 65 && b[1] == 0, "UTF-16 LE OK"); + if (testPassed) + { + s2 = [[NSString alloc] initWithBytes: b + length: 2 + encoding: NSUTF16LittleEndianStringEncoding]; + PASS([s1 isEqual: s2], "UTF-16 LE reverse OK"); + [s2 release]; + } d = [s1 dataUsingEncoding: NSUTF32BigEndianStringEncoding]; b = [d bytes]; - PASS(b[0] == 0 && b[1] == 0 && b[2] == 0 && b[3] == 65, "UTF-32 BE OK"); - s2 = [[NSString alloc] initWithBytes: b - length: 4 - encoding: NSUTF32BigEndianStringEncoding]; - PASS([s1 isEqual: s2], "UTF-32 BE reverse OK"); - [s2 release]; + PASS([d length] > 3 && b[0] == 0 && b[1] == 0 && b[2] == 0 && b[3] == 65, + "UTF-32 BE OK"); + if (testPassed) + { + s2 = [[NSString alloc] initWithBytes: b + length: 4 + encoding: NSUTF32BigEndianStringEncoding]; + PASS([s1 isEqual: s2], "UTF-32 BE reverse OK"); + [s2 release]; + } d = [s1 dataUsingEncoding: NSUTF32LittleEndianStringEncoding]; b = [d bytes]; - PASS(b[0] == 65 && b[1] == 0 && b[2] == 0 && b[3] == 0, "UTF-32 LE OK"); - s2 = [[NSString alloc] initWithBytes: b - length: 4 - encoding: NSUTF32LittleEndianStringEncoding]; - PASS([s1 isEqual: s2], "UTF-32 LE reverse OK"); - [s2 release]; + PASS([d length] > 3 && b[0] == 65 && b[1] == 0 && b[2] == 0 && b[3] == 0, + "UTF-32 LE OK"); + if (testPassed) + { + s2 = [[NSString alloc] initWithBytes: b + length: 4 + encoding: NSUTF32LittleEndianStringEncoding]; + PASS([s1 isEqual: s2], "UTF-32 LE reverse OK"); + [s2 release]; + } [pool release]; return 0;