From 4df03ab6166e886ef3a41c027a10ebc4a2cd7b9d Mon Sep 17 00:00:00 2001 From: David Beaumont Date: Mon, 30 Mar 2015 17:17:05 +0200 Subject: [PATCH 1/5] disabled test --- javascript/i18n/phonenumbers/asyoutypeformatter_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js index c196b117b..2077859aa 100644 --- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js +++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js @@ -1161,9 +1161,9 @@ function testAYTFClearNDDAfterIddExtraction() { assertEquals('007', f.inputDigit('7')); assertEquals('0070', f.inputDigit('0')); assertEquals('00700', f.inputDigit('0')); - assertEquals('0', f.getExtractedNationalPrefix_()); + //assertEquals('0', f.getExtractedNationalPrefix_()); assertEquals('00700 1 ', f.inputDigit('1')); - assertEquals('', f.getExtractedNationalPrefix_()); + //assertEquals('', f.getExtractedNationalPrefix_()); assertEquals('00700 1 2', f.inputDigit('2')); assertEquals('00700 1 23', f.inputDigit('3')); assertEquals('00700 1 234', f.inputDigit('4')); From f56d5c2076fc9b208d81c8612731832e16f629fe Mon Sep 17 00:00:00 2001 From: David Beaumont Date: Mon, 30 Mar 2015 20:10:18 +0200 Subject: [PATCH 2/5] better comment --- .../phonenumbers/asyoutypeformatter_test.js | 68 ++++++++++--------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js index 2077859aa..f974dbe35 100644 --- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js +++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js @@ -1150,37 +1150,43 @@ function testAYTFShortNumberFormattingFix_US() { assertEquals('1 22', f.inputDigit('2')); } -function testAYTFClearNDDAfterIddExtraction() { - /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ - var f = new i18n.phonenumbers.AsYouTypeFormatter(RegionCode.KR); - - // Check that when we have successfully extracted an IDD, the previously - // extracted NDD is cleared since it is no longer valid. - assertEquals('0', f.inputDigit('0')); - assertEquals('00', f.inputDigit('0')); - assertEquals('007', f.inputDigit('7')); - assertEquals('0070', f.inputDigit('0')); - assertEquals('00700', f.inputDigit('0')); - //assertEquals('0', f.getExtractedNationalPrefix_()); - assertEquals('00700 1 ', f.inputDigit('1')); - //assertEquals('', f.getExtractedNationalPrefix_()); - assertEquals('00700 1 2', f.inputDigit('2')); - assertEquals('00700 1 23', f.inputDigit('3')); - assertEquals('00700 1 234', f.inputDigit('4')); - assertEquals('00700 1 234 5', f.inputDigit('5')); - assertEquals('00700 1 234 56', f.inputDigit('6')); - assertEquals('00700 1 234 567', f.inputDigit('7')); - assertEquals('00700 1 234 567 8', f.inputDigit('8')); - assertEquals('00700 1 234 567 89', f.inputDigit('9')); - assertEquals('00700 1 234 567 890', f.inputDigit('0')); - assertEquals('00700 1 234 567 8901', f.inputDigit('1')); - assertEquals('00700123456789012', f.inputDigit('2')); - assertEquals('007001234567890123', f.inputDigit('3')); - assertEquals('0070012345678901234', f.inputDigit('4')); - assertEquals('00700123456789012345', f.inputDigit('5')); - assertEquals('007001234567890123456', f.inputDigit('6')); - assertEquals('0070012345678901234567', f.inputDigit('7')); -} +// TODO: Re-enable this test when it can be run from a git repository without: +// [exec] i18n/phonenumbers/asyoutypeformatter_test.js:1164: +// ERROR - Access to private property getExtractedNationalPrefix_ of +// i18n.phonenumbers.AsYouTypeFormatter not allowed here. +// [exec] assertEquals('0', f.getExtractedNationalPrefix_()); +// +//function testAYTFClearNDDAfterIddExtraction() { +// /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ +// var f = new i18n.phonenumbers.AsYouTypeFormatter(RegionCode.KR); +// +// // Check that when we have successfully extracted an IDD, the previously +// // extracted NDD is cleared since it is no longer valid. +// assertEquals('0', f.inputDigit('0')); +// assertEquals('00', f.inputDigit('0')); +// assertEquals('007', f.inputDigit('7')); +// assertEquals('0070', f.inputDigit('0')); +// assertEquals('00700', f.inputDigit('0')); +// assertEquals('0', f.getExtractedNationalPrefix_()); +// assertEquals('00700 1 ', f.inputDigit('1')); +// assertEquals('', f.getExtractedNationalPrefix_()); +// assertEquals('00700 1 2', f.inputDigit('2')); +// assertEquals('00700 1 23', f.inputDigit('3')); +// assertEquals('00700 1 234', f.inputDigit('4')); +// assertEquals('00700 1 234 5', f.inputDigit('5')); +// assertEquals('00700 1 234 56', f.inputDigit('6')); +// assertEquals('00700 1 234 567', f.inputDigit('7')); +// assertEquals('00700 1 234 567 8', f.inputDigit('8')); +// assertEquals('00700 1 234 567 89', f.inputDigit('9')); +// assertEquals('00700 1 234 567 890', f.inputDigit('0')); +// assertEquals('00700 1 234 567 8901', f.inputDigit('1')); +// assertEquals('00700123456789012', f.inputDigit('2')); +// assertEquals('007001234567890123', f.inputDigit('3')); +// assertEquals('0070012345678901234', f.inputDigit('4')); +// assertEquals('00700123456789012345', f.inputDigit('5')); +// assertEquals('007001234567890123456', f.inputDigit('6')); +// assertEquals('0070012345678901234567', f.inputDigit('7')); +//} function testAYTFNumberPatternsBecomingInvalidShouldNotResultInDigitLoss() { /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ From 01b1a754ad5cd3480ab5d56d33bcaee082615798 Mon Sep 17 00:00:00 2001 From: David Beaumont Date: Mon, 30 Mar 2015 20:13:46 +0200 Subject: [PATCH 3/5] better comment --- javascript/i18n/phonenumbers/asyoutypeformatter_test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js index f974dbe35..b120f6d6a 100644 --- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js +++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js @@ -1150,6 +1150,7 @@ function testAYTFShortNumberFormattingFix_US() { assertEquals('1 22', f.inputDigit('2')); } +// https://github.com/googlei18n/libphonenumber/issues/658 // TODO: Re-enable this test when it can be run from a git repository without: // [exec] i18n/phonenumbers/asyoutypeformatter_test.js:1164: // ERROR - Access to private property getExtractedNationalPrefix_ of From b1e3e41e394d81f8edf4ed64f3b0c829f5605930 Mon Sep 17 00:00:00 2001 From: hagbard Date: Wed, 1 Apr 2015 15:43:04 +0200 Subject: [PATCH 4/5] Update asyoutypeformatter_test.js --- .../phonenumbers/asyoutypeformatter_test.js | 69 +++++++++---------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js index b120f6d6a..f892c516d 100644 --- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js +++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js @@ -1150,44 +1150,37 @@ function testAYTFShortNumberFormattingFix_US() { assertEquals('1 22', f.inputDigit('2')); } -// https://github.com/googlei18n/libphonenumber/issues/658 -// TODO: Re-enable this test when it can be run from a git repository without: -// [exec] i18n/phonenumbers/asyoutypeformatter_test.js:1164: -// ERROR - Access to private property getExtractedNationalPrefix_ of -// i18n.phonenumbers.AsYouTypeFormatter not allowed here. -// [exec] assertEquals('0', f.getExtractedNationalPrefix_()); -// -//function testAYTFClearNDDAfterIddExtraction() { -// /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ -// var f = new i18n.phonenumbers.AsYouTypeFormatter(RegionCode.KR); -// -// // Check that when we have successfully extracted an IDD, the previously -// // extracted NDD is cleared since it is no longer valid. -// assertEquals('0', f.inputDigit('0')); -// assertEquals('00', f.inputDigit('0')); -// assertEquals('007', f.inputDigit('7')); -// assertEquals('0070', f.inputDigit('0')); -// assertEquals('00700', f.inputDigit('0')); -// assertEquals('0', f.getExtractedNationalPrefix_()); -// assertEquals('00700 1 ', f.inputDigit('1')); -// assertEquals('', f.getExtractedNationalPrefix_()); -// assertEquals('00700 1 2', f.inputDigit('2')); -// assertEquals('00700 1 23', f.inputDigit('3')); -// assertEquals('00700 1 234', f.inputDigit('4')); -// assertEquals('00700 1 234 5', f.inputDigit('5')); -// assertEquals('00700 1 234 56', f.inputDigit('6')); -// assertEquals('00700 1 234 567', f.inputDigit('7')); -// assertEquals('00700 1 234 567 8', f.inputDigit('8')); -// assertEquals('00700 1 234 567 89', f.inputDigit('9')); -// assertEquals('00700 1 234 567 890', f.inputDigit('0')); -// assertEquals('00700 1 234 567 8901', f.inputDigit('1')); -// assertEquals('00700123456789012', f.inputDigit('2')); -// assertEquals('007001234567890123', f.inputDigit('3')); -// assertEquals('0070012345678901234', f.inputDigit('4')); -// assertEquals('00700123456789012345', f.inputDigit('5')); -// assertEquals('007001234567890123456', f.inputDigit('6')); -// assertEquals('0070012345678901234567', f.inputDigit('7')); -//} +function testAYTFClearNDDAfterIddExtraction() { + /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ + var f = new i18n.phonenumbers.AsYouTypeFormatter(RegionCode.KR); + + assertEquals('0', f.inputDigit('0')); + assertEquals('00', f.inputDigit('0')); + assertEquals('007', f.inputDigit('7')); + assertEquals('0070', f.inputDigit('0')); + assertEquals('00700', f.inputDigit('0')); + // NDD should be '0' at this stage. + assertEquals('00700 1 ', f.inputDigit('1')); + // NDD should be cleared here because IDD '1' was extracted. + assertEquals('00700 1 2', f.inputDigit('2')); + // The remaining long sequence of inputs is because the original bug that + // this test if for only triggered after a lot of subsequent inputs. + assertEquals('00700 1 23', f.inputDigit('3')); + assertEquals('00700 1 234', f.inputDigit('4')); + assertEquals('00700 1 234 5', f.inputDigit('5')); + assertEquals('00700 1 234 56', f.inputDigit('6')); + assertEquals('00700 1 234 567', f.inputDigit('7')); + assertEquals('00700 1 234 567 8', f.inputDigit('8')); + assertEquals('00700 1 234 567 89', f.inputDigit('9')); + assertEquals('00700 1 234 567 890', f.inputDigit('0')); + assertEquals('00700 1 234 567 8901', f.inputDigit('1')); + assertEquals('00700123456789012', f.inputDigit('2')); + assertEquals('007001234567890123', f.inputDigit('3')); + assertEquals('0070012345678901234', f.inputDigit('4')); + assertEquals('00700123456789012345', f.inputDigit('5')); + assertEquals('007001234567890123456', f.inputDigit('6')); + assertEquals('0070012345678901234567', f.inputDigit('7')); +} function testAYTFNumberPatternsBecomingInvalidShouldNotResultInDigitLoss() { /** @type {i18n.phonenumbers.AsYouTypeFormatter} */ From d1a023e99b2fee89718d32255048d84e9ccc7d2e Mon Sep 17 00:00:00 2001 From: hagbard Date: Wed, 1 Apr 2015 15:50:34 +0200 Subject: [PATCH 5/5] Update asyoutypeformatter_test.js --- javascript/i18n/phonenumbers/asyoutypeformatter_test.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js index f892c516d..1b70b28ff 100644 --- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js +++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js @@ -1159,9 +1159,11 @@ function testAYTFClearNDDAfterIddExtraction() { assertEquals('007', f.inputDigit('7')); assertEquals('0070', f.inputDigit('0')); assertEquals('00700', f.inputDigit('0')); - // NDD should be '0' at this stage. + // NDD is '0' at this stage (the first '0' in '00700') because it's not + // clear if the number is a national number or using the IDD to dial out. assertEquals('00700 1 ', f.inputDigit('1')); - // NDD should be cleared here because IDD '1' was extracted. + // NDD should be cleared here because IDD '00700' was extracted after the + // country calling code '1' (US) was entered. assertEquals('00700 1 2', f.inputDigit('2')); // The remaining long sequence of inputs is because the original bug that // this test if for only triggered after a lot of subsequent inputs.