Author: rfm
Date: Thu Jun 11 08:03:38 2015
New Revision: 38613
URL: http://svn.gna.org/viewcvs/gnustep?rev=38613&view=rev
Log:
add check for non-break space
Modified:
libs/base/trunk/Tests/base/NSCharacterSet/general.m
Modified: libs/base/trunk/Tests/base/NSCharacterSet/general.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSCharacterSet/general.m?rev=38613&r1=38612&r2=38613&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSCharacterSet/general.m (original)
+++ libs/base/trunk/Tests/base/NSCharacterSet/general.m Thu Jun 11 08:03:38 2015
@@ -8,58 +8,61 @@
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSCharacterSet *theSet,*iSet;
NSData *data1 = nil;
+ unichar ch;
theSet = [NSCharacterSet alphanumericCharacterSet];
- PASS([theSet characterIsMember:'A'] &&
- [theSet characterIsMember:'Z'] &&
- [theSet characterIsMember:'a'] &&
- [theSet characterIsMember:'z'] &&
- [theSet characterIsMember:'9'] &&
- [theSet characterIsMember:'0'] &&
- ![theSet characterIsMember:'#'] &&
- ![theSet characterIsMember:' '] &&
- ![theSet characterIsMember:'\n'],
+ PASS([theSet characterIsMember: 'A'] &&
+ [theSet characterIsMember: 'Z'] &&
+ [theSet characterIsMember: 'a'] &&
+ [theSet characterIsMember: 'z'] &&
+ [theSet characterIsMember: '9'] &&
+ [theSet characterIsMember: '0'] &&
+ ![theSet characterIsMember: '#'] &&
+ ![theSet characterIsMember: ' '] &&
+ ![theSet characterIsMember: '\n'],
"Check some characters from alphanumericCharacterSet");
theSet = [NSCharacterSet lowercaseLetterCharacterSet];
- PASS(![theSet characterIsMember:'A'] &&
- ![theSet characterIsMember:'Z'] &&
- [theSet characterIsMember:'a'] &&
- [theSet characterIsMember:'z'] &&
- ![theSet characterIsMember:'9'] &&
- ![theSet characterIsMember:'0'] &&
- ![theSet characterIsMember:'#'] &&
- ![theSet characterIsMember:' '] &&
- ![theSet characterIsMember:'\n'],
+ PASS(![theSet characterIsMember: 'A'] &&
+ ![theSet characterIsMember: 'Z'] &&
+ [theSet characterIsMember: 'a'] &&
+ [theSet characterIsMember: 'z'] &&
+ ![theSet characterIsMember: '9'] &&
+ ![theSet characterIsMember: '0'] &&
+ ![theSet characterIsMember: '#'] &&
+ ![theSet characterIsMember: ' '] &&
+ ![theSet characterIsMember: '\n'],
"Check some characters from lowercaseLetterCharacterSet");
theSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
- PASS(![theSet characterIsMember:'A'] &&
- ![theSet characterIsMember:'Z'] &&
- ![theSet characterIsMember:'a'] &&
- ![theSet characterIsMember:'z'] &&
- ![theSet characterIsMember:'9'] &&
- ![theSet characterIsMember:'0'] &&
- ![theSet characterIsMember:'#'] &&
- [theSet characterIsMember:' '] &&
- [theSet characterIsMember:'\n'] &&
- [theSet characterIsMember:'\t'],
+ PASS(![theSet characterIsMember: 'A'] &&
+ ![theSet characterIsMember: 'Z'] &&
+ ![theSet characterIsMember: 'a'] &&
+ ![theSet characterIsMember: 'z'] &&
+ ![theSet characterIsMember: '9'] &&
+ ![theSet characterIsMember: '0'] &&
+ ![theSet characterIsMember: '#'] &&
+ [theSet characterIsMember: ' '] &&
+ [theSet characterIsMember: '\n'] &&
+ [theSet characterIsMember: '\t'],
"Check some characters from whitespaceAndNewlineCharacterSet");
+ PASS([theSet characterIsMember: 0x00A0], "a non-break-space is whitespace");
+
data1 = [theSet bitmapRepresentation];
- PASS(data1 != nil && [data1 isKindOfClass:[NSData class]],
+ PASS(data1 != nil && [data1 isKindOfClass: [NSData class]],
"-bitmapRepresentation works");
iSet = [theSet invertedSet];
- PASS([iSet characterIsMember:'A'] &&
- [iSet characterIsMember:'Z'] &&
- [iSet characterIsMember:'a'] &&
- [iSet characterIsMember:'z'] &&
- [iSet characterIsMember:'9'] &&
- [iSet characterIsMember:'0'] &&
- [iSet characterIsMember:'#'] &&
- ![iSet characterIsMember:' '] &&
- ![iSet characterIsMember:'\n'] &&
- ![iSet characterIsMember:'\t'],
+ PASS([iSet characterIsMember: 'A'] &&
+ [iSet characterIsMember: 'Z'] &&
+ [iSet characterIsMember: 'a'] &&
+ [iSet characterIsMember: 'z'] &&
+ [iSet characterIsMember: '9'] &&
+ [iSet characterIsMember: '0'] &&
+ [iSet characterIsMember: '#'] &&
+ ![iSet characterIsMember: ' '] &&
+ ![iSet characterIsMember: '\n'] &&
+ ![iSet characterIsMember: '\t'],
"-invertedSet works");
{
NSCharacterSet *firstSet,*secondSet,*thirdSet,*fourthSet;
@@ -75,14 +78,14 @@
}
theSet = [NSCharacterSet characterSetWithCharactersInString:@"Not a set"];
- PASS(theSet != nil && [theSet isKindOfClass:[NSCharacterSet class]],
+ PASS(theSet != nil && [theSet isKindOfClass: [NSCharacterSet class]],
"Create custom set with characterSetWithCharactersInString:");
- PASS([theSet characterIsMember:' '] &&
- [theSet characterIsMember:'N'] &&
- [theSet characterIsMember:'o'] &&
- ![theSet characterIsMember:'A'] &&
- ![theSet characterIsMember:'#'],
+ PASS([theSet characterIsMember: ' '] &&
+ [theSet characterIsMember: 'N'] &&
+ [theSet characterIsMember: 'o'] &&
+ ![theSet characterIsMember: 'A'] &&
+ ![theSet characterIsMember: '#'],
"Check custom set");
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
