From 6fa84d3f2bbd3b792e77a6d41787ec5df17535da Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Tue, 10 Dec 2024 16:32:01 -0600 Subject: [PATCH] Make the raw phone number parsing method private --- .../Contacts/PhoneNumberUtil.swift | 4 +- .../tests/Contacts/PhoneNumberUtilTest.swift | 65 ------------------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/SignalServiceKit/Contacts/PhoneNumberUtil.swift b/SignalServiceKit/Contacts/PhoneNumberUtil.swift index cf9d1229cf..71e9c1f58f 100644 --- a/SignalServiceKit/Contacts/PhoneNumberUtil.swift +++ b/SignalServiceKit/Contacts/PhoneNumberUtil.swift @@ -4,7 +4,7 @@ // import Foundation -public import libPhoneNumber_iOS +import libPhoneNumber_iOS // MARK: - @@ -186,7 +186,7 @@ extension PhoneNumberUtil { try nbPhoneNumberUtil.format(phoneNumber, numberFormat: numberFormat) } - public func parse(_ numberToParse: String, defaultRegion: String) throws -> NBPhoneNumber { + private func parse(_ numberToParse: String, defaultRegion: String) throws -> NBPhoneNumber { let hashKey = "numberToParse:\(numberToParse), defaultRegion:\(defaultRegion)" if let cachedValue = parsedPhoneNumberCache[hashKey] { return cachedValue diff --git a/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.swift b/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.swift index a362bb3ac7..70509cf79b 100644 --- a/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.swift +++ b/SignalServiceKit/tests/Contacts/PhoneNumberUtilTest.swift @@ -52,71 +52,6 @@ class PhoneNumberUtilTestSwift: XCTestCase { XCTAssertEqual([], countryCodes(fromCallingCode: " +1")) } - func test_parse() { - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "US").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "GB").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "UY").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+441752395464", defaultRegion: "US").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+441752395464", defaultRegion: "GB").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+441752395464", defaultRegion: "UY").countryCode) - // Invalid regions. - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "UK").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+441752395464", defaultRegion: "UK").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "ZQ").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "99").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: "+").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+13334445555", defaultRegion: " ").countryCode) - // Invalid phone numbers. - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("+1333444555", defaultRegion: "UY").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+44175239546", defaultRegion: "UY").countryCode) - XCTAssertEqual(NSNumber(value: 44), try! phoneNumberUtilRef.parse("+441752395468 ", defaultRegion: "UY").countryCode) - XCTAssertEqual(NSNumber(value: 1), try! phoneNumberUtilRef.parse("++13334445555 ", defaultRegion: "UY").countryCode) - - do { - _ = try phoneNumberUtilRef.parse("+9764", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse("", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse(" ", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse("a", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse("+", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse("9876543210987654321098765432109876543210", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - do { - _ = try phoneNumberUtilRef.parse("+9876543210987654321098765432109876543210", defaultRegion: "US") - XCTFail("Missing expected error.") - } catch { - // Error is expected. - } - } - func test_examplePhoneNumberForCountryCode() { XCTAssertEqual("+12015550123", phoneNumberUtilRef.examplePhoneNumber(forCountryCode: "US")) XCTAssertEqual("+447400123456", phoneNumberUtilRef.examplePhoneNumber(forCountryCode: "GB"))