From 1e8b69f4b2098e73df5899ee4d70f769893daa08 Mon Sep 17 00:00:00 2001 From: Aravind Date: Mon, 18 May 2020 13:03:18 +0000 Subject: [PATCH] Update function parameters that are LL- or ULL-suffixed integers to explicitly specify int64{value} --- .../phonenumber_offline_geocoder_test.cc | 10 +- cpp/test/phonenumbers/phonenumberutil_test.cc | 542 +++++++++--------- cpp/test/phonenumbers/shortnumberinfo_test.cc | 35 +- 3 files changed, 293 insertions(+), 294 deletions(-) diff --git a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc index f74f8294d..52f6af3c5 100644 --- a/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc +++ b/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc @@ -51,13 +51,13 @@ class PhoneNumberOfflineGeocoderTest : public testing::Test { PhoneNumberOfflineGeocoderTest() : KO_NUMBER1(MakeNumber(82, 22123456UL)), KO_NUMBER2(MakeNumber(82, 322123456UL)), - KO_NUMBER3(MakeNumber(82, 6421234567ULL)), + KO_NUMBER3(MakeNumber(82, uint64{6421234567})), KO_INVALID_NUMBER(MakeNumber(82, 1234UL)), - KO_MOBILE(MakeNumber(82, 101234567ULL)), - US_NUMBER1(MakeNumber(1, 6502530000ULL)), - US_NUMBER2(MakeNumber(1, 6509600000ULL)), + KO_MOBILE(MakeNumber(82, uint64{101234567})), + US_NUMBER1(MakeNumber(1, uint64{6502530000})), + US_NUMBER2(MakeNumber(1, uint64{6509600000})), US_NUMBER3(MakeNumber(1, 2128120000UL)), - US_NUMBER4(MakeNumber(1, 6174240000ULL)), + US_NUMBER4(MakeNumber(1, uint64{6174240000})), US_INVALID_NUMBER(MakeNumber(1, 123456789UL)), BS_NUMBER1(MakeNumber(1, 2423651234UL)), AU_NUMBER(MakeNumber(61, 236618300UL)), diff --git a/cpp/test/phonenumbers/phonenumberutil_test.cc b/cpp/test/phonenumbers/phonenumberutil_test.cc index 7cacb2a81..ad7e7c26b 100644 --- a/cpp/test/phonenumbers/phonenumberutil_test.cc +++ b/cpp/test/phonenumbers/phonenumberutil_test.cc @@ -317,7 +317,7 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadInternationalTollFreeMetadata) { TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(6502530000ULL); + number.set_national_number(uint64{6502530000}); string national_significant_number; phone_util_.GetNationalSignificantNumber(number, &national_significant_number); @@ -326,7 +326,7 @@ TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber) { // An Italian mobile number. national_significant_number.clear(); number.set_country_code(39); - number.set_national_number(312345678ULL); + number.set_national_number(uint64{312345678}); phone_util_.GetNationalSignificantNumber(number, &national_significant_number); EXPECT_EQ("312345678", national_significant_number); @@ -334,7 +334,7 @@ TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber) { // An Italian fixed line number. national_significant_number.clear(); number.set_country_code(39); - number.set_national_number(236618300ULL); + number.set_national_number(uint64{236618300}); number.set_italian_leading_zero(true); phone_util_.GetNationalSignificantNumber(number, &national_significant_number); @@ -343,7 +343,7 @@ TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber) { national_significant_number.clear(); number.Clear(); number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); phone_util_.GetNationalSignificantNumber(number, &national_significant_number); EXPECT_EQ("12345678", national_significant_number); @@ -352,7 +352,7 @@ TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber) { TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber_ManyLeadingZeros) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(650ULL); + number.set_national_number(uint64{650}); number.set_italian_leading_zero(true); number.set_number_of_leading_zeros(2); string national_significant_number; @@ -372,7 +372,7 @@ TEST_F(PhoneNumberUtilTest, GetNationalSignificantNumber_ManyLeadingZeros) { TEST_F(PhoneNumberUtilTest, GetExampleNumber) { PhoneNumber de_number; de_number.set_country_code(49); - de_number.set_national_number(30123456ULL); + de_number.set_national_number(uint64{30123456}); PhoneNumber test_number; bool success = phone_util_.GetExampleNumber(RegionCode::DE(), &test_number); EXPECT_TRUE(success); @@ -442,7 +442,7 @@ TEST_F(PhoneNumberUtilTest, GetInvalidExampleNumber) { TEST_F(PhoneNumberUtilTest, GetExampleNumberForNonGeoEntity) { PhoneNumber toll_free_number; toll_free_number.set_country_code(800); - toll_free_number.set_national_number(12345678ULL); + toll_free_number.set_national_number(uint64{12345678}); PhoneNumber test_number; bool success = phone_util_.GetExampleNumberForNonGeoEntity(800 , &test_number); @@ -451,7 +451,7 @@ TEST_F(PhoneNumberUtilTest, GetExampleNumberForNonGeoEntity) { PhoneNumber universal_premium_rate; universal_premium_rate.set_country_code(979); - universal_premium_rate.set_national_number(123456789ULL); + universal_premium_rate.set_national_number(uint64{123456789}); success = phone_util_.GetExampleNumberForNonGeoEntity(979 , &test_number); EXPECT_TRUE(success); EXPECT_EQ(universal_premium_rate, test_number); @@ -485,21 +485,21 @@ TEST_F(PhoneNumberUtilTest, FormatUSNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("650 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+1 650 253 0000", formatted_number); - test_number.set_national_number(8002530000ULL); + test_number.set_national_number(uint64{8002530000}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("800 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+1 800 253 0000", formatted_number); - test_number.set_national_number(9002530000ULL); + test_number.set_national_number(uint64{9002530000}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("900 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -507,7 +507,7 @@ TEST_F(PhoneNumberUtilTest, FormatUSNumber) { EXPECT_EQ("+1 900 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::RFC3966, &formatted_number); EXPECT_EQ("tel:+1-900-253-0000", formatted_number); - test_number.set_national_number(0ULL); + test_number.set_national_number(uint64{0}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("0", formatted_number); // Numbers with all zeros in the national number part will be formatted by @@ -522,21 +522,21 @@ TEST_F(PhoneNumberUtilTest, FormatBSNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(2421234567ULL); + test_number.set_national_number(uint64{2421234567}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("242 123 4567", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+1 242 123 4567", formatted_number); - test_number.set_national_number(8002530000ULL); + test_number.set_national_number(uint64{8002530000}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("800 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+1 800 253 0000", formatted_number); - test_number.set_national_number(9002530000ULL); + test_number.set_national_number(uint64{9002530000}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("900 253 0000", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -548,14 +548,14 @@ TEST_F(PhoneNumberUtilTest, FormatGBNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(44); - test_number.set_national_number(2087389353ULL); + test_number.set_national_number(uint64{2087389353}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("(020) 8738 9353", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+44 20 8738 9353", formatted_number); - test_number.set_national_number(7912345678ULL); + test_number.set_national_number(uint64{7912345678}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("(07912) 345 678", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -567,7 +567,7 @@ TEST_F(PhoneNumberUtilTest, FormatDENumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(49); - test_number.set_national_number(301234ULL); + test_number.set_national_number(uint64{301234}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("030/1234", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -576,35 +576,35 @@ TEST_F(PhoneNumberUtilTest, FormatDENumber) { phone_util_.Format(test_number, PhoneNumberUtil::RFC3966, &formatted_number); EXPECT_EQ("tel:+49-30-1234", formatted_number); - test_number.set_national_number(291123ULL); + test_number.set_national_number(uint64{291123}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("0291 123", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+49 291 123", formatted_number); - test_number.set_national_number(29112345678ULL); + test_number.set_national_number(uint64{29112345678}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("0291 12345678", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+49 291 12345678", formatted_number); - test_number.set_national_number(9123123ULL); + test_number.set_national_number(uint64{9123123}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("09123 123", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+49 9123 123", formatted_number); - test_number.set_national_number(80212345ULL); + test_number.set_national_number(uint64{80212345}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("08021 2345", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+49 8021 2345", formatted_number); - test_number.set_national_number(1234ULL); + test_number.set_national_number(uint64{1234}); // Note this number is correctly formatted without national prefix. Most of // the numbers that are treated as invalid numbers by the library are short // numbers, and they are usually not dialed with national prefix. @@ -619,7 +619,7 @@ TEST_F(PhoneNumberUtilTest, FormatITNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(39); - test_number.set_national_number(236618300ULL); + test_number.set_national_number(uint64{236618300}); test_number.set_italian_leading_zero(true); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("02 3661 8300", formatted_number); @@ -630,7 +630,7 @@ TEST_F(PhoneNumberUtilTest, FormatITNumber) { &formatted_number); EXPECT_EQ("+390236618300", formatted_number); - test_number.set_national_number(345678901ULL); + test_number.set_national_number(uint64{345678901}); test_number.set_italian_leading_zero(false); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("345 678 901", formatted_number); @@ -646,7 +646,7 @@ TEST_F(PhoneNumberUtilTest, FormatAUNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(61); - test_number.set_national_number(236618300ULL); + test_number.set_national_number(uint64{236618300}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("02 3661 8300", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -656,7 +656,7 @@ TEST_F(PhoneNumberUtilTest, FormatAUNumber) { &formatted_number); EXPECT_EQ("+61236618300", formatted_number); - test_number.set_national_number(1800123456ULL); + test_number.set_national_number(uint64{1800123456}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("1800 123 456", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -671,7 +671,7 @@ TEST_F(PhoneNumberUtilTest, FormatARNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(54); - test_number.set_national_number(1187654321ULL); + test_number.set_national_number(uint64{1187654321}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("011 8765-4321", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -681,7 +681,7 @@ TEST_F(PhoneNumberUtilTest, FormatARNumber) { &formatted_number); EXPECT_EQ("+541187654321", formatted_number); - test_number.set_national_number(91187654321ULL); + test_number.set_national_number(uint64{91187654321}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("011 15 8765-4321", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -696,7 +696,7 @@ TEST_F(PhoneNumberUtilTest, FormatMXNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(52); - test_number.set_national_number(12345678900ULL); + test_number.set_national_number(uint64{12345678900}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("045 234 567 8900", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -706,7 +706,7 @@ TEST_F(PhoneNumberUtilTest, FormatMXNumber) { &formatted_number); EXPECT_EQ("+5212345678900", formatted_number); - test_number.set_national_number(15512345678ULL); + test_number.set_national_number(uint64{15512345678}); phone_util_.Format(test_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("045 55 1234 5678", formatted_number); phone_util_.Format(test_number, PhoneNumberUtil::INTERNATIONAL, @@ -741,12 +741,12 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryCallingNumber) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(9002530000ULL); + test_number.set_national_number(uint64{9002530000}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::DE(), &formatted_number); EXPECT_EQ("00 1 900 253 0000", formatted_number); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::BS(), &formatted_number); EXPECT_EQ("1 650 253 0000", formatted_number); @@ -755,13 +755,13 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryCallingNumber) { EXPECT_EQ("00 1 650 253 0000", formatted_number); test_number.set_country_code(44); - test_number.set_national_number(7912345678ULL); + test_number.set_national_number(uint64{7912345678}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::US(), &formatted_number); EXPECT_EQ("011 44 7912 345 678", formatted_number); test_number.set_country_code(49); - test_number.set_national_number(1234ULL); + test_number.set_national_number(uint64{1234}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::GB(), &formatted_number); EXPECT_EQ("00 49 1234", formatted_number); @@ -773,7 +773,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryCallingNumber) { EXPECT_EQ("1234", formatted_number); test_number.set_country_code(39); - test_number.set_national_number(236618300ULL); + test_number.set_national_number(uint64{236618300}); test_number.set_italian_leading_zero(true); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::US(), &formatted_number); @@ -786,20 +786,20 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryCallingNumber) { EXPECT_EQ("+39 02 3661 8300", formatted_number); test_number.set_country_code(65); - test_number.set_national_number(94777892ULL); + test_number.set_national_number(uint64{94777892}); test_number.set_italian_leading_zero(false); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::SG(), &formatted_number); EXPECT_EQ("9477 7892", formatted_number); test_number.set_country_code(800); - test_number.set_national_number(12345678ULL); + test_number.set_national_number(uint64{12345678}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::US(), &formatted_number); EXPECT_EQ("011 800 1234 5678", formatted_number); test_number.set_country_code(54); - test_number.set_national_number(91187654321ULL); + test_number.set_national_number(uint64{91187654321}); phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::US(), &formatted_number); EXPECT_EQ("011 54 9 11 8765 4321", formatted_number); @@ -820,7 +820,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryWithInvalidRegion) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); // AQ/Antarctica isn't a valid region code for phone number formatting, // so this falls back to intl formatting. phone_util_.FormatOutOfCountryCallingNumber(test_number, RegionCode::AQ(), @@ -837,7 +837,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryWithPreferredIntlPrefix) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(39); - test_number.set_national_number(236618300ULL); + test_number.set_national_number(uint64{236618300}); test_number.set_italian_leading_zero(true); // This should use 0011, since that is the preferred international prefix // (both 0011 and 0012 are accepted as possible international prefixes in our @@ -851,7 +851,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { PhoneNumber alpha_numeric_number; string formatted_number; alpha_numeric_number.set_country_code(1); - alpha_numeric_number.set_national_number(8007493524ULL); + alpha_numeric_number.set_national_number(uint64{8007493524}); alpha_numeric_number.set_raw_input("1800 six-flag"); phone_util_.FormatOutOfCountryKeepingAlphaChars(alpha_numeric_number, RegionCode::AU(), @@ -902,7 +902,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { // Testing AU alpha number formatted from Australia. alpha_numeric_number.set_country_code(61); - alpha_numeric_number.set_national_number(827493524ULL); + alpha_numeric_number.set_national_number(uint64{827493524}); alpha_numeric_number.set_raw_input("+61 82749-FLAG"); formatted_number.clear(); phone_util_.FormatOutOfCountryKeepingAlphaChars(alpha_numeric_number, @@ -918,7 +918,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { &formatted_number); EXPECT_EQ("082749-FLAG", formatted_number); - alpha_numeric_number.set_national_number(18007493524ULL); + alpha_numeric_number.set_national_number(uint64{18007493524}); alpha_numeric_number.set_raw_input("1-800-SIX-flag"); formatted_number.clear(); phone_util_.FormatOutOfCountryKeepingAlphaChars(alpha_numeric_number, @@ -930,7 +930,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { // The metadata should not be permanently changed, since we copied it before // modifying patterns. Here we check this. formatted_number.clear(); - alpha_numeric_number.set_national_number(1800749352ULL); + alpha_numeric_number.set_national_number(uint64{1800749352}); phone_util_.FormatOutOfCountryCallingNumber(alpha_numeric_number, RegionCode::AU(), &formatted_number); @@ -951,7 +951,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { // Testing the case with an invalid country code. formatted_number.clear(); alpha_numeric_number.set_country_code(0); - alpha_numeric_number.set_national_number(18007493524ULL); + alpha_numeric_number.set_national_number(uint64{18007493524}); alpha_numeric_number.set_raw_input("1-800-SIX-flag"); phone_util_.FormatOutOfCountryKeepingAlphaChars(alpha_numeric_number, RegionCode::DE(), @@ -962,7 +962,7 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) { // Testing the case of an invalid alpha number. formatted_number.clear(); alpha_numeric_number.set_country_code(1); - alpha_numeric_number.set_national_number(80749ULL); + alpha_numeric_number.set_national_number(uint64{80749}); alpha_numeric_number.set_raw_input("180-SIX"); phone_util_.FormatOutOfCountryKeepingAlphaChars(alpha_numeric_number, RegionCode::DE(), @@ -982,7 +982,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithCarrierCode) { PhoneNumber ar_number; string formatted_number; ar_number.set_country_code(54); - ar_number.set_national_number(91234125678ULL); + ar_number.set_national_number(uint64{91234125678}); phone_util_.Format(ar_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("01234 12-5678", formatted_number); // Test formatting with a carrier code. @@ -999,7 +999,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithCarrierCode) { // We don't support this for the US so there should be no change. PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(4241231234ULL); + us_number.set_national_number(uint64{4241231234}); phone_util_.Format(us_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("424 123 1234", formatted_number); phone_util_.FormatNationalNumberWithCarrierCode(us_number, "15", @@ -1009,7 +1009,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithCarrierCode) { // Invalid country code should just get the NSN. PhoneNumber invalid_number; invalid_number.set_country_code(kInvalidCountryCode); - invalid_number.set_national_number(12345ULL); + invalid_number.set_national_number(uint64{12345}); phone_util_.FormatNationalNumberWithCarrierCode(invalid_number, "89", &formatted_number); EXPECT_EQ("12345", formatted_number); @@ -1020,7 +1020,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithPreferredCarrierCode) { PhoneNumber ar_number; string formatted_number; ar_number.set_country_code(54); - ar_number.set_national_number(91234125678ULL); + ar_number.set_national_number(uint64{91234125678}); // Test formatting with no preferred carrier code stored in the number itself. phone_util_.FormatNationalNumberWithPreferredCarrierCode(ar_number, "15", &formatted_number); @@ -1053,7 +1053,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithPreferredCarrierCode) { // We don't support this for the US so there should be no change. PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(4241231234ULL); + us_number.set_national_number(uint64{4241231234}); us_number.set_preferred_domestic_carrier_code("99"); phone_util_.Format(us_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("424 123 1234", formatted_number); @@ -1069,7 +1069,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // Numbers are normally dialed in national format in-country, and // international format from outside the country. test_number.set_country_code(49); - test_number.set_national_number(30123456ULL); + test_number.set_national_number(uint64{30123456}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::DE(), false, /* remove formatting */ &formatted_number); @@ -1094,7 +1094,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // US toll free numbers are marked as noInternationalDialling in the test // metadata for testing purposes. For such numbers, we expect nothing to be // returned when the region code is not the same one. - test_number.set_national_number(8002530000ULL); + test_number.set_national_number(uint64{8002530000}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), true, /* keep formatting */ &formatted_number); @@ -1110,7 +1110,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { test_number, RegionCode::CN(), false, &formatted_number); EXPECT_EQ("", formatted_number); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), true, &formatted_number); EXPECT_EQ("+1 650 253 0000", formatted_number); @@ -1127,7 +1127,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { EXPECT_EQ("+16502530000", formatted_number); // An invalid US number, which is one digit too long. - test_number.set_national_number(65025300001ULL); + test_number.set_national_number(uint64{65025300001}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), true, &formatted_number); EXPECT_EQ("+1 65025300001", formatted_number); @@ -1138,7 +1138,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // Star numbers. In real life they appear in Israel, but we have them in JP // in our test metadata. test_number.set_country_code(81); - test_number.set_national_number(2345ULL); + test_number.set_national_number(uint64{2345}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::JP(), true, &formatted_number); EXPECT_EQ("*2345", formatted_number); @@ -1147,7 +1147,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { EXPECT_EQ("*2345", formatted_number); test_number.set_country_code(800); - test_number.set_national_number(12345678ULL); + test_number.set_national_number(uint64{12345678}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::JP(), false, &formatted_number); EXPECT_EQ("+80012345678", formatted_number); @@ -1158,7 +1158,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // UAE numbers beginning with 600 (classified as UAN) need to be dialled // without +971 locally. test_number.set_country_code(971); - test_number.set_national_number(600123456ULL); + test_number.set_national_number(uint64{600123456}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::JP(), false, &formatted_number); EXPECT_EQ("+971600123456", formatted_number); @@ -1167,7 +1167,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { EXPECT_EQ("600123456", formatted_number); test_number.set_country_code(52); - test_number.set_national_number(3312345678ULL); + test_number.set_national_number(uint64{3312345678}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::MX(), false, &formatted_number); EXPECT_EQ("+523312345678", formatted_number); @@ -1179,13 +1179,13 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // when dialled from same region or other regions. // Fixed-line number test_number.set_country_code(998); - test_number.set_national_number(612201234ULL); + test_number.set_national_number(uint64{612201234}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::UZ(), false, &formatted_number); EXPECT_EQ("+998612201234", formatted_number); // Mobile number test_number.set_country_code(998); - test_number.set_national_number(950123456ULL); + test_number.set_national_number(uint64{950123456}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::UZ(), false, &formatted_number); EXPECT_EQ("+998950123456", formatted_number); @@ -1195,7 +1195,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // Non-geographical numbers should always be dialed in international format. test_number.set_country_code(800); - test_number.set_national_number(12345678ULL); + test_number.set_national_number(uint64{12345678}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), false, &formatted_number); EXPECT_EQ("+80012345678", formatted_number); @@ -1218,7 +1218,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) { // numbers are always output in international format, but short numbers are // in national format. test_number.set_country_code(1); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), false, &formatted_number); EXPECT_EQ("+16502530000", formatted_number); @@ -1255,7 +1255,7 @@ TEST_F(PhoneNumberUtilTest, FormatByPattern) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); RepeatedPtrField number_formats; NumberFormat* number_format = number_formats.Add(); @@ -1279,7 +1279,7 @@ TEST_F(PhoneNumberUtilTest, FormatByPattern) { number_format->set_national_prefix_formatting_rule("$NP ($FG)"); number_format->set_format("$1 $2-$3"); test_number.set_country_code(1); - test_number.set_national_number(4168819999ULL); + test_number.set_national_number(uint64{4168819999}); phone_util_.FormatByPattern(test_number, PhoneNumberUtil::NATIONAL, number_formats, &formatted_number); @@ -1290,7 +1290,7 @@ TEST_F(PhoneNumberUtilTest, FormatByPattern) { EXPECT_EQ("+1 416 881-9999", formatted_number); test_number.set_country_code(39); - test_number.set_national_number(236618300ULL); + test_number.set_national_number(uint64{236618300}); test_number.set_italian_leading_zero(true); number_format->set_pattern("(\\d{2})(\\d{5})(\\d{3})"); number_format->set_format("$1-$2 $3"); @@ -1304,7 +1304,7 @@ TEST_F(PhoneNumberUtilTest, FormatByPattern) { EXPECT_EQ("+39 02-36618 300", formatted_number); test_number.set_country_code(44); - test_number.set_national_number(2012345678ULL); + test_number.set_national_number(uint64{2012345678}); test_number.set_italian_leading_zero(false); number_format->set_national_prefix_formatting_rule("$NP$FG"); number_format->set_pattern("(\\d{2})(\\d{4})(\\d{4})"); @@ -1335,17 +1335,17 @@ TEST_F(PhoneNumberUtilTest, FormatE164Number) { PhoneNumber test_number; string formatted_number; test_number.set_country_code(1); - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); phone_util_.Format(test_number, PhoneNumberUtil::E164, &formatted_number); EXPECT_EQ("+16502530000", formatted_number); test_number.set_country_code(49); - test_number.set_national_number(301234ULL); + test_number.set_national_number(uint64{301234}); phone_util_.Format(test_number, PhoneNumberUtil::E164, &formatted_number); EXPECT_EQ("+49301234", formatted_number); test_number.set_country_code(800); - test_number.set_national_number(12345678ULL); + test_number.set_national_number(uint64{12345678}); phone_util_.Format(test_number, PhoneNumberUtil::E164, &formatted_number); EXPECT_EQ("+80012345678", formatted_number); } @@ -1353,7 +1353,7 @@ TEST_F(PhoneNumberUtilTest, FormatE164Number) { TEST_F(PhoneNumberUtilTest, FormatNumberWithExtension) { PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); nz_number.set_extension("1234"); string formatted_number; // Uses default extension prefix: @@ -1365,7 +1365,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberWithExtension) { // Extension prefix overridden in the territory information for the US: PhoneNumber us_number_with_extension; us_number_with_extension.set_country_code(1); - us_number_with_extension.set_national_number(6502530000ULL); + us_number_with_extension.set_national_number(uint64{6502530000}); us_number_with_extension.set_extension("4567"); phone_util_.Format(us_number_with_extension, PhoneNumberUtil::NATIONAL, &formatted_number); @@ -1376,67 +1376,67 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfGeographicalAreaCode) { PhoneNumber number; // Google MTV, which has area code "650". number.set_country_code(1); - number.set_national_number(6502530000ULL); + number.set_national_number(uint64{6502530000}); EXPECT_EQ(3, phone_util_.GetLengthOfGeographicalAreaCode(number)); // A North America toll-free number, which has no area code. number.set_country_code(1); - number.set_national_number(8002530000ULL); + number.set_national_number(uint64{8002530000}); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number)); // An invalid US number (1 digit shorter), which has no area code. number.set_country_code(1); - number.set_national_number(650253000ULL); + number.set_national_number(uint64{650253000}); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number)); // Google London, which has area code "20". number.set_country_code(44); - number.set_national_number(2070313000ULL); + number.set_national_number(uint64{2070313000}); EXPECT_EQ(2, phone_util_.GetLengthOfGeographicalAreaCode(number)); // A mobile number in the UK does not have an area code (by default, mobile // numbers do not, unless they have been added to our list of exceptions). number.set_country_code(44); - number.set_national_number(7912345678ULL); + number.set_national_number(uint64{7912345678}); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number)); // Google Buenos Aires, which has area code "11". number.set_country_code(54); - number.set_national_number(1155303000ULL); + number.set_national_number(uint64{1155303000}); EXPECT_EQ(2, phone_util_.GetLengthOfGeographicalAreaCode(number)); // A mobile number in Argentina also has an area code. number.set_country_code(54); - number.set_national_number(91187654321ULL); + number.set_national_number(uint64{91187654321}); EXPECT_EQ(3, phone_util_.GetLengthOfGeographicalAreaCode(number)); // Google Sydney, which has area code "2". number.set_country_code(61); - number.set_national_number(293744000ULL); + number.set_national_number(uint64{293744000}); EXPECT_EQ(1, phone_util_.GetLengthOfGeographicalAreaCode(number)); // Italian numbers - there is no national prefix, but it still has an area // code. number.set_country_code(39); - number.set_national_number(236618300ULL); + number.set_national_number(uint64{236618300}); number.set_italian_leading_zero(true); EXPECT_EQ(2, phone_util_.GetLengthOfGeographicalAreaCode(number)); // Google Singapore. Singapore has no area code and no national prefix. number.set_country_code(65); - number.set_national_number(65218000ULL); + number.set_national_number(uint64{65218000}); number.set_italian_leading_zero(false); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number)); // An international toll free number, which has no area code. number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number)); // A mobile number from China is geographical, but does not have an area code. PhoneNumber cn_mobile; cn_mobile.set_country_code(86); - cn_mobile.set_national_number(18912341234ULL); + cn_mobile.set_national_number(uint64{18912341234}); EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(cn_mobile)); } @@ -1444,77 +1444,77 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfNationalDestinationCode) { PhoneNumber number; // Google MTV, which has national destination code (NDC) "650". number.set_country_code(1); - number.set_national_number(6502530000ULL); + number.set_national_number(uint64{6502530000}); EXPECT_EQ(3, phone_util_.GetLengthOfNationalDestinationCode(number)); // A North America toll-free number, which has NDC "800". number.set_country_code(1); - number.set_national_number(8002530000ULL); + number.set_national_number(uint64{8002530000}); EXPECT_EQ(3, phone_util_.GetLengthOfNationalDestinationCode(number)); // Google London, which has NDC "20". number.set_country_code(44); - number.set_national_number(2070313000ULL); + number.set_national_number(uint64{2070313000}); EXPECT_EQ(2, phone_util_.GetLengthOfNationalDestinationCode(number)); // A UK mobile phone, which has NDC "7912" number.set_country_code(44); - number.set_national_number(7912345678ULL); + number.set_national_number(uint64{7912345678}); EXPECT_EQ(4, phone_util_.GetLengthOfNationalDestinationCode(number)); // Google Buenos Aires, which has NDC "11". number.set_country_code(54); - number.set_national_number(1155303000ULL); + number.set_national_number(uint64{1155303000}); EXPECT_EQ(2, phone_util_.GetLengthOfNationalDestinationCode(number)); // An Argentinian mobile which has NDC "911". number.set_country_code(54); - number.set_national_number(91187654321ULL); + number.set_national_number(uint64{91187654321}); EXPECT_EQ(3, phone_util_.GetLengthOfNationalDestinationCode(number)); // Google Sydney, which has NDC "2". number.set_country_code(61); - number.set_national_number(293744000ULL); + number.set_national_number(uint64{293744000}); EXPECT_EQ(1, phone_util_.GetLengthOfNationalDestinationCode(number)); // Google Singapore. Singapore has NDC "6521". number.set_country_code(65); - number.set_national_number(65218000ULL); + number.set_national_number(uint64{65218000}); EXPECT_EQ(4, phone_util_.GetLengthOfNationalDestinationCode(number)); // An invalid US number (1 digit shorter), which has no NDC. number.set_country_code(1); - number.set_national_number(650253000ULL); + number.set_national_number(uint64{650253000}); EXPECT_EQ(0, phone_util_.GetLengthOfNationalDestinationCode(number)); // A number containing an invalid country code, which shouldn't have any NDC. number.set_country_code(123); - number.set_national_number(650253000ULL); + number.set_national_number(uint64{650253000}); EXPECT_EQ(0, phone_util_.GetLengthOfNationalDestinationCode(number)); // A number that has only one group of digits after country code when // formatted in the international format. number.set_country_code(376); - number.set_national_number(12345ULL); + number.set_national_number(uint64{12345}); EXPECT_EQ(0, phone_util_.GetLengthOfNationalDestinationCode(number)); // The same number above, but with an extension. number.set_country_code(376); - number.set_national_number(12345ULL); + number.set_national_number(uint64{12345}); number.set_extension("321"); EXPECT_EQ(0, phone_util_.GetLengthOfNationalDestinationCode(number)); // An international toll free number, which has NDC "1234". number.Clear(); number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(4, phone_util_.GetLengthOfNationalDestinationCode(number)); // A mobile number from China is geographical, but does not have an area code: // however it still can be considered to have a national destination code. PhoneNumber cn_mobile; cn_mobile.set_country_code(86); - cn_mobile.set_national_number(18912341234ULL); + cn_mobile.set_national_number(uint64{18912341234}); EXPECT_EQ(3, phone_util_.GetLengthOfNationalDestinationCode(cn_mobile)); } @@ -1583,33 +1583,33 @@ TEST_F(PhoneNumberUtilTest, IsNANPACountry) { TEST_F(PhoneNumberUtilTest, IsValidNumber) { PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(6502530000ULL); + us_number.set_national_number(uint64{6502530000}); EXPECT_TRUE(phone_util_.IsValidNumber(us_number)); PhoneNumber it_number; it_number.set_country_code(39); - it_number.set_national_number(236618300ULL); + it_number.set_national_number(uint64{236618300}); it_number.set_italian_leading_zero(true); EXPECT_TRUE(phone_util_.IsValidNumber(it_number)); PhoneNumber gb_number; gb_number.set_country_code(44); - gb_number.set_national_number(7912345678ULL); + gb_number.set_national_number(uint64{7912345678}); EXPECT_TRUE(phone_util_.IsValidNumber(gb_number)); PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(21387835ULL); + nz_number.set_national_number(uint64{21387835}); EXPECT_TRUE(phone_util_.IsValidNumber(nz_number)); PhoneNumber intl_toll_free_number; intl_toll_free_number.set_country_code(800); - intl_toll_free_number.set_national_number(12345678ULL); + intl_toll_free_number.set_national_number(uint64{12345678}); EXPECT_TRUE(phone_util_.IsValidNumber(intl_toll_free_number)); PhoneNumber universal_premium_rate; universal_premium_rate.set_country_code(979); - universal_premium_rate.set_national_number(123456789ULL); + universal_premium_rate.set_national_number(uint64{123456789}); EXPECT_TRUE(phone_util_.IsValidNumber(universal_premium_rate)); } @@ -1617,27 +1617,27 @@ TEST_F(PhoneNumberUtilTest, IsValidForRegion) { // This number is valid for the Bahamas, but is not a valid US number. PhoneNumber bs_number; bs_number.set_country_code(1); - bs_number.set_national_number(2423232345ULL); + bs_number.set_national_number(uint64{2423232345}); EXPECT_TRUE(phone_util_.IsValidNumber(bs_number)); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(bs_number, RegionCode::BS())); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(bs_number, RegionCode::US())); - bs_number.set_national_number(2421232345ULL); + bs_number.set_national_number(uint64{2421232345}); // This number is no longer valid. EXPECT_FALSE(phone_util_.IsValidNumber(bs_number)); // La Mayotte and Réunion use 'leadingDigits' to differentiate them. PhoneNumber re_number; re_number.set_country_code(262); - re_number.set_national_number(262123456ULL); + re_number.set_national_number(uint64{262123456}); EXPECT_TRUE(phone_util_.IsValidNumber(re_number)); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::RE())); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::YT())); // Now change the number to be a number for La Mayotte. - re_number.set_national_number(269601234ULL); + re_number.set_national_number(uint64{269601234}); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::YT())); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::RE())); // This number is no longer valid. - re_number.set_national_number(269123456ULL); + re_number.set_national_number(uint64{269123456}); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::YT())); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::RE())); EXPECT_FALSE(phone_util_.IsValidNumber(re_number)); @@ -1646,13 +1646,13 @@ TEST_F(PhoneNumberUtilTest, IsValidForRegion) { phone_util_.GetRegionCodeForNumber(re_number, ®ion_code); EXPECT_EQ(RegionCode::YT(), region_code); // This number is valid in both places. - re_number.set_national_number(800123456ULL); + re_number.set_national_number(uint64{800123456}); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::YT())); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(re_number, RegionCode::RE())); PhoneNumber intl_toll_free_number; intl_toll_free_number.set_country_code(800); - intl_toll_free_number.set_national_number(12345678ULL); + intl_toll_free_number.set_national_number(uint64{12345678}); EXPECT_TRUE(phone_util_.IsValidNumberForRegion(intl_toll_free_number, RegionCode::UN001())); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(intl_toll_free_number, @@ -1663,15 +1663,15 @@ TEST_F(PhoneNumberUtilTest, IsValidForRegion) { PhoneNumber invalid_number; // Invalid country calling codes. invalid_number.set_country_code(3923); - invalid_number.set_national_number(2366ULL); + invalid_number.set_national_number(uint64{2366}); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(invalid_number, RegionCode::ZZ())); invalid_number.set_country_code(3923); - invalid_number.set_national_number(2366ULL); + invalid_number.set_national_number(uint64{2366}); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(invalid_number, RegionCode::UN001())); invalid_number.set_country_code(0); - invalid_number.set_national_number(2366ULL); + invalid_number.set_national_number(uint64{2366}); EXPECT_FALSE(phone_util_.IsValidNumberForRegion(invalid_number, RegionCode::UN001())); invalid_number.set_country_code(0); @@ -1682,41 +1682,41 @@ TEST_F(PhoneNumberUtilTest, IsValidForRegion) { TEST_F(PhoneNumberUtilTest, IsNotValidNumber) { PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(2530000ULL); + us_number.set_national_number(uint64{2530000}); EXPECT_FALSE(phone_util_.IsValidNumber(us_number)); PhoneNumber it_number; it_number.set_country_code(39); - it_number.set_national_number(23661830000ULL); + it_number.set_national_number(uint64{23661830000}); it_number.set_italian_leading_zero(true); EXPECT_FALSE(phone_util_.IsValidNumber(it_number)); PhoneNumber gb_number; gb_number.set_country_code(44); - gb_number.set_national_number(791234567ULL); + gb_number.set_national_number(uint64{791234567}); EXPECT_FALSE(phone_util_.IsValidNumber(gb_number)); PhoneNumber de_number; de_number.set_country_code(49); - de_number.set_national_number(1234ULL); + de_number.set_national_number(uint64{1234}); EXPECT_FALSE(phone_util_.IsValidNumber(de_number)); PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(3316005ULL); + nz_number.set_national_number(uint64{3316005}); EXPECT_FALSE(phone_util_.IsValidNumber(nz_number)); PhoneNumber invalid_number; // Invalid country calling codes. invalid_number.set_country_code(3923); - invalid_number.set_national_number(2366ULL); + invalid_number.set_national_number(uint64{2366}); EXPECT_FALSE(phone_util_.IsValidNumber(invalid_number)); invalid_number.set_country_code(0); EXPECT_FALSE(phone_util_.IsValidNumber(invalid_number)); PhoneNumber intl_toll_free_number_too_long; intl_toll_free_number_too_long.set_country_code(800); - intl_toll_free_number_too_long.set_national_number(123456789ULL); + intl_toll_free_number_too_long.set_national_number(uint64{123456789}); EXPECT_FALSE(phone_util_.IsValidNumber(intl_toll_free_number_too_long)); } @@ -1738,31 +1738,31 @@ TEST_F(PhoneNumberUtilTest, GetRegionCodeForNumber) { string region_code; PhoneNumber bs_number; bs_number.set_country_code(1); - bs_number.set_national_number(2423232345ULL); + bs_number.set_national_number(uint64{2423232345}); phone_util_.GetRegionCodeForNumber(bs_number, ®ion_code); EXPECT_EQ(RegionCode::BS(), region_code); PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(4241231234ULL); + us_number.set_national_number(uint64{4241231234}); phone_util_.GetRegionCodeForNumber(us_number, ®ion_code); EXPECT_EQ(RegionCode::US(), region_code); PhoneNumber gb_mobile; gb_mobile.set_country_code(44); - gb_mobile.set_national_number(7912345678ULL); + gb_mobile.set_national_number(uint64{7912345678}); phone_util_.GetRegionCodeForNumber(gb_mobile, ®ion_code); EXPECT_EQ(RegionCode::GB(), region_code); PhoneNumber intl_toll_free_number; intl_toll_free_number.set_country_code(800); - intl_toll_free_number.set_national_number(12345678ULL); + intl_toll_free_number.set_national_number(uint64{12345678}); phone_util_.GetRegionCodeForNumber(intl_toll_free_number, ®ion_code); EXPECT_EQ(RegionCode::UN001(), region_code); PhoneNumber universal_premium_rate; universal_premium_rate.set_country_code(979); - universal_premium_rate.set_national_number(123456789ULL); + universal_premium_rate.set_national_number(uint64{123456789}); phone_util_.GetRegionCodeForNumber(universal_premium_rate, ®ion_code); EXPECT_EQ(RegionCode::UN001(), region_code); } @@ -1770,19 +1770,19 @@ TEST_F(PhoneNumberUtilTest, GetRegionCodeForNumber) { TEST_F(PhoneNumberUtilTest, IsPossibleNumber) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(6502530000ULL); + number.set_national_number(uint64{6502530000}); EXPECT_TRUE(phone_util_.IsPossibleNumber(number)); number.set_country_code(1); - number.set_national_number(2530000ULL); + number.set_national_number(uint64{2530000}); EXPECT_TRUE(phone_util_.IsPossibleNumber(number)); number.set_country_code(44); - number.set_national_number(2070313000ULL); + number.set_national_number(uint64{2070313000}); EXPECT_TRUE(phone_util_.IsPossibleNumber(number)); number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_TRUE(phone_util_.IsPossibleNumber(number)); EXPECT_TRUE(phone_util_.IsPossibleNumberForString("+1 650 253 0000", @@ -1812,7 +1812,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DifferentTypeLengths) { // different types. PhoneNumber number; number.set_country_code(54); - number.set_national_number(12345ULL); + number.set_national_number(uint64{12345}); // Too short for any Argentinian number, including fixed-line. EXPECT_FALSE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::FIXED_LINE)); @@ -1820,7 +1820,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DifferentTypeLengths) { phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); // 6-digit numbers are okay for fixed-line. - number.set_national_number(123456ULL); + number.set_national_number(uint64{123456}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( @@ -1833,7 +1833,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DifferentTypeLengths) { phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::TOLL_FREE)); // The same applies to 9-digit numbers. - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( @@ -1844,7 +1844,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DifferentTypeLengths) { phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::TOLL_FREE)); // 10-digit numbers are universally possible. - number.set_national_number(1234567890ULL); + number.set_national_number(uint64{1234567890}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( @@ -1857,7 +1857,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DifferentTypeLengths) { // 11-digit numbers are only possible for mobile numbers. Note we don't // require the leading 9, which all mobile numbers start with, and would be // required for a valid mobile number. - number.set_national_number(12345678901ULL); + number.set_national_number(uint64{12345678901}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_FALSE( @@ -1872,7 +1872,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_LocalOnly) { PhoneNumber number; // Here we test a number length which matches a local-only length. number.set_country_code(49); - number.set_national_number(12ULL); + number.set_national_number(uint64{12}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( @@ -1890,12 +1890,12 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForType_DataMissingForSizeReasons) { // for size reasons - this should still work. // Local-only number. number.set_country_code(55); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::FIXED_LINE)); - number.set_national_number(1234567890ULL); + number.set_national_number(uint64{1234567890}); EXPECT_TRUE( phone_util_.IsPossibleNumberForType(number, PhoneNumberUtil::UNKNOWN)); EXPECT_TRUE( @@ -1935,47 +1935,47 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberWithReason) { // are possible. PhoneNumber number; number.set_country_code(1); - number.set_national_number(6502530000ULL); + number.set_national_number(uint64{6502530000}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(1); - number.set_national_number(2530000ULL); + number.set_national_number(uint64{2530000}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE_LOCAL_ONLY, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(0); - number.set_national_number(2530000ULL); + number.set_national_number(uint64{2530000}); EXPECT_EQ(PhoneNumberUtil::INVALID_COUNTRY_CODE, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(1); - number.set_national_number(253000ULL); + number.set_national_number(uint64{253000}); EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(1); - number.set_national_number(65025300000ULL); + number.set_national_number(uint64{65025300000}); EXPECT_EQ(PhoneNumberUtil::TOO_LONG, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(44); - number.set_national_number(2070310000ULL); + number.set_national_number(uint64{2070310000}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(49); - number.set_national_number(30123456ULL); + number.set_national_number(uint64{30123456}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(65); - number.set_national_number(1234567890ULL); + number.set_national_number(uint64{1234567890}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberWithReason(number)); number.set_country_code(800); - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_EQ(PhoneNumberUtil::TOO_LONG, phone_util_.IsPossibleNumberWithReason(number)); } @@ -1986,7 +1986,7 @@ TEST_F(PhoneNumberUtilTest, // different types. PhoneNumber number; number.set_country_code(54); - number.set_national_number(12345ULL); + number.set_national_number(uint64{12345}); EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -1995,7 +1995,7 @@ TEST_F(PhoneNumberUtilTest, number, PhoneNumberUtil::FIXED_LINE)); // 6-digit numbers are okay for fixed-line. - number.set_national_number(123456ULL); + number.set_national_number(uint64{123456}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2011,7 +2011,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::TOLL_FREE)); // The same applies to 9-digit numbers. - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2025,7 +2025,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::TOLL_FREE)); // 10-digit numbers are universally possible. - number.set_national_number(1234567890ULL); + number.set_national_number(uint64{1234567890}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2041,7 +2041,7 @@ TEST_F(PhoneNumberUtilTest, // 11-digit numbers are possible for mobile numbers. Note we don't require the // leading 9, which all mobile numbers start with, and would be required for a // valid mobile number. - number.set_national_number(12345678901ULL); + number.set_national_number(uint64{12345678901}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2060,7 +2060,7 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNumberForTypeWithReason_LocalOnly) { PhoneNumber number; // Here we test a number length which matches a local-only length. number.set_country_code(49); - number.set_national_number(12ULL); + number.set_national_number(uint64{12}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE_LOCAL_ONLY, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2082,7 +2082,7 @@ TEST_F(PhoneNumberUtilTest, // for size reasons - this should still work. // Local-only number. number.set_country_code(55); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE_LOCAL_ONLY, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2090,7 +2090,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE)); // Normal-length number. - number.set_national_number(1234567890ULL); + number.set_national_number(uint64{1234567890}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::UNKNOWN)); @@ -2105,7 +2105,7 @@ TEST_F(PhoneNumberUtilTest, // There are *no* mobile numbers for this region at all, so we return // INVALID_LENGTH. number.set_country_code(55); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::INVALID_LENGTH, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::MOBILE)); @@ -2114,7 +2114,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE_OR_MOBILE)); // This is too short for fixed-line, and no mobile numbers exist. - number.set_national_number(1234567ULL); + number.set_national_number(uint64{1234567}); EXPECT_EQ(PhoneNumberUtil::INVALID_LENGTH, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::MOBILE)); @@ -2126,7 +2126,7 @@ TEST_F(PhoneNumberUtilTest, number, PhoneNumberUtil::FIXED_LINE)); // This is too short for mobile, and no fixed-line number exist. number.set_country_code(882); - number.set_national_number(1234567ULL); + number.set_national_number(uint64{1234567}); EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::MOBILE)); @@ -2140,7 +2140,7 @@ TEST_F(PhoneNumberUtilTest, // There are *no* fixed-line OR mobile numbers for this country calling code // at all, so we return INVALID_LENGTH. number.set_country_code(979); - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_EQ(PhoneNumberUtil::INVALID_LENGTH, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::MOBILE)); @@ -2161,7 +2161,7 @@ TEST_F(PhoneNumberUtilTest, // For FIXED_LINE_OR_MOBILE, a number should be considered valid if it matches // the possible lengths for mobile *or* fixed-line numbers. number.set_country_code(290); - number.set_national_number(1234ULL); + number.set_national_number(uint64{1234}); EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE)); @@ -2172,7 +2172,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE_OR_MOBILE)); - number.set_national_number(12345ULL); + number.set_national_number(uint64{12345}); EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE)); @@ -2183,7 +2183,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE_OR_MOBILE)); - number.set_national_number(123456ULL); + number.set_national_number(uint64{123456}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE)); @@ -2194,7 +2194,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE_OR_MOBILE)); - number.set_national_number(1234567ULL); + number.set_national_number(uint64{1234567}); EXPECT_EQ(PhoneNumberUtil::TOO_LONG, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE)); @@ -2205,7 +2205,7 @@ TEST_F(PhoneNumberUtilTest, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::FIXED_LINE_OR_MOBILE)); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, phone_util_.IsPossibleNumberForTypeWithReason( number, PhoneNumberUtil::TOLL_FREE)); @@ -2217,19 +2217,19 @@ TEST_F(PhoneNumberUtilTest, TEST_F(PhoneNumberUtilTest, IsNotPossibleNumber) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(65025300000ULL); + number.set_national_number(uint64{65025300000}); EXPECT_FALSE(phone_util_.IsPossibleNumber(number)); number.set_country_code(800); - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_FALSE(phone_util_.IsPossibleNumber(number)); number.set_country_code(1); - number.set_national_number(253000ULL); + number.set_national_number(uint64{253000}); EXPECT_FALSE(phone_util_.IsPossibleNumber(number)); number.set_country_code(44); - number.set_national_number(300ULL); + number.set_national_number(uint64{300}); EXPECT_FALSE(phone_util_.IsPossibleNumber(number)); EXPECT_FALSE(phone_util_.IsPossibleNumberForString("+1 650 253 00000", @@ -2252,34 +2252,34 @@ TEST_F(PhoneNumberUtilTest, TruncateTooLongNumber) { // US number 650-253-0000, but entered with one additional digit at the end. PhoneNumber too_long_number; too_long_number.set_country_code(1); - too_long_number.set_national_number(65025300001ULL); + too_long_number.set_national_number(uint64{65025300001}); PhoneNumber valid_number; valid_number.set_country_code(1); - valid_number.set_national_number(6502530000ULL); + valid_number.set_national_number(uint64{6502530000}); EXPECT_TRUE(phone_util_.TruncateTooLongNumber(&too_long_number)); EXPECT_EQ(valid_number, too_long_number); too_long_number.set_country_code(800); - too_long_number.set_national_number(123456789ULL); + too_long_number.set_national_number(uint64{123456789}); valid_number.set_country_code(800); - valid_number.set_national_number(12345678ULL); + valid_number.set_national_number(uint64{12345678}); EXPECT_TRUE(phone_util_.TruncateTooLongNumber(&too_long_number)); EXPECT_EQ(valid_number, too_long_number); // GB number 080 1234 5678, but entered with 4 extra digits at the end. too_long_number.set_country_code(44); - too_long_number.set_national_number(80123456780123ULL); + too_long_number.set_national_number(uint64{80123456780123}); valid_number.set_country_code(44); - valid_number.set_national_number(8012345678ULL); + valid_number.set_national_number(uint64{8012345678}); EXPECT_TRUE(phone_util_.TruncateTooLongNumber(&too_long_number)); EXPECT_EQ(valid_number, too_long_number); // IT number 022 3456 7890, but entered with 3 extra digits at the end. too_long_number.set_country_code(39); - too_long_number.set_national_number(2234567890123ULL); + too_long_number.set_national_number(uint64{2234567890123}); too_long_number.set_italian_leading_zero(true); valid_number.set_country_code(39); - valid_number.set_national_number(2234567890ULL); + valid_number.set_national_number(uint64{2234567890}); valid_number.set_italian_leading_zero(true); EXPECT_TRUE(phone_util_.TruncateTooLongNumber(&too_long_number)); EXPECT_EQ(valid_number, too_long_number); @@ -2294,7 +2294,7 @@ TEST_F(PhoneNumberUtilTest, TruncateTooLongNumber) { PhoneNumber number_with_invalid_prefix; number_with_invalid_prefix.set_country_code(1); // The test metadata says US numbers cannot have prefix 240. - number_with_invalid_prefix.set_national_number(2401234567ULL); + number_with_invalid_prefix.set_national_number(uint64{2401234567}); PhoneNumber invalid_number_copy(number_with_invalid_prefix); EXPECT_FALSE(phone_util_.TruncateTooLongNumber(&number_with_invalid_prefix)); // Tests the number is not modified. @@ -2303,7 +2303,7 @@ TEST_F(PhoneNumberUtilTest, TruncateTooLongNumber) { // Tests what happens when a too short number is passed in. PhoneNumber too_short_number; too_short_number.set_country_code(1); - too_short_number.set_national_number(1234ULL); + too_short_number.set_national_number(uint64{1234}); PhoneNumber too_short_number_copy(too_short_number); EXPECT_FALSE(phone_util_.TruncateTooLongNumber(&too_short_number)); // Tests the number is not modified. @@ -2315,17 +2315,17 @@ TEST_F(PhoneNumberUtilTest, IsNumberGeographical) { // Bahamas, mobile phone number. number.set_country_code(1); - number.set_national_number(2423570000ULL); + number.set_national_number(uint64{2423570000}); EXPECT_FALSE(phone_util_.IsNumberGeographical(number)); // Australian fixed line number. number.set_country_code(61); - number.set_national_number(236618300ULL); + number.set_national_number(uint64{236618300}); EXPECT_TRUE(phone_util_.IsNumberGeographical(number)); // International toll free number. number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_FALSE(phone_util_.IsNumberGeographical(number)); // We test that mobile phone numbers in relevant regions are indeed considered @@ -2333,17 +2333,17 @@ TEST_F(PhoneNumberUtilTest, IsNumberGeographical) { // Argentina, mobile phone number. number.set_country_code(54); - number.set_national_number(91187654321ULL); + number.set_national_number(uint64{91187654321}); EXPECT_TRUE(phone_util_.IsNumberGeographical(number)); // Mexico, mobile phone number. number.set_country_code(52); - number.set_national_number(12345678900ULL); + number.set_national_number(uint64{12345678900}); EXPECT_TRUE(phone_util_.IsNumberGeographical(number)); // Mexico, another mobile phone number. number.set_country_code(52); - number.set_national_number(15512345678ULL); + number.set_national_number(uint64{15512345678}); EXPECT_TRUE(phone_util_.IsNumberGeographical(number)); } @@ -2620,7 +2620,7 @@ TEST_F(PhoneNumberUtilTest, FormatInOriginalFormat) { formatted_number.clear(); phone_number.set_country_code_source(PhoneNumber::FROM_DEFAULT_COUNTRY); phone_number.set_country_code(1); - phone_number.set_national_number(650253000ULL); + phone_number.set_national_number(uint64{650253000}); phone_util_.FormatInOriginalFormat(phone_number, RegionCode::US(), &formatted_number); EXPECT_EQ("650253000", formatted_number); @@ -2629,50 +2629,50 @@ TEST_F(PhoneNumberUtilTest, FormatInOriginalFormat) { TEST_F(PhoneNumberUtilTest, IsPremiumRate) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(9004433030ULL); + number.set_national_number(uint64{9004433030}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); number.set_country_code(39); - number.set_national_number(892123ULL); + number.set_national_number(uint64{892123}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); number.set_country_code(44); - number.set_national_number(9187654321ULL); + number.set_national_number(uint64{9187654321}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); number.set_country_code(49); - number.set_national_number(9001654321ULL); + number.set_national_number(uint64{9001654321}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); number.set_country_code(49); - number.set_national_number(90091234567ULL); + number.set_national_number(uint64{90091234567}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); number.set_country_code(979); - number.set_national_number(123456789ULL); + number.set_national_number(uint64{123456789}); EXPECT_EQ(PhoneNumberUtil::PREMIUM_RATE, phone_util_.GetNumberType(number)); } TEST_F(PhoneNumberUtilTest, IsTollFree) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(8881234567ULL); + number.set_national_number(uint64{8881234567}); EXPECT_EQ(PhoneNumberUtil::TOLL_FREE, phone_util_.GetNumberType(number)); number.set_country_code(39); - number.set_national_number(803123ULL); + number.set_national_number(uint64{803123}); EXPECT_EQ(PhoneNumberUtil::TOLL_FREE, phone_util_.GetNumberType(number)); number.set_country_code(44); - number.set_national_number(8012345678ULL); + number.set_national_number(uint64{8012345678}); EXPECT_EQ(PhoneNumberUtil::TOLL_FREE, phone_util_.GetNumberType(number)); number.set_country_code(49); - number.set_national_number(8001234567ULL); + number.set_national_number(uint64{8001234567}); EXPECT_EQ(PhoneNumberUtil::TOLL_FREE, phone_util_.GetNumberType(number)); number.set_country_code(800); - number.set_national_number(12345678ULL); + number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::TOLL_FREE, phone_util_.GetNumberType(number)); } @@ -2680,23 +2680,23 @@ TEST_F(PhoneNumberUtilTest, IsMobile) { PhoneNumber number; // A Bahama mobile number number.set_country_code(1); - number.set_national_number(2423570000ULL); + number.set_national_number(uint64{2423570000}); EXPECT_EQ(PhoneNumberUtil::MOBILE, phone_util_.GetNumberType(number)); number.set_country_code(39); - number.set_national_number(312345678ULL); + number.set_national_number(uint64{312345678}); EXPECT_EQ(PhoneNumberUtil::MOBILE, phone_util_.GetNumberType(number)); number.set_country_code(44); - number.set_national_number(7912345678ULL); + number.set_national_number(uint64{7912345678}); EXPECT_EQ(PhoneNumberUtil::MOBILE, phone_util_.GetNumberType(number)); number.set_country_code(49); - number.set_national_number(15123456789ULL); + number.set_national_number(uint64{15123456789}); EXPECT_EQ(PhoneNumberUtil::MOBILE, phone_util_.GetNumberType(number)); number.set_country_code(54); - number.set_national_number(91187654321ULL); + number.set_national_number(uint64{91187654321}); EXPECT_EQ(PhoneNumberUtil::MOBILE, phone_util_.GetNumberType(number)); } @@ -2704,35 +2704,35 @@ TEST_F(PhoneNumberUtilTest, IsFixedLine) { PhoneNumber number; // A Bahama fixed-line number number.set_country_code(1); - number.set_national_number(2423651234ULL); + number.set_national_number(uint64{2423651234}); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE, phone_util_.GetNumberType(number)); // An Italian fixed-line number number.Clear(); number.set_country_code(39); - number.set_national_number(236618300ULL); + number.set_national_number(uint64{236618300}); number.set_italian_leading_zero(true); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE, phone_util_.GetNumberType(number)); number.Clear(); number.set_country_code(44); - number.set_national_number(2012345678ULL); + number.set_national_number(uint64{2012345678}); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE, phone_util_.GetNumberType(number)); number.set_country_code(49); - number.set_national_number(301234ULL); + number.set_national_number(uint64{301234}); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE, phone_util_.GetNumberType(number)); } TEST_F(PhoneNumberUtilTest, IsFixedLineAndMobile) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(6502531111ULL); + number.set_national_number(uint64{6502531111}); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE_OR_MOBILE, phone_util_.GetNumberType(number)); number.set_country_code(54); - number.set_national_number(1987654321ULL); + number.set_national_number(uint64{1987654321}); EXPECT_EQ(PhoneNumberUtil::FIXED_LINE_OR_MOBILE, phone_util_.GetNumberType(number)); } @@ -2740,21 +2740,21 @@ TEST_F(PhoneNumberUtilTest, IsFixedLineAndMobile) { TEST_F(PhoneNumberUtilTest, IsSharedCost) { PhoneNumber number; number.set_country_code(44); - number.set_national_number(8431231234ULL); + number.set_national_number(uint64{8431231234}); EXPECT_EQ(PhoneNumberUtil::SHARED_COST, phone_util_.GetNumberType(number)); } TEST_F(PhoneNumberUtilTest, IsVoip) { PhoneNumber number; number.set_country_code(44); - number.set_national_number(5631231234ULL); + number.set_national_number(uint64{5631231234}); EXPECT_EQ(PhoneNumberUtil::VOIP, phone_util_.GetNumberType(number)); } TEST_F(PhoneNumberUtilTest, IsPersonalNumber) { PhoneNumber number; number.set_country_code(44); - number.set_national_number(7031231234ULL); + number.set_national_number(uint64{7031231234}); EXPECT_EQ(PhoneNumberUtil::PERSONAL_NUMBER, phone_util_.GetNumberType(number)); } @@ -2762,7 +2762,7 @@ TEST_F(PhoneNumberUtilTest, IsPersonalNumber) { TEST_F(PhoneNumberUtilTest, IsUnknown) { PhoneNumber number; number.set_country_code(1); - number.set_national_number(65025311111ULL); + number.set_national_number(uint64{65025311111}); EXPECT_EQ(PhoneNumberUtil::UNKNOWN, phone_util_.GetNumberType(number)); } @@ -3165,7 +3165,7 @@ TEST_F(PhoneNumberUtilTest, CountryWithNoNumberDesc) { // metadata. PhoneNumber ad_number; ad_number.set_country_code(376); - ad_number.set_national_number(12345ULL); + ad_number.set_national_number(uint64{12345}); phone_util_.Format(ad_number, PhoneNumberUtil::INTERNATIONAL, &formatted_number); EXPECT_EQ("+376 12345", formatted_number); @@ -3179,7 +3179,7 @@ TEST_F(PhoneNumberUtilTest, CountryWithNoNumberDesc) { // Test dialing a US number from within Andorra. PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(6502530000ULL); + us_number.set_national_number(uint64{6502530000}); phone_util_.FormatOutOfCountryCallingNumber(us_number, RegionCode::AD(), &formatted_number); EXPECT_EQ("00 1 650 253 0000", formatted_number); @@ -3188,7 +3188,7 @@ TEST_F(PhoneNumberUtilTest, CountryWithNoNumberDesc) { TEST_F(PhoneNumberUtilTest, UnknownCountryCallingCode) { PhoneNumber invalid_number; invalid_number.set_country_code(kInvalidCountryCode); - invalid_number.set_national_number(12345ULL); + invalid_number.set_national_number(uint64{12345}); EXPECT_FALSE(phone_util_.IsValidNumber(invalid_number)); @@ -3237,13 +3237,13 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchMatches) { "+6433316005;1234")); EXPECT_EQ(PhoneNumberUtil::EXACT_MATCH, phone_util_.IsNumberMatchWithTwoStrings( - "+7 423 202-25-11 ext 100", - "+7 4232022511 \xd0\xb4\xd0\xbe\xd0\xb1. 100")); +"+7 423 202-25-11 ext 100", +"+7 4232022511 \xd0\xb4\xd0\xbe\xd0\xb1. 100")); // Test proto buffers. PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); nz_number.set_extension("3456"); EXPECT_EQ(PhoneNumberUtil::EXACT_MATCH, phone_util_.IsNumberMatchWithOneString(nz_number, @@ -3260,7 +3260,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchMatches) { // Check variant with two proto buffers. PhoneNumber nz_number_2; nz_number_2.set_country_code(64); - nz_number_2.set_national_number(33316005ULL); + nz_number_2.set_national_number(uint64{33316005}); EXPECT_EQ(PhoneNumberUtil::EXACT_MATCH, phone_util_.IsNumberMatch(nz_number, nz_number_2)); } @@ -3268,12 +3268,12 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchMatches) { TEST_F(PhoneNumberUtilTest, IsNumberMatchShortMatchIfDiffNumLeadingZeros) { PhoneNumber nz_number_one; nz_number_one.set_country_code(64); - nz_number_one.set_national_number(33316005ULL); + nz_number_one.set_national_number(uint64{33316005}); nz_number_one.set_italian_leading_zero(true); PhoneNumber nz_number_two; nz_number_two.set_country_code(64); - nz_number_two.set_national_number(33316005ULL); + nz_number_two.set_national_number(uint64{33316005}); nz_number_two.set_italian_leading_zero(true); nz_number_two.set_number_of_leading_zeros(2); @@ -3293,12 +3293,12 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchShortMatchIfDiffNumLeadingZeros) { TEST_F(PhoneNumberUtilTest, IsNumberMatchAcceptsProtoDefaultsAsMatch) { PhoneNumber nz_number_one; nz_number_one.set_country_code(64); - nz_number_one.set_national_number(33316005ULL); + nz_number_one.set_national_number(uint64{33316005}); nz_number_one.set_italian_leading_zero(true); PhoneNumber nz_number_two; nz_number_two.set_country_code(64); - nz_number_two.set_national_number(33316005ULL); + nz_number_two.set_national_number(uint64{33316005}); nz_number_two.set_italian_leading_zero(true); // The default for number_of_leading_zeros is 1, so it shouldn't normally be // set, however if it is it should be considered equivalent. @@ -3311,11 +3311,11 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchMatchesDiffLeadingZerosIfItalianLeadingZeroFalse) { PhoneNumber nz_number_one; nz_number_one.set_country_code(64); - nz_number_one.set_national_number(33316005ULL); + nz_number_one.set_national_number(uint64{33316005}); PhoneNumber nz_number_two; nz_number_two.set_country_code(64); - nz_number_two.set_national_number(33316005ULL); + nz_number_two.set_national_number(uint64{33316005}); // The default for number_of_leading_zeros is 1, so it shouldn't normally be // set, however if it is it should be considered equivalent. nz_number_two.set_number_of_leading_zeros(1); @@ -3334,12 +3334,12 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchIgnoresSomeFields) { PhoneNumber br_number_1; PhoneNumber br_number_2; br_number_1.set_country_code(55); - br_number_1.set_national_number(3121286979ULL); + br_number_1.set_national_number(uint64{3121286979}); br_number_1.set_country_code_source(PhoneNumber::FROM_NUMBER_WITH_PLUS_SIGN); br_number_1.set_preferred_domestic_carrier_code("12"); br_number_1.set_raw_input("012 3121286979"); br_number_2.set_country_code(55); - br_number_2.set_national_number(3121286979ULL); + br_number_2.set_national_number(uint64{3121286979}); br_number_2.set_country_code_source(PhoneNumber::FROM_DEFAULT_COUNTRY); br_number_2.set_preferred_domestic_carrier_code("14"); br_number_2.set_raw_input("143121286979"); @@ -3398,7 +3398,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchNsnMatches) { PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); nz_number.set_extension(""); EXPECT_EQ(PhoneNumberUtil::NSN_MATCH, phone_util_.IsNumberMatchWithOneString(nz_number, "03 331 6005")); @@ -3412,7 +3412,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchNsnMatches) { // so the resultant match is an NSN match. PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(2345678901ULL); + us_number.set_national_number(uint64{2345678901}); EXPECT_EQ(PhoneNumberUtil::NSN_MATCH, phone_util_.IsNumberMatchWithOneString(us_number, "1-234-567-8901")); @@ -3432,7 +3432,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchNsnMatches) { // parsing. PhoneNumber random_number; random_number.set_country_code(41); - random_number.set_national_number(2345678901ULL); + random_number.set_national_number(uint64{2345678901}); EXPECT_EQ(PhoneNumberUtil::SHORT_NSN_MATCH, phone_util_.IsNumberMatchWithOneString(random_number, "1-234-567-8901")); @@ -3495,10 +3495,10 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchShortNsnMatches) { // One has Italian leading zero, one does not. PhoneNumber it_number_1, it_number_2; it_number_1.set_country_code(39); - it_number_1.set_national_number(1234ULL); + it_number_1.set_national_number(uint64{1234}); it_number_1.set_italian_leading_zero(true); it_number_2.set_country_code(39); - it_number_2.set_national_number(1234ULL); + it_number_2.set_national_number(uint64{1234}); EXPECT_EQ(PhoneNumberUtil::SHORT_NSN_MATCH, phone_util_.IsNumberMatch(it_number_1, it_number_2)); @@ -3513,7 +3513,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchShortNsnMatches) { TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); PhoneNumber test_number; // National prefix attached. EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, @@ -3603,7 +3603,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { PhoneNumber us_local_number; us_local_number.set_country_code(1); - us_local_number.set_national_number(2530000ULL); + us_local_number.set_national_number(uint64{2530000}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("tel:253-0000;phone-context=www.google.com", RegionCode::US(), &test_number)); @@ -3628,7 +3628,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { // Test for http://b/issue?id=2247493 nz_number.Clear(); nz_number.set_country_code(64); - nz_number.set_national_number(64123456ULL); + nz_number.set_national_number(uint64{64123456}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+64(0)64123456", RegionCode::US(), &test_number)); @@ -3637,7 +3637,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { // Check that using a "/" is fine in a phone number. PhoneNumber de_number; de_number.set_country_code(49); - de_number.set_national_number(12345678ULL); + de_number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("123/45678", RegionCode::DE(), &test_number)); EXPECT_EQ(de_number, test_number); @@ -3646,7 +3646,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { us_number.set_country_code(1); // Check it doesn't use the '1' as a country code when parsing if the phone // number was already possible. - us_number.set_national_number(1234567890ULL); + us_number.set_national_number(uint64{1234567890}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("123-456-7890", RegionCode::US(), &test_number)); EXPECT_EQ(us_number, test_number); @@ -3655,14 +3655,14 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) { // make sure we can parse the output we produce when formatting the number. PhoneNumber star_number; star_number.set_country_code(81); - star_number.set_national_number(2345ULL); + star_number.set_national_number(uint64{2345}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+81 *2345", RegionCode::JP(), &test_number)); EXPECT_EQ(star_number, test_number); PhoneNumber short_number; short_number.set_country_code(64); - short_number.set_national_number(12ULL); + short_number.set_national_number(uint64{12}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("12", RegionCode::NZ(), &test_number)); EXPECT_EQ(short_number, test_number); @@ -3684,14 +3684,14 @@ TEST_F(PhoneNumberUtilTest, ParseNumberWithAlphaCharacters) { PhoneNumber test_number; PhoneNumber tollfree_number; tollfree_number.set_country_code(64); - tollfree_number.set_national_number(800332005ULL); + tollfree_number.set_national_number(uint64{800332005}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("0800 DDA 005", RegionCode::NZ(), &test_number)); EXPECT_EQ(tollfree_number, test_number); PhoneNumber premium_number; premium_number.set_country_code(64); - premium_number.set_national_number(9003326005ULL); + premium_number.set_national_number(uint64{9003326005}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("0900 DDA 6005", RegionCode::NZ(), &test_number)); EXPECT_EQ(premium_number, test_number); @@ -3721,7 +3721,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumberWithAlphaCharacters) { TEST_F(PhoneNumberUtilTest, ParseWithInternationalPrefixes) { PhoneNumber us_number; us_number.set_country_code(1); - us_number.set_national_number(6503336000ULL); + us_number.set_national_number(uint64{6503336000}); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+1 (650) 333-6000", @@ -3796,7 +3796,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithInternationalPrefixes) { PhoneNumber toll_free_number; toll_free_number.set_country_code(800); - toll_free_number.set_national_number(12345678ULL); + toll_free_number.set_national_number(uint64{12345678}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("011 800 1234 5678", RegionCode::US(), &test_number)); @@ -3806,7 +3806,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithInternationalPrefixes) { TEST_F(PhoneNumberUtilTest, ParseWithLeadingZero) { PhoneNumber it_number; it_number.set_country_code(39); - it_number.set_national_number(236618300ULL); + it_number.set_national_number(uint64{236618300}); it_number.set_italian_leading_zero(true); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, @@ -3819,7 +3819,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithLeadingZero) { it_number.Clear(); it_number.set_country_code(39); - it_number.set_national_number(312345678ULL); + it_number.set_national_number(uint64{312345678}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("312 345 678", RegionCode::IT(), &test_number)); EXPECT_EQ(it_number, test_number); @@ -3829,7 +3829,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumberArgentina) { // Test parsing mobile numbers of Argentina. PhoneNumber ar_number; ar_number.set_country_code(54); - ar_number.set_national_number(93435551212ULL); + ar_number.set_national_number(uint64{93435551212}); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+54 9 343 555 1212", RegionCode::AR(), @@ -3840,7 +3840,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumberArgentina) { &test_number)); EXPECT_EQ(ar_number, test_number); - ar_number.set_national_number(93715654320ULL); + ar_number.set_national_number(uint64{93715654320}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+54 9 3715 65 4320", RegionCode::AR(), &test_number)); @@ -3851,7 +3851,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumberArgentina) { EXPECT_EQ(ar_number, test_number); // Test parsing fixed-line numbers of Argentina. - ar_number.set_national_number(1137970000ULL); + ar_number.set_national_number(uint64{1137970000}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+54 11 3797 0000", RegionCode::AR(), &test_number)); @@ -3860,7 +3860,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumberArgentina) { phone_util_.Parse("011 3797 0000", RegionCode::AR(), &test_number)); EXPECT_EQ(ar_number, test_number); - ar_number.set_national_number(3715654321ULL); + ar_number.set_national_number(uint64{3715654321}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+54 3715 65 4321", RegionCode::AR(), &test_number)); @@ -3869,7 +3869,7 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumberArgentina) { phone_util_.Parse("03715 65 4321", RegionCode::AR(), &test_number)); EXPECT_EQ(ar_number, test_number); - ar_number.set_national_number(2312340000ULL); + ar_number.set_national_number(uint64{2312340000}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+54 23 1234 0000", RegionCode::AR(), &test_number)); @@ -3884,7 +3884,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithXInNumber) { // just gets removed. PhoneNumber ar_number; ar_number.set_country_code(54); - ar_number.set_national_number(123456789ULL); + ar_number.set_national_number(uint64{123456789}); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("0123456789", RegionCode::AR(), &test_number)); @@ -3902,7 +3902,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithXInNumber) { PhoneNumber ar_from_us; ar_from_us.set_country_code(54); - ar_from_us.set_national_number(81429712ULL); + ar_from_us.set_national_number(uint64{81429712}); // This test is intentionally constructed such that the number of digit after // xx is larger than 7, so that the number won't be mistakenly treated as an // extension, as we allow extensions up to 7 digits. This assumption is okay @@ -3919,7 +3919,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumbersMexico) { PhoneNumber mx_number; mx_number.set_country_code(52); - mx_number.set_national_number(4499780001ULL); + mx_number.set_national_number(uint64{4499780001}); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+52 (449)978-0001", RegionCode::MX(), @@ -3937,7 +3937,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumbersMexico) { // Test parsing mobile numbers of Mexico. mx_number.Clear(); mx_number.set_country_code(52); - mx_number.set_national_number(13312345678ULL); + mx_number.set_national_number(uint64{13312345678}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+52 1 33 1234-5678", RegionCode::MX(), &test_number)); @@ -4060,7 +4060,7 @@ TEST_F(PhoneNumberUtilTest, FailedParseOnInvalidNumbers) { TEST_F(PhoneNumberUtilTest, ParseNumbersWithPlusWithNoRegion) { PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); // RegionCode::GetUnknown() is allowed only if the number starts with a '+' - // then the country code can be calculated. PhoneNumber result_proto; @@ -4084,7 +4084,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumbersWithPlusWithNoRegion) { PhoneNumber toll_free_number; toll_free_number.set_country_code(800); - toll_free_number.set_national_number(12345678ULL); + toll_free_number.set_national_number(uint64{12345678}); result_proto.Clear(); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+800 1234 5678", @@ -4093,7 +4093,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumbersWithPlusWithNoRegion) { PhoneNumber universal_premium_rate; universal_premium_rate.set_country_code(979); - universal_premium_rate.set_national_number(123456789ULL); + universal_premium_rate.set_national_number(uint64{123456789}); result_proto.Clear(); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+979 123 456 789", @@ -4165,7 +4165,7 @@ TEST_F(PhoneNumberUtilTest, ParseNumberTooShortIfNationalPrefixStripped) { TEST_F(PhoneNumberUtilTest, ParseExtensions) { PhoneNumber nz_number; nz_number.set_country_code(64); - nz_number.set_national_number(33316005ULL); + nz_number.set_national_number(uint64{33316005}); nz_number.set_extension("3456"); PhoneNumber test_number; EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, @@ -4188,7 +4188,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { // Test the following do not extract extensions: PhoneNumber non_extn_number; non_extn_number.set_country_code(1); - non_extn_number.set_national_number(80074935247ULL); + non_extn_number.set_national_number(uint64{80074935247}); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("1800 six-flags", RegionCode::US(), &test_number)); @@ -4209,7 +4209,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { // Check that the last instance of an extension token is matched. PhoneNumber extn_number; extn_number.set_country_code(1); - extn_number.set_national_number(80074935247ULL); + extn_number.set_national_number(uint64{80074935247}); extn_number.set_extension("1234"); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("0~0 1800 7493 5247 ~1234", RegionCode::PL(), @@ -4221,7 +4221,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { // cases of extensions. PhoneNumber uk_number; uk_number.set_country_code(44); - uk_number.set_national_number(2034567890ULL); + uk_number.set_national_number(uint64{2034567890}); uk_number.set_extension("456"); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+44 2034567890x456", RegionCode::NZ(), @@ -4284,7 +4284,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { PhoneNumber us_with_extension; us_with_extension.set_country_code(1); - us_with_extension.set_national_number(8009013355ULL); + us_with_extension.set_national_number(uint64{8009013355}); us_with_extension.set_extension("7246433"); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("(800) 901-3355 x 7246433", RegionCode::US(), @@ -4372,7 +4372,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { // Test that if a number has two extensions specified, we ignore the second. PhoneNumber us_with_two_extensions_number; us_with_two_extensions_number.set_country_code(1); - us_with_two_extensions_number.set_national_number(2121231234ULL); + us_with_two_extensions_number.set_national_number(uint64{2121231234}); us_with_two_extensions_number.set_extension("508"); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("(212)123-1234 x508/x1234", RegionCode::US(), @@ -4391,7 +4391,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { // 3 digits before the # are an extension. us_with_extension.Clear(); us_with_extension.set_country_code(1); - us_with_extension.set_national_number(6451231234ULL); + us_with_extension.set_national_number(uint64{6451231234}); us_with_extension.set_extension("910"); EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR, phone_util_.Parse("+1 (645) 123 1234-910#", RegionCode::US(), @@ -4402,7 +4402,7 @@ TEST_F(PhoneNumberUtilTest, ParseExtensions) { TEST_F(PhoneNumberUtilTest, ParseAndKeepRaw) { PhoneNumber alpha_numeric_number; alpha_numeric_number.set_country_code(1); - alpha_numeric_number.set_national_number(80074935247ULL); + alpha_numeric_number.set_national_number(uint64{80074935247}); alpha_numeric_number.set_raw_input("800 six-flags"); alpha_numeric_number.set_country_code_source( PhoneNumber::FROM_DEFAULT_COUNTRY); @@ -4413,7 +4413,7 @@ TEST_F(PhoneNumberUtilTest, ParseAndKeepRaw) { &test_number)); EXPECT_EQ(alpha_numeric_number, test_number); - alpha_numeric_number.set_national_number(8007493524ULL); + alpha_numeric_number.set_national_number(uint64{8007493524}); alpha_numeric_number.set_raw_input("1800 six-flag"); alpha_numeric_number.set_country_code_source( PhoneNumber::FROM_NUMBER_WITHOUT_PLUS_SIGN); @@ -4506,24 +4506,24 @@ TEST_F(PhoneNumberUtilTest, CanBeInternationallyDialled) { // We have no-international-dialling rules for the US in our test metadata // that say that toll-free numbers cannot be dialled internationally. - test_number.set_national_number(8002530000ULL); + test_number.set_national_number(uint64{8002530000}); EXPECT_FALSE(phone_util_.CanBeInternationallyDialled(test_number)); // Normal US numbers can be internationally dialled. - test_number.set_national_number(6502530000ULL); + test_number.set_national_number(uint64{6502530000}); EXPECT_TRUE(phone_util_.CanBeInternationallyDialled(test_number)); // Invalid number. - test_number.set_national_number(2530000ULL); + test_number.set_national_number(uint64{2530000}); EXPECT_TRUE(phone_util_.CanBeInternationallyDialled(test_number)); // We have no data for NZ - should return true. test_number.set_country_code(64); - test_number.set_national_number(33316005ULL); + test_number.set_national_number(uint64{33316005}); EXPECT_TRUE(phone_util_.CanBeInternationallyDialled(test_number)); test_number.set_country_code(800); - test_number.set_national_number(12345678ULL); + test_number.set_national_number(uint64{12345678}); EXPECT_TRUE(phone_util_.CanBeInternationallyDialled(test_number)); } diff --git a/cpp/test/phonenumbers/shortnumberinfo_test.cc b/cpp/test/phonenumbers/shortnumberinfo_test.cc index fc7dc3a1d..83dc4f918 100644 --- a/cpp/test/phonenumbers/shortnumberinfo_test.cc +++ b/cpp/test/phonenumbers/shortnumberinfo_test.cc @@ -30,7 +30,6 @@ namespace i18n { namespace phonenumbers { - class ShortNumberInfoTest : public testing::Test { protected: PhoneNumber ParseNumberForTesting(const string& number, @@ -57,35 +56,35 @@ class ShortNumberInfoTest : public testing::Test { TEST_F(ShortNumberInfoTest, IsPossibleShortNumber) { PhoneNumber possible_number; possible_number.set_country_code(33); - possible_number.set_national_number(123456ULL); + possible_number.set_national_number(uint64{123456}); EXPECT_TRUE(short_info_.IsPossibleShortNumber(possible_number)); EXPECT_TRUE(short_info_.IsPossibleShortNumberForRegion( ParseNumberForTesting("123456", RegionCode::FR()), RegionCode::FR())); PhoneNumber impossible_number; impossible_number.set_country_code(33); - impossible_number.set_national_number(9ULL); + impossible_number.set_national_number(uint64{9}); EXPECT_FALSE(short_info_.IsPossibleShortNumber(impossible_number)); // Note that GB and GG share the country calling code 44, and that this // number is possible but not valid. PhoneNumber shared_number; shared_number.set_country_code(44); - shared_number.set_national_number(11001ULL); + shared_number.set_national_number(uint64{11001}); EXPECT_TRUE(short_info_.IsPossibleShortNumber(shared_number)); } TEST_F(ShortNumberInfoTest, IsValidShortNumber) { PhoneNumber valid_number; valid_number.set_country_code(33); - valid_number.set_national_number(1010ULL); + valid_number.set_national_number(uint64{1010}); EXPECT_TRUE(short_info_.IsValidShortNumber(valid_number)); EXPECT_TRUE(short_info_.IsValidShortNumberForRegion( ParseNumberForTesting("1010", RegionCode::FR()), RegionCode::FR())); PhoneNumber invalid_number; invalid_number.set_country_code(33); - invalid_number.set_national_number(123456ULL); + invalid_number.set_national_number(uint64{123456}); EXPECT_FALSE(short_info_.IsValidShortNumber(invalid_number)); EXPECT_FALSE(short_info_.IsValidShortNumberForRegion( ParseNumberForTesting("123456", RegionCode::FR()), RegionCode::FR())); @@ -93,28 +92,28 @@ TEST_F(ShortNumberInfoTest, IsValidShortNumber) { // Note that GB and GG share the country calling code 44. PhoneNumber shared_number; shared_number.set_country_code(44); - shared_number.set_national_number(18001ULL); + shared_number.set_national_number(uint64{18001}); EXPECT_TRUE(short_info_.IsValidShortNumber(shared_number)); } TEST_F(ShortNumberInfoTest, IsCarrierSpecific) { PhoneNumber carrier_specific_number; carrier_specific_number.set_country_code(1); - carrier_specific_number.set_national_number(33669ULL); + carrier_specific_number.set_national_number(uint64{33669}); EXPECT_TRUE(short_info_.IsCarrierSpecific(carrier_specific_number)); EXPECT_TRUE(short_info_.IsCarrierSpecificForRegion( ParseNumberForTesting("33669", RegionCode::US()), RegionCode::US())); PhoneNumber not_carrier_specific_number; not_carrier_specific_number.set_country_code(1); - not_carrier_specific_number.set_national_number(911ULL); + not_carrier_specific_number.set_national_number(uint64{911}); EXPECT_FALSE(short_info_.IsCarrierSpecific(not_carrier_specific_number)); EXPECT_FALSE(short_info_.IsCarrierSpecificForRegion( ParseNumberForTesting("911", RegionCode::US()), RegionCode::US())); PhoneNumber carrier_specific_number_for_some_region; carrier_specific_number_for_some_region.set_country_code(1); - carrier_specific_number_for_some_region.set_national_number(211ULL); + carrier_specific_number_for_some_region.set_national_number(uint64{211}); EXPECT_TRUE(short_info_.IsCarrierSpecific( carrier_specific_number_for_some_region)); EXPECT_TRUE(short_info_.IsCarrierSpecificForRegion( @@ -126,7 +125,7 @@ TEST_F(ShortNumberInfoTest, IsCarrierSpecific) { TEST_F(ShortNumberInfoTest, IsSmsService) { PhoneNumber sms_service_number_for_some_region; sms_service_number_for_some_region.set_country_code(1); - sms_service_number_for_some_region.set_national_number(21234ULL); + sms_service_number_for_some_region.set_national_number(uint64{21234}); EXPECT_TRUE(short_info_.IsSmsServiceForRegion( sms_service_number_for_some_region, RegionCode::US())); EXPECT_FALSE(short_info_.IsSmsServiceForRegion( @@ -183,7 +182,7 @@ TEST_F(ShortNumberInfoTest, GetExpectedCost) { ParseNumberForTesting("12345", RegionCode::FR()), RegionCode::FR())); PhoneNumber unknown_cost_number; unknown_cost_number.set_country_code(33); - unknown_cost_number.set_national_number(12345ULL); + unknown_cost_number.set_national_number(uint64{12345}); EXPECT_EQ(ShortNumberInfo::UNKNOWN_COST, short_info_.GetExpectedCost(unknown_cost_number)); @@ -197,7 +196,7 @@ TEST_F(ShortNumberInfoTest, GetExpectedCost) { ParseNumberForTesting("116123", RegionCode::FR()), RegionCode::FR())); PhoneNumber invalid_number; invalid_number.set_country_code(33); - invalid_number.set_national_number(116123ULL); + invalid_number.set_national_number(uint64{116123}); EXPECT_FALSE(short_info_.IsValidShortNumber(invalid_number)); EXPECT_EQ(ShortNumberInfo::TOLL_FREE, short_info_.GetExpectedCost(invalid_number)); @@ -209,7 +208,7 @@ TEST_F(ShortNumberInfoTest, GetExpectedCost) { ParseNumberForTesting("911", RegionCode::US()), RegionCode::ZZ())); unknown_cost_number.Clear(); unknown_cost_number.set_country_code(123); - unknown_cost_number.set_national_number(911ULL); + unknown_cost_number.set_national_number(uint64{911}); EXPECT_EQ(ShortNumberInfo::UNKNOWN_COST, short_info_.GetExpectedCost(unknown_cost_number)); } @@ -222,15 +221,15 @@ TEST_F(ShortNumberInfoTest, GetExpectedCostForSharedCountryCallingCode) { string ambiguous_premium_rate_string("1234"); PhoneNumber ambiguous_premium_rate_number; ambiguous_premium_rate_number.set_country_code(61); - ambiguous_premium_rate_number.set_national_number(1234ULL); + ambiguous_premium_rate_number.set_national_number(uint64{1234}); string ambiguous_standard_rate_string("1194"); PhoneNumber ambiguous_standard_rate_number; ambiguous_standard_rate_number.set_country_code(61); - ambiguous_standard_rate_number.set_national_number(1194ULL); + ambiguous_standard_rate_number.set_national_number(uint64{1194}); string ambiguous_toll_free_string("733"); PhoneNumber ambiguous_toll_free_number; ambiguous_toll_free_number.set_country_code(61); - ambiguous_toll_free_number.set_national_number(733ULL); + ambiguous_toll_free_number.set_national_number(uint64{733}); EXPECT_TRUE(short_info_.IsValidShortNumber(ambiguous_premium_rate_number)); EXPECT_TRUE(short_info_.IsValidShortNumber(ambiguous_standard_rate_number)); @@ -461,7 +460,7 @@ TEST_F(ShortNumberInfoTest, EmergencyNumberForSharedCountryCallingCode) { PhoneNumber shared_emergency_number; shared_emergency_number.set_country_code(61); - shared_emergency_number.set_national_number(112ULL); + shared_emergency_number.set_national_number(uint64{112}); EXPECT_TRUE(short_info_.IsValidShortNumber(shared_emergency_number)); EXPECT_EQ(ShortNumberInfo::TOLL_FREE, short_info_.GetExpectedCost(shared_emergency_number));