diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java deleted file mode 100644 index 5ea1a91f8..000000000 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2011 The Libphonenumber Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.i18n.phonenumbers; - -import java.util.Set; - -/* - * Utility for international short phone numbers, such as short codes and emergency numbers. Note - * most commercial short numbers are not handled here, but by the PhoneNumberUtil. - * - * @deprecated("As of release 5.8, replaced by ShortNumberInfo.") - * - * @author Shaopeng Jia - * @author David Yonge-Mallo - */ -@Deprecated public class ShortNumberUtil { - - /** - * Cost categories of short numbers. - */ - public enum ShortNumberCost { - TOLL_FREE, - STANDARD_RATE, - PREMIUM_RATE, - UNKNOWN_COST - } - - public ShortNumberUtil() { - } - - /** - * Convenience method to get a list of what regions the library has metadata for. - */ - public Set getSupportedRegions() { - return ShortNumberInfo.getInstance().getSupportedRegions(); - } - - /** - * Returns true if the number might be used to connect to an emergency service in the given - * region. - * - * This method takes into account cases where the number might contain formatting, or might have - * additional digits appended (when it is okay to do that in the region specified). - * - * @param number the phone number to test - * @param regionCode the region where the phone number is being dialed - * @return if the number might be used to connect to an emergency service in the given region. - */ - public boolean connectsToEmergencyNumber(String number, String regionCode) { - return ShortNumberInfo.getInstance().connectsToEmergencyNumber(number, regionCode); - } - - /** - * Returns true if the number exactly matches an emergency service number in the given region. - * - * This method takes into account cases where the number might contain formatting, but doesn't - * allow additional digits to be appended. - * - * @param number the phone number to test - * @param regionCode the region where the phone number is being dialed - * @return if the number exactly matches an emergency services number in the given region. - */ - public boolean isEmergencyNumber(String number, String regionCode) { - return ShortNumberInfo.getInstance().isEmergencyNumber(number, regionCode); - } -} diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java deleted file mode 100644 index f4787141f..000000000 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2011 The Libphonenumber Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.i18n.phonenumbers; - -import junit.framework.TestCase; - -/** - * Unit tests for ShortNumberUtil.java - * - * @author Shaopeng Jia - */ -public class ShortNumberUtilTest extends TestCase { - private ShortNumberUtil shortUtil; - - public ShortNumberUtilTest() { - shortUtil = new ShortNumberUtil(); - } - - public void testConnectsToEmergencyNumber_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("112", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberLongNumber_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("9116666666", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("1126666666", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("9996666666", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberWithFormatting_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("9-1-1", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("1-1-2", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("9-9-9", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberWithPlusSign_US() { - assertFalse(shortUtil.connectsToEmergencyNumber("+911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("\uFF0B911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber(" +911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("+112", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("+999", RegionCode.US)); - } - - public void testConnectsToEmergencyNumber_BR() { - assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.BR)); - assertTrue(shortUtil.connectsToEmergencyNumber("190", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.BR)); - } - - public void testConnectsToEmergencyNumberLongNumber_BR() { - // Brazilian emergency numbers don't work when additional digits are appended. - assertFalse(shortUtil.connectsToEmergencyNumber("9111", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("1900", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("9996", RegionCode.BR)); - } - - public void testConnectsToEmergencyNumber_AO() { - // Angola doesn't have any metadata for emergency numbers in the test metadata. - assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.AO)); - assertFalse(shortUtil.connectsToEmergencyNumber("222123456", RegionCode.AO)); - assertFalse(shortUtil.connectsToEmergencyNumber("923123456", RegionCode.AO)); - } - - public void testConnectsToEmergencyNumber_ZW() { - // Zimbabwe doesn't have any metadata in the test metadata. - assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.ZW)); - assertFalse(shortUtil.connectsToEmergencyNumber("01312345", RegionCode.ZW)); - assertFalse(shortUtil.connectsToEmergencyNumber("0711234567", RegionCode.ZW)); - } - - public void testIsEmergencyNumber_US() { - assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.US)); - } - - public void testIsEmergencyNumberLongNumber_US() { - assertFalse(shortUtil.isEmergencyNumber("9116666666", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("1126666666", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("9996666666", RegionCode.US)); - } - - public void testIsEmergencyNumberWithFormatting_US() { - assertTrue(shortUtil.isEmergencyNumber("9-1-1", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("*911", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("1-1-2", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("*112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("9-9-9", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("*999", RegionCode.US)); - } - - public void testIsEmergencyNumberWithPlusSign_US() { - assertFalse(shortUtil.isEmergencyNumber("+911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("\uFF0B911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber(" +911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("+112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("+999", RegionCode.US)); - } - - public void testIsEmergencyNumber_BR() { - assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.BR)); - assertTrue(shortUtil.isEmergencyNumber("190", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.BR)); - } - - public void testIsEmergencyNumberLongNumber_BR() { - assertFalse(shortUtil.isEmergencyNumber("9111", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("1900", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("9996", RegionCode.BR)); - } - - public void testIsEmergencyNumber_AO() { - // Angola doesn't have any metadata for emergency numbers in the test metadata. - assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.AO)); - assertFalse(shortUtil.isEmergencyNumber("222123456", RegionCode.AO)); - assertFalse(shortUtil.isEmergencyNumber("923123456", RegionCode.AO)); - } - - public void testIsEmergencyNumber_ZW() { - // Zimbabwe doesn't have any metadata in the test metadata. - assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.ZW)); - assertFalse(shortUtil.isEmergencyNumber("01312345", RegionCode.ZW)); - assertFalse(shortUtil.isEmergencyNumber("0711234567", RegionCode.ZW)); - } -}