From 128c40a26c4b6813fd2ed6fe307df4f7b41a9170 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 21 Jul 2017 15:32:26 -0400 Subject: [PATCH] Respond to CR. // FREEBIE --- .../tests/Contacts/PhoneNumberTest.m | 48 +++++++------------ 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/SignalServiceKit/tests/Contacts/PhoneNumberTest.m b/SignalServiceKit/tests/Contacts/PhoneNumberTest.m index c5f9f4dc8..68ff88803 100644 --- a/SignalServiceKit/tests/Contacts/PhoneNumberTest.m +++ b/SignalServiceKit/tests/Contacts/PhoneNumberTest.m @@ -5,23 +5,6 @@ #import #import "PhoneNumber.h" -@interface NSArray (PhoneNumberTest) - -@end - -#pragma mark - - -@implementation NSArray (PhoneNumberTest) - -- (id)test_firstObject -{ - return (self.count > 0) ? self[0] : nil; -} - -@end - -#pragma mark - - @interface PhoneNumberTest : XCTestCase @end @@ -94,55 +77,56 @@ { NSArray *parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323 555 1234" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); - XCTAssertEqualObjects(parsed.test_firstObject, @"+13235551234"); + XCTAssertEqualObjects(parsed.firstObject, @"+13235551234"); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323-555-1234" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); - XCTAssertEqualObjects(parsed.test_firstObject, @"+13235551234"); + XCTAssertEqualObjects(parsed.firstObject, @"+13235551234"); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"323.555.1234" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); - XCTAssertEqualObjects(parsed.test_firstObject, @"+13235551234"); + XCTAssertEqualObjects(parsed.firstObject, @"+13235551234"); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"1-323-555-1234" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); - XCTAssertEqualObjects(parsed.test_firstObject, @"+13235551234"); + XCTAssertEqualObjects(parsed.firstObject, @"+13235551234"); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"+13235551234" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); - XCTAssertEqualObjects(parsed.test_firstObject, @"+13235551234"); + XCTAssertEqualObjects(parsed.firstObject, @"+13235551234"); } - (void)testTryParsePhoneNumbersFromsUserSpecifiedText_Mexico1 { NSArray *parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"528341639157" clientPhoneNumber:@"+528341639144"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+528341639157"]); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"8341639157" clientPhoneNumber:@"+528341639144"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+528341639157"]); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"341639157" clientPhoneNumber:@"+528341639144"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); // The parsing logic should try adding Mexico's national prefix for cell numbers "1" // after the country code. + XCTAssertTrue([parsed containsObject:@"+52341639157"]); XCTAssertTrue([parsed containsObject:@"+521341639157"]); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"528341639157" clientPhoneNumber:@"+13213214321"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+528341639157"]); parsed = [self unpackTryParsePhoneNumbersFromsUserSpecifiedText:@"13235551234" clientPhoneNumber:@"+528341639144"]; - XCTAssertLessThanOrEqual(1, parsed.count); + XCTAssertTrue(parsed.count >= 1); XCTAssertTrue([parsed containsObject:@"+13235551234"]); }