From 42124b3691197c3c4f52f069775fa0390a8ff942 Mon Sep 17 00:00:00 2001 From: dmaclach Date: Fri, 7 Oct 2016 12:10:23 -0400 Subject: First cut at pruning things/updating things. Remove a bunch of code that Google stopped using/maintaining rather than trying to update it it. Some would be hard to update, some actually has system provided replacements; others are patterns that just don't seem as common now. Prune out the code related to macOS <= 10.5, start pruning some of the really old iOS support also. Get the projects mostly limping again with modern Xcodes so tests can be run. If someone ends up on this commit via history for something they still find as useful, feel free to do a pull request to bring the snippet of code back to life and update it for current SDKs. --- Foundation/GTMNSScanner+JSONTest.m | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'Foundation/GTMNSScanner+JSONTest.m') diff --git a/Foundation/GTMNSScanner+JSONTest.m b/Foundation/GTMNSScanner+JSONTest.m index 8085148..d78f41d 100644 --- a/Foundation/GTMNSScanner+JSONTest.m +++ b/Foundation/GTMNSScanner+JSONTest.m @@ -86,27 +86,27 @@ struct { BOOL goodObject = [scanner gtm_scanJSONObjectString:&object]; if (testStrings[i].resultString_) { if (testStrings[i].isObject_) { - STAssertEqualStrings(testStrings[i].resultString_, - object, @"Test String: %@", - testStrings[i].testString_); - STAssertNil(array, @"Test String: %@", testStrings[i].testString_); - STAssertTrue(goodObject, @"Test String: %@", - testStrings[i].testString_); - STAssertFalse(goodArray, @"Test String: %@", + XCTAssertEqualStrings(testStrings[i].resultString_, + object, @"Test String: %@", + testStrings[i].testString_); + XCTAssertNil(array, @"Test String: %@", testStrings[i].testString_); + XCTAssertTrue(goodObject, @"Test String: %@", testStrings[i].testString_); + XCTAssertFalse(goodArray, @"Test String: %@", + testStrings[i].testString_); } else { - STAssertEqualStrings(testStrings[i].resultString_, array, - @"Test String: %@", testStrings[i].testString_); - STAssertNil(object, @"Test String: %@", testStrings[i].testString_); - STAssertTrue(goodArray, @"Test String: %@", testStrings[i].testString_); - STAssertFalse(goodObject, @"Test String: %@", - testStrings[i].testString_); + XCTAssertEqualStrings(testStrings[i].resultString_, array, + @"Test String: %@", testStrings[i].testString_); + XCTAssertNil(object, @"Test String: %@", testStrings[i].testString_); + XCTAssertTrue(goodArray, @"Test String: %@", testStrings[i].testString_); + XCTAssertFalse(goodObject, @"Test String: %@", + testStrings[i].testString_); } } else { - STAssertNil(object, @"Test String: %@", testStrings[i].testString_); - STAssertNil(array, @"Test String: %@", testStrings[i].testString_); - STAssertFalse(goodArray, @"Test String: %@", testStrings[i].testString_); - STAssertFalse(goodObject, @"Test String: %@", testStrings[i].testString_); + XCTAssertNil(object, @"Test String: %@", testStrings[i].testString_); + XCTAssertNil(array, @"Test String: %@", testStrings[i].testString_); + XCTAssertFalse(goodArray, @"Test String: %@", testStrings[i].testString_); + XCTAssertFalse(goodObject, @"Test String: %@", testStrings[i].testString_); } } } @@ -117,13 +117,13 @@ struct { NSScanner *scanner = [NSScanner scannerWithString:testString]; [scanner setCharactersToBeSkipped:alphaSet]; NSString *array = nil; - STAssertTrue([scanner gtm_scanJSONArrayString:&array], nil); - STAssertEqualStrings(array, @"[]", nil); + XCTAssertTrue([scanner gtm_scanJSONArrayString:&array]); + XCTAssertEqualStrings(array, @"[]"); NSString *nextValue = nil; - STAssertTrue([scanner scanString:@":," intoString:&nextValue], nil); - STAssertEqualStrings(@":,", nextValue, nil); + XCTAssertTrue([scanner scanString:@":," intoString:&nextValue]); + XCTAssertEqualStrings(@":,", nextValue); scanner = [NSScanner scannerWithString:testString]; - STAssertFalse([scanner gtm_scanJSONArrayString:&array], nil); + XCTAssertFalse([scanner gtm_scanJSONArrayString:&array]); } @end -- cgit v1.2.3