@@ -267,9 +267,11 @@ const NSInteger jsonDoNotIndent = -1; - (BOOL)scanJSONNumber:(NSNumber **)number { NSDecimal decimal; - BOOL result = [self scanDecimal:&decimal]; - *number = [NSDecimalNumber decimalNumberWithDecimal:decimal]; - return result; + BOOL isDecimal = [self scanDecimal:&decimal]; + if ( isDecimal ) { + *number = [NSDecimalNumber decimalNumberWithDecimal:decimal]; + } + return isDecimal; } - (BOOL)scanJSONWhiteSpace NSScanner+BSJSONAdditions.m @@ -85,6 +85,14 @@ inline BOOL ScanArray(NSString *inString, id *outResult) STAssertEqualObjects(theObject, [NSNull null], @"Result of scan didn't match expectations."); } +- (void) testInvalidNumber; +{ + id number = nil; + BOOL isDecimal = [[NSScanner scannerWithString:@"abc"] scanJSONNumber:&number]; + STAssertFalse( isDecimal, @"postcondition violated" ); + STAssertNil( number, @"postcondition violated" ); +} + - (void)testNumber { id theObject = nil; Unit Tests/BSJSONScanner_UnitTests.m @@ -16,7 +16,7 @@ - (void)testValidJSON { // test 'json_test_valid_01.txt" - NSString *testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_01" ofType:@"txt"]; + NSString *testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_01" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_01.txt\""); NSString *jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); @@ -38,7 +38,7 @@ // test 'json_test_valid_02.txt" - testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_02" ofType:@"txt"]; + testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_02" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_02.txt\""); jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); @@ -57,7 +57,7 @@ // test 'json_test_valid_03.txt" - testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_03" ofType:@"txt"]; + testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_03" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_03.txt\""); jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); @@ -72,7 +72,7 @@ STAssertEquals(500, width, @"Expected value of 500, but got %i", width); // test 'json_test_valid_04.txt" - testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_04" ofType:@"txt"]; + testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_04" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_04.txt\""); jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); @@ -85,7 +85,7 @@ // value checks // test 'json_test_valid_05.txt" - testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_05" ofType:@"txt"]; + testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_05" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_05.txt\""); jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); @@ -102,7 +102,7 @@ STAssertEquals([NSNull null], [[dict valueForKeyPath:@"menu.items"] objectAtIndex:2], @"Expected a null value in index 2"); // test 'json_test_valid_06.txt" - testFilePath = [[NSBundle mainBundle] pathForResource:@"json_test_valid_06" ofType:@"txt"]; + testFilePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"json_test_valid_06" ofType:@"txt"]; STAssertNotNil(testFilePath, @"Could not find the test file named \"json_test_valid_06.txt\""); jsonString = [NSString stringWithContentsOfFile:testFilePath]; STAssertNotNil(jsonString, @"Could not create an NSString from the file at path %@", testFilePath); Unit Tests/JSONValidTests.m @@ -10,21 +10,24 @@ - (void)testDictionaryEncoding { - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt: 31], @"age", - @"John Smith", @"name", - [NSNumber numberWithBool: YES], @"employed", - [NSArray arrayWithObjects: @"football", @"tv", nil], @"hobbies", - [NSDictionary dictionaryWithObjectsAndKeys: @"perfect", @"English", @"good", @"German", nil], @"languages", - nil]; - - NSString *encoded = [dict jsonStringValue]; - NSString *expected = @"{\n \"hobbies\" : [\"football\", \"tv\"],\n \"age\" : 31,\n \"name\" : \"John Smith\"," - "\n \"employed\" : true," - "\n \"languages\" : {\n\t \"English\" : \"perfect\",\n\t \"German\" : \"good\"}}"; - - STAssertNotNil(encoded, @"Encoding result was nil."); - STAssertEqualObjects(expected, encoded, @"Dictionary was incorrectly encoded"); + NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt: 31], @"age", + @"John Smith", @"name", + [NSNumber numberWithBool: YES], @"employed", + [NSArray arrayWithObjects: @"football", @"tv", nil], @"hobbies", + [NSDictionary dictionaryWithObjectsAndKeys: @"perfect", @"English", @"good", @"German", nil], @"languages", + nil]; + + // Encode dictionary as JSON representation + NSString *encoded = [dict jsonStringValue]; + STAssertNotNil(encoded, @"Encoding result was nil."); + + // Decode JSON representation as a dictionary. + NSDictionary *decodedDict = [NSDictionary dictionaryWithJSONString:encoded]; + STAssertNotNil( decodedDict, @"Decoding result was nil" ); + + // Test JSON encoding validity by comparing the decoded dictionary with the original. If the JSON dictionary encoding is bad, the decoded dictionary derived from it will not be equal to the original. + STAssertEqualObjects(decodedDict, dict, @"Dictionary was incorrectly encoded"); } @end Unit Tests/NSDictionary_UnitTests.m 0044bf82e420f1082172176e57fb1be31a13ff8b BSS bgarrison@runabout.(none) http://github.com/blakeseely/bsjsonadditions/commit/fdbeee7e9b015fa076884a07771073b8ed63d271 fdbeee7e9b015fa076884a07771073b8ed63d271 2009-09-25T10:46:36-07:00 2009-09-25T10:46:36-07:00 Minimal mods to fix issue #1 f5708c062d183496df8c5f38d4122e07e3877cd7 BSS bgarrison@runabout.(none)