Browse Source

Removing whitespaces from files.

pull/567/head
Shaopeng Jia 16 years ago
committed by Mihaela Rosca
parent
commit
8a2709c849
2 changed files with 7 additions and 9 deletions
  1. +2
    -2
      java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
  2. +5
    -7
      java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java

+ 2
- 2
java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java View File

@ -1381,14 +1381,14 @@ public class PhoneNumberUtil {
throws NumberParseException { throws NumberParseException {
if (number.length() == 0) { if (number.length() == 0) {
return 0; return 0;
}
}
StringBuffer fullNumber = new StringBuffer(number); StringBuffer fullNumber = new StringBuffer(number);
// Set the default prefix to be something that will never match. // Set the default prefix to be something that will never match.
String possibleCountryIddPrefix = "NonMatch"; String possibleCountryIddPrefix = "NonMatch";
if (defaultRegionMetadata != null) { if (defaultRegionMetadata != null) {
possibleCountryIddPrefix = defaultRegionMetadata.getInternationalPrefix(); possibleCountryIddPrefix = defaultRegionMetadata.getInternationalPrefix();
} }
CountryCodeSource countryCodeSource = CountryCodeSource countryCodeSource =
maybeStripInternationalPrefixAndNormalize(fullNumber, possibleCountryIddPrefix); maybeStripInternationalPrefixAndNormalize(fullNumber, possibleCountryIddPrefix);
if (storeCountryCodeSource) { if (storeCountryCodeSource) {


+ 5
- 7
java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java View File

@ -104,8 +104,6 @@ public class PhoneNumberUtilTest extends TestCase {
assertEquals("900([135]\\d{6}|9\\d{7})", metadata.getPremiumRate().getNationalNumberPattern()); assertEquals("900([135]\\d{6}|9\\d{7})", metadata.getPremiumRate().getNationalNumberPattern());
} }
public void testGetInstanceLoadARMetadata() { public void testGetInstanceLoadARMetadata() {
PhoneMetadata metadata = phoneUtil.getMetadataForRegion("AR"); PhoneMetadata metadata = phoneUtil.getMetadataForRegion("AR");
assertEquals("AR", metadata.getId()); assertEquals("AR", metadata.getId());
@ -122,7 +120,7 @@ public class PhoneNumberUtilTest extends TestCase {
assertEquals("$1 $2 $3 $4", metadata.getIntlNumberFormat(3).getFormat()); assertEquals("$1 $2 $3 $4", metadata.getIntlNumberFormat(3).getFormat());
} }
public void testGetLengthOfGeographicalAreaCode() {
public void testGetLengthOfGeographicalAreaCode() {
// Google MTV, which has area code "650". // Google MTV, which has area code "650".
PhoneNumber usNumber1 = PhoneNumber usNumber1 =
PhoneNumber.newBuilder().setCountryCode(1).setNationalNumber(6502530000L).build(); PhoneNumber.newBuilder().setCountryCode(1).setNationalNumber(6502530000L).build();
@ -176,7 +174,8 @@ public class PhoneNumberUtilTest extends TestCase {
// An Italian fixed line number. // An Italian fixed line number.
PhoneNumber itNumber2 = PhoneNumber itNumber2 =
PhoneNumber.newBuilder().setCountryCode(39).setNationalNumber(236618300L).setItalianLeadingZero(true).build();
PhoneNumber.newBuilder().setCountryCode(39).setNationalNumber(236618300L)
.setItalianLeadingZero(true).build();
assertEquals("0236618300", PhoneNumberUtil.getNationalSignificantNumber(itNumber2)); assertEquals("0236618300", PhoneNumberUtil.getNationalSignificantNumber(itNumber2));
} }
@ -1054,7 +1053,7 @@ public class PhoneNumberUtilTest extends TestCase {
phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true, phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true,
number)); number));
assertEquals("Did not figure out CountryCodeSource correctly", assertEquals("Did not figure out CountryCodeSource correctly",
CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN, number.getCountryCodeSource());
CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN, number.getCountryCodeSource());
} catch (NumberParseException e) { } catch (NumberParseException e) {
fail("Should not have thrown an exception: " + e.toString()); fail("Should not have thrown an exception: " + e.toString());
} }
@ -1172,8 +1171,7 @@ public class PhoneNumberUtilTest extends TestCase {
// possible. // possible.
PhoneNumber usNumber = PhoneNumber usNumber =
PhoneNumber.newBuilder().setCountryCode(1).setNationalNumber(1234567890L).build(); PhoneNumber.newBuilder().setCountryCode(1).setNationalNumber(1234567890L).build();
assertEquals(usNumber, phoneUtil.parse("123-456-7890", "US"));
assertEquals(usNumber, phoneUtil.parse("123-456-7890", "US"));
} }
public void testParseNumberWithAlphaCharacters() throws Exception { public void testParseNumberWithAlphaCharacters() throws Exception {


Loading…
Cancel
Save