[Author: dmaclach]

Some more google toolbox cleanup.

TBR=thomasvl
DELTA=25  (6 added, 2 deleted, 17 changed)

1 files changed, 21 insertions, 17 deletions

diff --git a/Foundation/GTMNSScanner+JSONTest.m b/Foundation/GTMNSScanner+JSONTest.m
index 08f5db1..8085148 100644
--- a/Foundation/GTMNSScanner+JSONTest.m
+++ b/Foundation/GTMNSScanner+JSONTest.m
@@ -6,9 +6,9 @@
 //  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 //  use this file except in compliance with the License.  You may obtain a copy
 //  of the License at
-// 
+//
 //  http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 //  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
@@ -75,7 +75,7 @@ struct {
 - (void)testJSONObject {
   NSCharacterSet *set = [[NSCharacterSet illegalCharacterSet] invertedSet];
   for (size_t i = 0; i < sizeof(testStrings) / sizeof(testStrings[0]); ++i) {
-    NSScanner *scanner 
+    NSScanner *scanner
       = [NSScanner scannerWithString:testStrings[i].testString_];
     [scanner setCharactersToBeSkipped:set];
     NSString *array = nil;
@@ -86,23 +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]);
-        STAssertNil(array, @"Test String: %@", testStrings[i]);
-        STAssertTrue(goodObject, @"Test String: %@", testStrings[i]);
-        STAssertFalse(goodArray, @"Test String: %@", testStrings[i]);
+        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: %@",
+                      testStrings[i].testString_);
       } else {
-        STAssertEqualStrings(testStrings[i].resultString_, array, 
-                             @"Test String: %@", testStrings[i]);
-        STAssertNil(object, @"Test String: %@", testStrings[i]);
-        STAssertTrue(goodArray, @"Test String: %@", testStrings[i]);
-        STAssertFalse(goodObject, @"Test String: %@", testStrings[i]);
+        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_);
       }
     } else {
-      STAssertNil(object, @"Test String: %@", testStrings[i]);
-      STAssertNil(array, @"Test String: %@", testStrings[i]);
-      STAssertFalse(goodArray, @"Test String: %@", testStrings[i]);
-      STAssertFalse(goodObject, @"Test String: %@", testStrings[i]);
+      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_);
     }
   }
 }