propagate from branch 'ca.inverse.sogo.1_3_15' (head fbdbaedef2d0b93dc7ac828e0acfde7baccc8f6b)

to branch 'ca.inverse.sogo' (head 3dd0e19a5e7b771ac747db220635cb0b93d6061d)

Monotone-Parent: 3dd0e19a5e7b771ac747db220635cb0b93d6061d
Monotone-Parent: fbdbaedef2d0b93dc7ac828e0acfde7baccc8f6b
Monotone-Revision: 74637b0d30612389db5f908c078f94c96d2f4a04

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-23T18:58:54
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-04-23 18:58:54 +00:00
commit 8fe06ef1aa
2 changed files with 8 additions and 5 deletions

View File

@ -25,6 +25,7 @@
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <Foundation/NSValue.h>
@class NSArray;
@class NSMutableArray;
@ -66,7 +67,10 @@
#define failIf(c) test(!(c))
#define testEquals(a,b) \
testWithMessage((((a) == (b)) || ([(a) isEqual: (b)])), \
testWithMessage((((a) == (b)) || ([(a) isEqual: (b)]) \
|| ([(a) isKindOfClass: [NSNumber class]] \
&& [(b) isKindOfClass: [NSNumber class]] \
&& [(NSNumber *) (a) isEqualToNumber: (NSNumber *) (b)])), \
([NSString stringWithFormat: @"objects '%@' and '%@' differs", (a), (b)]))
#define testEqualsWithMessage(a,b,m) \

View File

@ -70,7 +70,7 @@
- (void) test_parseJSONNumber
{
SBJsonParser *parser;
NSObject *result;
id result;
parser = [SBJsonParser new];
[parser autorelease];
@ -84,10 +84,9 @@
result = [parser objectWithString: @"[ -1 ]"];
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithInt: -1]]);
/* TODO: the 2 following fail because NSDecimalNumber does not implement
"compare:" */
result = [parser objectWithString: @"[ 12.3456 ]"];
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: 12.3456]]);
testEquals ([result objectAtIndex: 0],
[NSDecimalNumber decimalNumberWithString: @"12.3456"]);
result = [parser objectWithString: @"[ -312.3456 ]"];
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: -312.3456]]);