Skip to content

Commit cd45936

Browse files
committed
Updated tests in GIDEMMSupportTest
1 parent 9108964 commit cd45936

1 file changed

Lines changed: 12 additions & 42 deletions

File tree

GoogleSignIn/Tests/Unit/GIDEMMSupportTest.m

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,8 @@ - (void)testParametersWithParameters_withAnyNumber_isConvertedToString {
285285

286286
XCTAssertEqualObjects(stringifiedParameters[@"number_key"], @"12345",
287287
@"The NSNumber should be converted to a string.");
288-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
289-
XCTAssertTrue([key isKindOfClass:[NSString class]],
290-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
291-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
292-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
293-
[obj class], key);
294-
}];
288+
XCTAssertTrue([stringifiedParameters[@"number_key"] isKindOfClass:[NSString class]],
289+
@"The final value should be of a NSString type.");
295290
}
296291

297292
- (void)testParametersWithParameters_withNumberOne_isConvertedToString {
@@ -303,13 +298,8 @@ - (void)testParametersWithParameters_withNumberOne_isConvertedToString {
303298

304299
XCTAssertEqualObjects(stringifiedParameters[@"number_key"], @"1",
305300
@"The NSNumber should be converted to a string.");
306-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
307-
XCTAssertTrue([key isKindOfClass:[NSString class]],
308-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
309-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
310-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
311-
[obj class], key);
312-
}];
301+
XCTAssertTrue([stringifiedParameters[@"number_key"] isKindOfClass:[NSString class]],
302+
@"The final value should be of a NSString type.");
313303
}
314304

315305
- (void)testParametersWithParameters_withNumberZero_isConvertedToString {
@@ -321,13 +311,8 @@ - (void)testParametersWithParameters_withNumberZero_isConvertedToString {
321311

322312
XCTAssertEqualObjects(stringifiedParameters[@"number_key"], @"0",
323313
@"The NSNumber should be converted to a string.");
324-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
325-
XCTAssertTrue([key isKindOfClass:[NSString class]],
326-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
327-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
328-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
329-
[obj class], key);
330-
}];
314+
XCTAssertTrue([stringifiedParameters[@"number_key"] isKindOfClass:[NSString class]],
315+
@"The final value should be of a NSString type.");
331316
}
332317

333318
- (void)testParametersWithParameters_withBooleanYes_isConvertedToTrueString {
@@ -339,13 +324,8 @@ - (void)testParametersWithParameters_withBooleanYes_isConvertedToTrueString {
339324

340325
XCTAssertEqualObjects(stringifiedParameters[@"bool_key"], @"true",
341326
@"The boolean YES should be converted to the string 'true'.");
342-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
343-
XCTAssertTrue([key isKindOfClass:[NSString class]],
344-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
345-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
346-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
347-
[obj class], key);
348-
}];
327+
XCTAssertTrue([stringifiedParameters[@"bool_key"] isKindOfClass:[NSString class]],
328+
@"The final value should be of a NSString type.");
349329
}
350330

351331
- (void)testParametersWithParameters_withBooleanNo_isConvertedToFalseString {
@@ -357,13 +337,8 @@ - (void)testParametersWithParameters_withBooleanNo_isConvertedToFalseString {
357337

358338
XCTAssertEqualObjects(stringifiedParameters[@"bool_key"], @"false",
359339
@"The boolean NO should be converted to the string 'false'.");
360-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
361-
XCTAssertTrue([key isKindOfClass:[NSString class]],
362-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
363-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
364-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
365-
[obj class], key);
366-
}];
340+
XCTAssertTrue([stringifiedParameters[@"bool_key"] isKindOfClass:[NSString class]],
341+
@"The final value should be of a NSString type.");
367342
}
368343

369344
- (void)testParametersWithParameters_withString_remainsUnchanged {
@@ -375,13 +350,8 @@ - (void)testParametersWithParameters_withString_remainsUnchanged {
375350

376351
XCTAssertEqualObjects(stringifiedParameters[@"string_key"], @"hello",
377352
@"The original string value should be preserved.");
378-
[stringifiedParameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
379-
XCTAssertTrue([key isKindOfClass:[NSString class]],
380-
@"All keys must be NSStrings. Found a key of type '%@'.", [key class]);
381-
XCTAssertTrue([obj isKindOfClass:[NSString class]],
382-
@"All values must be NSStrings. Found a value of type '%@' for key '%@'.",
383-
[obj class], key);
384-
}];
353+
XCTAssertTrue([stringifiedParameters[@"string_key"] isKindOfClass:[NSString class]],
354+
@"The final value should be of a NSString type.");
385355
}
386356

387357
# pragma mark - Helpers

0 commit comments

Comments
 (0)