From e63170582f35815e816b199143b154e22053671c Mon Sep 17 00:00:00 2001 From: Larry Cao Date: Wed, 2 Jul 2014 15:41:52 -0700 Subject: [PATCH] Migrate tests from OCUnit to XCTest --- Support/TouchJSON.xcodeproj/project.pbxproj | 16 +- .../xcshareddata/xcschemes/Demo.xcscheme | 4 +- .../xcshareddata/xcschemes/UnitTests.xcscheme | 4 +- Support/UnitTests/CJSONDeserializer_UnitTests.h | 4 +- Support/UnitTests/CJSONDeserializer_UnitTests.m | 444 ++++++++++----------- Support/UnitTests/CJSONSerializer_UnitTests.h | 4 +- Support/UnitTests/CJSONSerializer_UnitTests.m | 34 +- 7 files changed, 253 insertions(+), 257 deletions(-) diff --git a/Support/TouchJSON.xcodeproj/project.pbxproj b/Support/TouchJSON.xcodeproj/project.pbxproj index b2ed6b1..54a8bf0 100644 --- a/Support/TouchJSON.xcodeproj/project.pbxproj +++ b/Support/TouchJSON.xcodeproj/project.pbxproj @@ -73,7 +73,7 @@ 45058870099952F600FB865F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 453111B10A64EDBB00A970C2 /* TouchJSON Demo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "TouchJSON Demo"; sourceTree = BUILT_PRODUCTS_DIR; }; 453111B50A64EDDE00A970C2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 45B15E110947D97B00AE66EB /* UnitTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + 45B15E110947D97B00AE66EB /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 45BB461A174D6C79000473E5 /* CJSONDeserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONDeserializer.h; sourceTree = ""; }; 45BB461B174D6C79000473E5 /* CJSONDeserializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONDeserializer.m; sourceTree = ""; }; 45BB461E174D6C79000473E5 /* CJSONSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONSerializer.h; sourceTree = ""; }; @@ -109,7 +109,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 45B15E110947D97B00AE66EB /* UnitTests.octest */, + 45B15E110947D97B00AE66EB /* UnitTests.xctest */, 453111B10A64EDBB00A970C2 /* TouchJSON Demo */, ); name = Products; @@ -206,8 +206,8 @@ ); name = UnitTests; productName = UnitTests; - productReference = 45B15E110947D97B00AE66EB /* UnitTests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = 45B15E110947D97B00AE66EB /* UnitTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -360,6 +360,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(value)", "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", + "$(inherited)", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -376,11 +377,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = UnitTests; - WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; name = Debug; @@ -393,6 +391,7 @@ FRAMEWORK_SEARCH_PATHS = ( "$(value)", "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)", + "$(inherited)", ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -406,11 +405,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = UnitTests; - WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; name = Release; diff --git a/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme index a20b401..02a976d 100644 --- a/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme +++ b/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme @@ -37,7 +37,7 @@ @@ -51,7 +51,7 @@ diff --git a/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme index 6522a65..87dc192 100644 --- a/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme +++ b/Support/TouchJSON.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ diff --git a/Support/UnitTests/CJSONDeserializer_UnitTests.h b/Support/UnitTests/CJSONDeserializer_UnitTests.h index 7e3a9c6..13abcb1 100644 --- a/Support/UnitTests/CJSONDeserializer_UnitTests.h +++ b/Support/UnitTests/CJSONDeserializer_UnitTests.h @@ -27,10 +27,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#import +#import -@interface CJSONDeserializer_UnitTests : SenTestCase { +@interface CJSONDeserializer_UnitTests : XCTestCase { } diff --git a/Support/UnitTests/CJSONDeserializer_UnitTests.m b/Support/UnitTests/CJSONDeserializer_UnitTests.m index 0de1b25..37a6bfb 100644 --- a/Support/UnitTests/CJSONDeserializer_UnitTests.m +++ b/Support/UnitTests/CJSONDeserializer_UnitTests.m @@ -62,8 +62,8 @@ - (void)testParameterErrors_1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:NULL error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testParameterErrors_Array @@ -72,8 +72,8 @@ - (void)testParameterErrors_Array theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserializeAsArray:NULL error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } #pragma mark Utter Garbage @@ -86,8 +86,8 @@ - (void)testParameterErrors_Garbage theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserializeAsArray:theJSONData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testParameterErrors_XML @@ -98,8 +98,8 @@ - (void)testParameterErrors_XML theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserializeAsArray:theJSONData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } #pragma mark Encodings @@ -113,9 +113,9 @@ - (void)testEncodings_UTF8 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF16LE @@ -127,9 +127,9 @@ - (void)testEncodings_UTF16LE theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF16BE @@ -141,9 +141,9 @@ - (void)testEncodings_UTF16BE theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF32LE @@ -155,9 +155,9 @@ - (void)testEncodings_UTF32LE theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF32BE @@ -169,9 +169,9 @@ - (void)testEncodings_UTF32BE theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF16 @@ -183,9 +183,9 @@ - (void)testEncodings_UTF16 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } - (void)testEncodings_UTF32 @@ -197,9 +197,9 @@ - (void)testEncodings_UTF32 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theJSONData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertEqualObjects(theDeseralizedValue, theValue, @"Output did not match expectations"); + XCTAssertNil(theError, @"This test should not return an error"); } #pragma mark Dictionaries @@ -212,8 +212,8 @@ - (void)testDictionary_Invalid1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Invalid2 @@ -224,8 +224,8 @@ - (void)testDictionary_Invalid2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Invalid3 @@ -236,8 +236,8 @@ - (void)testDictionary_Invalid3 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Invalid4 @@ -248,8 +248,8 @@ - (void)testDictionary_Invalid4 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Invalid5 @@ -260,8 +260,8 @@ - (void)testDictionary_Invalid5 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Invalid6 @@ -272,8 +272,8 @@ - (void)testDictionary_Invalid6 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testDictionary_Empty1 @@ -284,9 +284,9 @@ - (void)testDictionary_Empty1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @{}, @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @{}, @""); } - (void)testDictionary_Empty2 @@ -297,9 +297,9 @@ - (void)testDictionary_Empty2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @{}, @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @{}, @""); } - (void)testDictionary_DupeKey1 @@ -310,9 +310,9 @@ - (void)testDictionary_DupeKey1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @{ @"key": @(1) }, @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @{ @"key": @(1) }, @""); } - (void)testDictionary_DupeKey2 @@ -323,9 +323,9 @@ - (void)testDictionary_DupeKey2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @{ @"key": @(0) }, @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @{ @"key": @(0) }, @""); } - (void)testDictionary_InvalidKeys1 @@ -336,8 +336,8 @@ - (void)testDictionary_InvalidKeys1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNotNil(theError, @"This test should not return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNotNil(theError, @"This test should not return an error"); } - (void)testDictionary_InvalidKeys2 @@ -348,8 +348,8 @@ - (void)testDictionary_InvalidKeys2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNotNil(theError, @"This test should not return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNotNil(theError, @"This test should not return an error"); } - (void)testDictionary_InvalidKeys3 @@ -360,8 +360,8 @@ - (void)testDictionary_InvalidKeys3 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNotNil(theError, @"This test should not return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNotNil(theError, @"This test should not return an error"); } #pragma mark Arrays @@ -374,8 +374,8 @@ - (void)testArray_Invalid1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testArray_Invalid2 @@ -386,8 +386,8 @@ - (void)testArray_Invalid2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testArray_Invalid3 @@ -398,8 +398,8 @@ - (void)testArray_Invalid3 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testArray_Invalid4 @@ -410,8 +410,8 @@ - (void)testArray_Invalid4 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testArray_Empty1 @@ -422,9 +422,9 @@ - (void)testArray_Empty1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @[], @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @[], @""); } - (void)testArray_Empty2 @@ -435,9 +435,9 @@ - (void)testArray_Empty2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @[], @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @[], @""); } #pragma mark Escape Codes @@ -450,9 +450,9 @@ - (void)testEscapeCodes theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"\b\f\n\r\t", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"\b\f\n\r\t", @""); } - (void)testLaxEscapeCodes @@ -463,9 +463,9 @@ - (void)testLaxEscapeCodes theDeserializer.options |= kJSONDeserializationOptions_AllowFragments | kJSONDeserializationOptions_LaxEscapeCodes; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"q", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"q", @""); } - (void)testLaxEscapeCodes_NoFlag @@ -476,8 +476,8 @@ - (void)testLaxEscapeCodes_NoFlag theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testLaxEscapeCodes_EscapedSingleUTF8Character @@ -488,9 +488,9 @@ - (void)testLaxEscapeCodes_EscapedSingleUTF8Character theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"a", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"a", @""); } - (void)testLaxEscapeCodes_EscapedDoubleUTF8Character @@ -501,9 +501,9 @@ - (void)testLaxEscapeCodes_EscapedDoubleUTF8Character theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"Æ", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"Æ", @""); } - (void)testLaxEscapeCodes_EscapedTripleUTF8Character @@ -514,9 +514,9 @@ - (void)testLaxEscapeCodes_EscapedTripleUTF8Character theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"…", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"…", @""); } - (void)testLaxEscapeCodes_EscapedQuadUTF8Character @@ -527,9 +527,9 @@ - (void)testLaxEscapeCodes_EscapedQuadUTF8Character theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @"💩", @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @"💩", @""); } #pragma mark Null @@ -543,9 +543,9 @@ - (void)testNullObjectReplacement1 theDeserializer.nullObject = @"<>"; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, theDeserializer.nullObject, @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, theDeserializer.nullObject, @""); } - (void)testNullObjectReplacement @@ -557,8 +557,8 @@ - (void)testNullObjectReplacement theDeserializer.nullObject = NULL; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNil(theError, @"This test should not return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNil(theError, @"This test should not return an error"); } #pragma mark Numbers @@ -571,9 +571,9 @@ - (void)testFloatsWithGiantFractions theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should return an error"); - STAssertEqualObjects(theDeseralizedValue, [NSDecimalNumber decimalNumberWithString:theString], @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should return an error"); + XCTAssertEqualObjects(theDeseralizedValue, [NSDecimalNumber decimalNumberWithString:theString], @""); } - (void)testFloatsWithGiantExponents @@ -584,9 +584,9 @@ - (void)testFloatsWithGiantExponents theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should return an error"); - STAssertEqualObjects(theDeseralizedValue, [NSDecimalNumber decimalNumberWithString:theString], @""); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should return an error"); + XCTAssertEqualObjects(theDeseralizedValue, [NSDecimalNumber decimalNumberWithString:theString], @""); } - (void)testBadTrueValue1 @@ -596,8 +596,8 @@ - (void)testBadTrueValue1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testBadTrueValue2 @@ -607,8 +607,8 @@ - (void)testBadTrueValue2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testBadTrueValue3 @@ -618,8 +618,8 @@ - (void)testBadTrueValue3 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testTrue @@ -629,9 +629,9 @@ - (void)testTrue theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @(YES), NULL); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @(YES)); } - (void)testFalse @@ -641,9 +641,9 @@ - (void)testFalse theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @(NO), NULL); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @(NO)); } - (void)testConsumingAllData1 @@ -653,9 +653,9 @@ - (void)testConsumingAllData1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @(YES), NULL); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @(YES)); } - (void)testConsumingAllData2 @@ -665,9 +665,9 @@ - (void)testConsumingAllData2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theDeseralizedValue, @"This test should not return nil"); - STAssertNil(theError, @"This test should not return an error"); - STAssertEqualObjects(theDeseralizedValue, @[], NULL); + XCTAssertNotNil(theDeseralizedValue, @"This test should not return nil"); + XCTAssertNil(theError, @"This test should not return an error"); + XCTAssertEqualObjects(theDeseralizedValue, @[]); } - (void)testNotConsumingAllData1 @@ -677,8 +677,8 @@ - (void)testNotConsumingAllData1 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } - (void)testNotConsumingAllData2 @@ -688,8 +688,8 @@ - (void)testNotConsumingAllData2 theDeserializer.options |= kJSONDeserializationOptions_AllowFragments; NSError *theError = NULL; id theDeseralizedValue = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theDeseralizedValue, @"This test should return nil"); - STAssertNotNil(theError, @"This test should return an error"); + XCTAssertNil(theDeseralizedValue, @"This test should return nil"); + XCTAssertNotNil(theError, @"This test should return an error"); } #pragma mark Old tests - these are still being reviewed for value and possibly due for clean up. @@ -698,7 +698,7 @@ - (void)testWhitespace2 { id theObject = NULL; BOOL theResult = Scan(@"[ true, false ]", &theObject, NULL); - STAssertTrue(theResult, @"Scan return failure."); + XCTAssertTrue(theResult, @"Scan return failure."); //STAssertTrue([theObject isEqual:TXPropertyList(@"(1, 0)")], @"Result of scan didn't match expectations."); } @@ -706,7 +706,7 @@ - (void)testWhitespace3 { id theObject = NULL; BOOL theResult = Scan(@"{ \"x\" : [ 1 , 2 ] }", &theObject, NULL); - STAssertTrue(theResult, @"Scan return failure."); + XCTAssertTrue(theResult, @"Scan return failure."); //STAssertTrue([theObject isEqual:TXPropertyList(@"{x, (1, 2)}")], @"Result of scan didn't match expectations."); } @@ -717,7 +717,7 @@ - (void)testDanielPascoCode1 NSString *theSource = @"{\"status\": \"ok\", \"operation\": \"new_task\", \"task\": {\"status\": 0, \"updated_at\": {}, \"project_id\": 7179, \"dueDate\": null, \"creator_id\": 1, \"type_id\": 0, \"priority\": 1, \"id\": 37087, \"summary\": \"iPhone test\", \"description\": null, \"creationDate\": {}, \"owner_id\": 1, \"noteCount\": 0, \"commentCount\": 0}}"; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNotNil(theObject, @"Scan return failure."); + XCTAssertNotNil(theObject, @"Scan return failure."); } - (void)testDanielPascoCode2 @@ -725,7 +725,7 @@ - (void)testDanielPascoCode2 NSString *theSource = @"{\"status\": \"ok\", \"operation\": \"new_task\", \"task\": {\"status\": 0, \"project_id\": 7179, \"dueDate\": null, \"creator_id\": 1, \"type_id\": 0, \"priority\": 1, \"id\": 37087, \"summary\": \"iPhone test\", \"description\": null, \"owner_id\": 1, \"noteCount\": 0, \"commentCount\": 0}}"; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNotNil(theObject, @"Scan return failure."); + XCTAssertNotNil(theObject, @"Scan return failure."); } - (void)testTomHaringtonCode1 @@ -733,7 +733,7 @@ - (void)testTomHaringtonCode1 NSString *theSource = @"{\"r\":[{\"name\":\"KEXP\",\"desc\":\"90.3 - Where The Music Matters\",\"icon\":\"\\/img\\/channels\\/radio_stream.png\",\"audiostream\":\"http:\\/\\/kexp-mp3-1.cac.washington.edu:8000\\/\",\"type\":\"radio\",\"stream\":\"fb8155000526e0abb5f8d1e02c54cb83094cffae\",\"relay\":\"r2b\"}]}"; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNotNil(theObject, @"Scan return failure."); + XCTAssertNotNil(theObject, @"Scan return failure."); } #pragma mark - @@ -744,7 +744,7 @@ - (void)testScottyCode1 NSString *theSource = @"{\"a\": [ { ] }"; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNil(theObject, @"Scan return failure."); + XCTAssertNil(theObject, @"Scan return failure."); } - (void)testUnterminatedString @@ -753,7 +753,7 @@ - (void)testUnterminatedString NSString *theSource = @"\""; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNil(theObject, @"Scan return failure."); + XCTAssertNil(theObject, @"Scan return failure."); } - (void)testGarbageCharacter @@ -762,7 +762,7 @@ - (void)testGarbageCharacter NSString *theSource = @">"; NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserialize:theData error:nil]; - STAssertNil(theObject, @"Scan return failure."); + XCTAssertNil(theObject, @"Scan return failure."); } #pragma mark - @@ -773,7 +773,7 @@ -(void)testEmptyDictionary NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserializeAsDictionary:theData error:nil]; NSDictionary *dictionary = [NSDictionary dictionary]; - STAssertEqualObjects(dictionary, theObject, nil); + XCTAssertEqualObjects(dictionary, theObject); } -(void)testSingleKeyValuePair @@ -782,7 +782,7 @@ -(void)testSingleKeyValuePair NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *theObject = [[CJSONDeserializer deserializer] deserializeAsDictionary:theData error:nil]; NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"b" forKey:@"a"]; - STAssertEqualObjects(dictionary, theObject, nil); + XCTAssertEqualObjects(dictionary, theObject); } -(void)testRootArray @@ -791,7 +791,7 @@ -(void)testRootArray NSData *theData = [theSource dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSArray *theObject = [[CJSONDeserializer deserializer] deserializeAsArray:theData error:nil]; NSArray *theArray = [NSArray arrayWithObjects:@"a", @"b", @"c", NULL]; - STAssertEqualObjects(theArray, theObject, nil); + XCTAssertEqualObjects(theArray, theObject); } -(void)testDeserializeDictionaryWithNonDictionary @@ -799,7 +799,7 @@ -(void)testDeserializeDictionaryWithNonDictionary NSString *emptyArrayInJSON = @"[]"; NSData *emptyArrayInJSONAsData = [emptyArrayInJSON dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *deserializedDictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:emptyArrayInJSONAsData error:nil]; - STAssertNil(deserializedDictionary, nil); + XCTAssertNil(deserializedDictionary); } -(void)testDeserializeDictionaryWithAnEmbeddedArray @@ -812,7 +812,7 @@ -(void)testDeserializeDictionaryWithAnEmbeddedArray @"a_method", @"method", [NSArray arrayWithObject:@"a_param"], @"params", nil]; - STAssertEqualObjects(dictionary, theObject, nil); + XCTAssertEqualObjects(dictionary, theObject); } -(void)testDeserializeDictionaryWithAnEmbeddedArrayWithWhitespace @@ -825,7 +825,7 @@ -(void)testDeserializeDictionaryWithAnEmbeddedArrayWithWhitespace @"a_method", @"method", [NSMutableArray arrayWithObject:@"a_param"], @"params", nil]; - STAssertEqualObjects(dictionary, theObject, nil); + XCTAssertEqualObjects(dictionary, theObject); } @@ -835,8 +835,8 @@ -(void)testCheckForError NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:jsonData error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithEmptyJSON @@ -845,8 +845,8 @@ -(void)testCheckForErrorWithEmptyJSON NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:jsonData error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithEmptyJSONAndIgnoringError @@ -854,21 +854,21 @@ -(void)testCheckForErrorWithEmptyJSONAndIgnoringError NSString *jsonString = @""; NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:jsonData error:nil]; - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithNilJSON { NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:nil error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithNilJSONAndIgnoringError { NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:nil error:nil]; - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testNoError @@ -877,8 +877,8 @@ -(void)testNoError NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserializeAsDictionary:jsonData error:&error]; - STAssertNil(error, @"No error should be reported when deserializing an empty dictionary", nil); - STAssertNotNil(dictionary, @"Dictionary will be nil when there is not an error deserializing", nil); + XCTAssertNil(error, @"No error should be reported when deserializing an empty dictionary", nil); + XCTAssertNotNil(dictionary, @"Dictionary will be nil when there is not an error deserializing", nil); } -(void)testCheckForError_Deprecated @@ -887,8 +887,8 @@ -(void)testCheckForError_Deprecated NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserialize:jsonData error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithEmptyJSON_Deprecated @@ -897,8 +897,8 @@ -(void)testCheckForErrorWithEmptyJSON_Deprecated NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserialize:jsonData error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithEmptyJSONAndIgnoringError_Deprecated @@ -906,21 +906,21 @@ -(void)testCheckForErrorWithEmptyJSONAndIgnoringError_Deprecated NSString *jsonString = @""; NSData *jsonData = [jsonString dataUsingEncoding:NSUTF32BigEndianStringEncoding]; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserialize:jsonData error:nil]; - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithNilJSON_Deprecated { NSError *error = nil; NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserialize:nil error:&error]; - STAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNotNil(error, @"An error should be reported when deserializing a badly formed JSON string", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testCheckForErrorWithNilJSONAndIgnoringError_Deprecated { NSDictionary *dictionary = [[CJSONDeserializer deserializer] deserialize:nil error:nil]; - STAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); + XCTAssertNil(dictionary, @"Dictionary will be nil when there is an error deserializing", nil); } -(void)testNullValueInArray @@ -929,7 +929,7 @@ -(void)testNullValueInArray theDeserializer.nullObject = NULL; NSData *theData = [@"[null]" dataUsingEncoding:NSUTF8StringEncoding]; NSArray *theArray = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theArray, @[ [NSNull null] ], @"Array mismatch"); + XCTAssertEqualObjects(theArray, @[ [NSNull null] ], @"Array mismatch"); } -(void)testAlternativeNullValueInArray @@ -938,7 +938,7 @@ -(void)testAlternativeNullValueInArray theDeserializer.nullObject = @"foo"; NSData *theData = [@"[null]" dataUsingEncoding:NSUTF8StringEncoding]; NSArray *theArray = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theArray, [NSArray arrayWithObject:@"foo"], @"Skipping null did not produce array with placeholder"); + XCTAssertEqualObjects(theArray, [NSArray arrayWithObject:@"foo"], @"Skipping null did not produce array with placeholder"); } -(void)testDontSkipNullValueInArray @@ -946,7 +946,7 @@ -(void)testDontSkipNullValueInArray CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"[null]" dataUsingEncoding:NSUTF8StringEncoding]; NSArray *theArray = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theArray, [NSArray arrayWithObject:[NSNull null]], @"Didnt get the array we were looking for"); + XCTAssertEqualObjects(theArray, [NSArray arrayWithObject:[NSNull null]], @"Didnt get the array we were looking for"); } -(void)testSkipNullValueInDictionary @@ -955,7 +955,7 @@ -(void)testSkipNullValueInDictionary theDeserializer.nullObject = NULL; NSData *theData = [@"{\"foo\":null}" dataUsingEncoding:NSUTF8StringEncoding]; NSDictionary *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, [NSDictionary dictionary], @"Skipping null did not produce empty dict"); + XCTAssertEqualObjects(theObject, [NSDictionary dictionary], @"Skipping null did not produce empty dict"); } -(void)testMultipleRuns @@ -963,10 +963,10 @@ -(void)testMultipleRuns CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"{\"hello\":\"world\"}" dataUsingEncoding:NSUTF8StringEncoding]; NSDictionary *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, [NSDictionary dictionaryWithObject:@"world" forKey:@"hello"], @"Dictionary did not contain expected contents"); + XCTAssertEqualObjects(theObject, [NSDictionary dictionaryWithObject:@"world" forKey:@"hello"], @"Dictionary did not contain expected contents"); theData = [@"{\"goodbye\":\"cruel world\"}" dataUsingEncoding:NSUTF8StringEncoding]; theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, [NSDictionary dictionaryWithObject:@"cruel world" forKey:@"goodbye"], @"Dictionary did not contain expected contents"); + XCTAssertEqualObjects(theObject, [NSDictionary dictionaryWithObject:@"cruel world" forKey:@"goodbye"], @"Dictionary did not contain expected contents"); } //-(void)testWindowsCP1252StringEncoding @@ -986,7 +986,7 @@ -(void)testMultipleRuns - (void)testCloseHashes { - STAssertEquals( + XCTAssertEqual( [[@"0.000000,0.000000,2.000000,2.000000" dataUsingEncoding:NSUTF8StringEncoding] hash], [[@"2.000000,0.000000,0.000000,2.000000" dataUsingEncoding:NSUTF8StringEncoding] hash], @"Ohoh"); @@ -999,7 +999,7 @@ - (void)testCloseHashes @"0.000000,0.000000,2.000000,2.000000", @"2.000000,0.000000,0.000000,2.000000" ]; - STAssertEqualObjects(theResult, theExpectedResult, @""); + XCTAssertEqualObjects(theResult, theExpectedResult, @""); } -(void)testEscapeCodes1 @@ -1009,8 +1009,8 @@ -(void)testEscapeCodes1 NSData *theData = [@"\"\\u003c\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @"<", @"Mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @"<", @"Mismatch"); } -(void)testEscapeCodes2 @@ -1020,8 +1020,8 @@ -(void)testEscapeCodes2 NSData *theData = [@"\"\\u003ca href=\\\"\\\"\\u003e\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @"", @"Mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @"", @"Mismatch"); } -(void)testNullEscapeCode @@ -1031,8 +1031,8 @@ -(void)testNullEscapeCode NSData *theData = [@"\"\\u0000\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @"\0", @"Mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @"\0", @"Mismatch"); } -(void)testMalformedEscapeCodes0 @@ -1042,8 +1042,8 @@ -(void)testMalformedEscapeCodes0 NSData *theData = [@"\"\\u\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Expected an error!"); - STAssertNil(theResult, @"Expected a nil"); + XCTAssertNotNil(theError, @"Expected an error!"); + XCTAssertNil(theResult, @"Expected a nil"); } -(void)testMalformedEscapeCodes1 @@ -1053,8 +1053,8 @@ -(void)testMalformedEscapeCodes1 NSData *theData = [@"\"\\u2\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Expected an error!"); - STAssertNil(theResult, @"Expected a nil"); + XCTAssertNotNil(theError, @"Expected an error!"); + XCTAssertNil(theResult, @"Expected a nil"); } -(void)testMalformedEscapeCodes2 @@ -1064,8 +1064,8 @@ -(void)testMalformedEscapeCodes2 NSData *theData = [@"\"\\u20\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Expected an error!"); - STAssertNil(theResult, @"Expected a nil"); + XCTAssertNotNil(theError, @"Expected an error!"); + XCTAssertNil(theResult, @"Expected a nil"); } -(void)testMalformedEscapeCodes3 @@ -1075,8 +1075,8 @@ -(void)testMalformedEscapeCodes3 NSData *theData = [@"\"\\u202\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Expected an error!"); - STAssertNil(theResult, @"Expected a nil"); + XCTAssertNotNil(theError, @"Expected an error!"); + XCTAssertNil(theResult, @"Expected a nil"); } -(void)testSurrogatePairs @@ -1086,8 +1086,8 @@ -(void)testSurrogatePairs NSData *theData = [@"\"\\uD83D\\uDCA9\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects([theResult decomposedStringWithCanonicalMapping], [@"💩" decomposedStringWithCanonicalMapping], @"Poop mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects([theResult decomposedStringWithCanonicalMapping], [@"💩" decomposedStringWithCanonicalMapping], @"Poop mismatch"); } -(void)testBrokenSurrogatePair1 @@ -1097,8 +1097,8 @@ -(void)testBrokenSurrogatePair1 NSData *theData = [@"\"\\uD83D\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Didn't get error when expected one."); - STAssertNil(theResult, @"Poop mismatch"); + XCTAssertNotNil(theError, @"Didn't get error when expected one."); + XCTAssertNil(theResult, @"Poop mismatch"); } -(void)testBrokenSurrogatePair2 @@ -1108,8 +1108,8 @@ -(void)testBrokenSurrogatePair2 NSData *theData = [@"\"\\uDCA9\"" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNotNil(theError, @"Didn't get error when expected one."); - STAssertNil(theResult, @"Poop mismatch"); + XCTAssertNotNil(theError, @"Didn't get error when expected one."); + XCTAssertNil(theResult, @"Poop mismatch"); } -(void)testFloats1 @@ -1119,8 +1119,8 @@ -(void)testFloats1 NSData *theData = [@"1.0" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @(1.0), @"Floating point mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @(1.0), @"Floating point mismatch"); } -(void)testFloats2 @@ -1130,8 +1130,8 @@ -(void)testFloats2 NSData *theData = [@"1.1" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @(1.1), @"Floating point mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @(1.1), @"Floating point mismatch"); } -(void)testFloats3 @@ -1141,8 +1141,8 @@ -(void)testFloats3 NSData *theData = [@"1.1e10" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @(1.1e10), @"Floating point mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @(1.1e10), @"Floating point mismatch"); } -(void)testFloats4 @@ -1152,8 +1152,8 @@ -(void)testFloats4 NSData *theData = [@"1e123" dataUsingEncoding:NSASCIIStringEncoding]; NSError *theError = NULL; id theResult = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theError, @"Got an error when expected none."); - STAssertEqualObjects(theResult, @(1e123), @"Floating point mismatch"); + XCTAssertNil(theError, @"Got an error when expected none."); + XCTAssertEqualObjects(theResult, @(1e123), @"Floating point mismatch"); } -(void)testNumbers1 @@ -1162,7 +1162,7 @@ -(void)testNumbers1 NSNumber *theNumber = @(100); NSData *theData = [[theNumber stringValue] dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); } -(void)testNumbers2 @@ -1171,7 +1171,7 @@ -(void)testNumbers2 NSNumber *theNumber = @(-100); NSData *theData = [[theNumber stringValue] dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); } -(void)testLargeNumbers @@ -1180,7 +1180,7 @@ -(void)testLargeNumbers NSNumber *theNumber = @(0xFFFFFFFFFFFFFFFFULL); NSData *theData = [[theNumber stringValue] dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); } -(void)testScientificNumbers1 @@ -1188,7 +1188,7 @@ -(void)testScientificNumbers1 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134e4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers2 @@ -1196,7 +1196,7 @@ -(void)testScientificNumbers2 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134e4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers3 @@ -1204,7 +1204,7 @@ -(void)testScientificNumbers3 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134e-4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e-4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e-4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers4 @@ -1212,7 +1212,7 @@ -(void)testScientificNumbers4 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134E4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers5 @@ -1220,7 +1220,7 @@ -(void)testScientificNumbers5 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134E4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers6 @@ -1228,7 +1228,7 @@ -(void)testScientificNumbers6 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"-134E-4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(-134e-4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(-134e-4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers7 @@ -1236,7 +1236,7 @@ -(void)testScientificNumbers7 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"134E4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers8 @@ -1244,7 +1244,7 @@ -(void)testScientificNumbers8 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"134E4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(134e4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(134e4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers9 @@ -1252,7 +1252,7 @@ -(void)testScientificNumbers9 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"134E-4" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(134e-4), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(134e-4), @"Numbers did not contain expected contents"); } -(void)testScientificNumbers10 @@ -1260,7 +1260,7 @@ -(void)testScientificNumbers10 CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"134E0" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(134), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(134), @"Numbers did not contain expected contents"); } @@ -1270,7 +1270,7 @@ -(void)testLargeNegativeNumbers1 NSNumber *theNumber = @(-14399073641566209LL); NSData *theData = [[theNumber stringValue] dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); } -(void)testLargeNegativeNumbers2 @@ -1279,7 +1279,7 @@ -(void)testLargeNegativeNumbers2 NSNumber *theNumber = @(-0xFFFFFFFFFFFFFFFLL); NSData *theData = [[theNumber stringValue] dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, theNumber, @"Numbers did not contain expected contents"); } -(void)test64BitNumbers @@ -1287,7 +1287,7 @@ -(void)test64BitNumbers CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"9223372036854775807" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, @(9223372036854775807ULL), @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, @(9223372036854775807ULL), @"Numbers did not contain expected contents"); } -(void)test65BitNumbers @@ -1295,7 +1295,7 @@ -(void)test65BitNumbers CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; NSData *theData = [@"36893488147419103232" dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, [NSDecimalNumber decimalNumberWithString:@"36893488147419103232"], @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, [NSDecimalNumber decimalNumberWithString:@"36893488147419103232"], @"Numbers did not contain expected contents"); } -(void)testLargeNegativeNumbers @@ -1305,7 +1305,7 @@ -(void)testLargeNegativeNumbers NSLog(@"*** %@", theValue); NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects(theObject, [NSDecimalNumber decimalNumberWithString:theValue], @"Numbers did not contain expected contents"); + XCTAssertEqualObjects(theObject, [NSDecimalNumber decimalNumberWithString:theValue], @"Numbers did not contain expected contents"); } -(void)testUpperLimitNumbers @@ -1313,10 +1313,10 @@ -(void)testUpperLimitNumbers CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer]; // NSDecimalNumber can reliably store 38 digits... NSString *theValue = [@"" stringByPaddingToLength:38 withString:@"9" startingAtIndex:0]; - STAssertTrue([theValue length] == 38, @""); + XCTAssertTrue([theValue length] == 38, @""); NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:nil]; - STAssertEqualObjects([theObject stringValue], theValue, @"Numbers did not contain expected contents"); + XCTAssertEqualObjects([theObject stringValue], theValue, @"Numbers did not contain expected contents"); } // TODO -- disabling this test. Right now TouchJSON will overflow NSDecimalNumber - if you use JSON for numbers with mantinssas of more than 38 digits you're screwed anyway. @@ -1339,8 +1339,8 @@ -(void)testBadInt NSString *theValue = @"1-1-1-1-1"; NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theObject, @"Got a value when I shouldnt."); - STAssertNotNil(theError, @"Didn't get an error."); + XCTAssertNil(theObject, @"Got a value when I shouldnt."); + XCTAssertNotNil(theError, @"Didn't get an error."); } -(void)testBadInt2 @@ -1351,8 +1351,8 @@ -(void)testBadInt2 NSString *theValue = @"-"; NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theObject, @"Got a value when I shouldnt."); - STAssertNotNil(theError, @"Didn't get an error."); + XCTAssertNil(theObject, @"Got a value when I shouldnt."); + XCTAssertNotNil(theError, @"Didn't get an error."); } -(void)testBadFloat @@ -1363,8 +1363,8 @@ -(void)testBadFloat NSString *theValue = @"1.1.1.1.1."; NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theObject, @"Got a value when I shouldnt."); - STAssertNotNil(theError, @"Didn't get an error."); + XCTAssertNil(theObject, @"Got a value when I shouldnt."); + XCTAssertNotNil(theError, @"Didn't get an error."); } -(void)testBadFloat2 @@ -1375,8 +1375,8 @@ -(void)testBadFloat2 NSString *theValue = @"."; NSData *theData = [theValue dataUsingEncoding:NSUTF8StringEncoding]; NSNumber *theObject = [theDeserializer deserialize:theData error:&theError]; - STAssertNil(theObject, @"Got a value when I shouldnt."); - STAssertNotNil(theError, @"Didn't get an error."); + XCTAssertNil(theObject, @"Got a value when I shouldnt."); + XCTAssertNotNil(theError, @"Didn't get an error."); } @end diff --git a/Support/UnitTests/CJSONSerializer_UnitTests.h b/Support/UnitTests/CJSONSerializer_UnitTests.h index 9d9f74b..78fee5a 100644 --- a/Support/UnitTests/CJSONSerializer_UnitTests.h +++ b/Support/UnitTests/CJSONSerializer_UnitTests.h @@ -27,10 +27,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#import +#import -@interface CJSONSerializer_UnitTests : SenTestCase { +@interface CJSONSerializer_UnitTests : XCTestCase { } diff --git a/Support/UnitTests/CJSONSerializer_UnitTests.m b/Support/UnitTests/CJSONSerializer_UnitTests.m index 55c5bec..ccf2111 100644 --- a/Support/UnitTests/CJSONSerializer_UnitTests.m +++ b/Support/UnitTests/CJSONSerializer_UnitTests.m @@ -39,7 +39,7 @@ - (void)testEmptyDictionary NSString *jsonEquivalent = @"{}"; NSDictionary *emptyDictionary = [NSDictionary dictionary]; id theObject = [[CJSONSerializer serializer] serializeObject:emptyDictionary error:nil]; - STAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject, nil); + XCTAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject); } -(void)testSingleKeyValuePair @@ -47,7 +47,7 @@ -(void)testSingleKeyValuePair NSString *jsonEquivalent = @"{\"a\":\"b\"}"; NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"b" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; - STAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject, nil); + XCTAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject); } /* http://code.google.com/p/touchcode/issues/detail?id=52 */ @@ -57,7 +57,7 @@ -(void)test_SerializeArrayWithDuplicatedInstances NSArray *input = [NSArray arrayWithObjects:a, @"b", a, nil]; NSData *expected = [@"[\"a\",\"b\",\"a\"]" dataUsingEncoding:NSUTF8StringEncoding]; id output = [[CJSONSerializer serializer] serializeObject:input error:nil]; - STAssertEqualObjects(expected, output, nil); + XCTAssertEqualObjects(expected, output); } - (void)testFalse @@ -65,7 +65,7 @@ - (void)testFalse NSString *jsonEquivalent = @"{\"a\":false}"; NSDictionary *dictionary = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; - STAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject, nil); + XCTAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject); } - (void)testDoubleAccuracy @@ -73,7 +73,7 @@ - (void)testDoubleAccuracy NSString *jsonEquivalent = @"{\"a\":1.23456789}"; NSDictionary *dictionary = [NSDictionary dictionaryWithObject:[NSNumber numberWithDouble:1.23456789] forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; - STAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject, nil); + XCTAssertEqualObjects([jsonEquivalent dataUsingEncoding:NSUTF8StringEncoding], theObject); } - (void)testLineBreaksInStrings @@ -82,7 +82,7 @@ - (void)testLineBreaksInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"line\nbreak" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testCarriageReturnsInStrings @@ -91,7 +91,7 @@ - (void)testCarriageReturnsInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"carriage\rreturn" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testTabsInStrings @@ -100,7 +100,7 @@ - (void)testTabsInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"tab\there" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testFormfeedsInStrings @@ -109,7 +109,7 @@ - (void)testFormfeedsInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"formfeed\fhere" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testBackspaceInStrings @@ -118,7 +118,7 @@ - (void)testBackspaceInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"backspace\bhere" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testDoubleQuotesInStrings @@ -127,7 +127,7 @@ - (void)testDoubleQuotesInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"double\"quote" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testBackslashInStrings @@ -136,7 +136,7 @@ - (void)testBackslashInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"back\\slash" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testSlashInStrings @@ -145,7 +145,7 @@ - (void)testSlashInStrings NSDictionary *dictionary = [NSDictionary dictionaryWithObject:@"slash/slash" forKey:@"a"]; id theObject = [[CJSONSerializer serializer] serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testEscapedSlashInStrings @@ -156,7 +156,7 @@ - (void)testEscapedSlashInStrings theSerializer.options = kJSONSerializationOptions_EncodeSlashes; id theObject = [theSerializer serializeObject:dictionary error:nil]; NSString *resultString = [[NSString alloc] initWithData:theObject encoding:NSUTF8StringEncoding]; - STAssertEqualObjects(resultString, jsonEquivalent, nil); + XCTAssertEqualObjects(resultString, jsonEquivalent); } - (void)testMultibytesStrings_1 @@ -167,7 +167,7 @@ - (void)testMultibytesStrings_1 NSString *theString = [[CJSONDeserializer deserializer] deserialize:theData error:&theError]; theData = [[CJSONSerializer serializer] serializeObject:theString error:&theError]; theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding]; - STAssertNotNil(theString, @"fail"); + XCTAssertNotNil(theString, @"fail"); } - (void)testMultibytesStrings_2 @@ -177,7 +177,7 @@ - (void)testMultibytesStrings_2 NSString *theString = [[CJSONDeserializer deserializer] deserialize:theData error:&theError]; theData = [[CJSONSerializer serializer] serializeObject:theString error:&theError]; theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding]; - STAssertNotNil(theString, @"fail"); + XCTAssertNotNil(theString, @"fail"); } - (void)testMultibytesStrings_3 @@ -187,7 +187,7 @@ - (void)testMultibytesStrings_3 NSString *theString = [[CJSONDeserializer deserializer] deserialize:theData error:&theError]; theData = [[CJSONSerializer serializer] serializeObject:theString error:&theError]; theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding]; - STAssertNotNil(theString, @"fail"); + XCTAssertNotNil(theString, @"fail"); }