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
This commit is contained in:
commit
8fe06ef1aa
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#import <Foundation/NSObject.h>
|
#import <Foundation/NSObject.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
|
#import <Foundation/NSValue.h>
|
||||||
|
|
||||||
@class NSArray;
|
@class NSArray;
|
||||||
@class NSMutableArray;
|
@class NSMutableArray;
|
||||||
|
@ -66,7 +67,10 @@
|
||||||
#define failIf(c) test(!(c))
|
#define failIf(c) test(!(c))
|
||||||
|
|
||||||
#define testEquals(a,b) \
|
#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)]))
|
([NSString stringWithFormat: @"objects '%@' and '%@' differs", (a), (b)]))
|
||||||
|
|
||||||
#define testEqualsWithMessage(a,b,m) \
|
#define testEqualsWithMessage(a,b,m) \
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
- (void) test_parseJSONNumber
|
- (void) test_parseJSONNumber
|
||||||
{
|
{
|
||||||
SBJsonParser *parser;
|
SBJsonParser *parser;
|
||||||
NSObject *result;
|
id result;
|
||||||
|
|
||||||
parser = [SBJsonParser new];
|
parser = [SBJsonParser new];
|
||||||
[parser autorelease];
|
[parser autorelease];
|
||||||
|
@ -84,10 +84,9 @@
|
||||||
result = [parser objectWithString: @"[ -1 ]"];
|
result = [parser objectWithString: @"[ -1 ]"];
|
||||||
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithInt: -1]]);
|
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithInt: -1]]);
|
||||||
|
|
||||||
/* TODO: the 2 following fail because NSDecimalNumber does not implement
|
|
||||||
"compare:" */
|
|
||||||
result = [parser objectWithString: @"[ 12.3456 ]"];
|
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 ]"];
|
result = [parser objectWithString: @"[ -312.3456 ]"];
|
||||||
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: -312.3456]]);
|
testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: -312.3456]]);
|
||||||
|
|
Loading…
Reference in a new issue