Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89e928ca authored by Steve Statia's avatar Steve Statia
Browse files

Fix PhoneNumberUtilsTest#testFormatSingaporeNational to work with... 

Fix PhoneNumberUtilsTest#testFormatSingaporeNational to work with FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS.

PhoneNumberUtils.formatNumber() originally had a flag for Singaporean number to be formatted and then another flag was added for TW numbers which included a refactor that encompassed Singaporean numbers as well. This was causing the test to fail as it was expecting not to format the number, but did as it was possible to do with two different flags.

Flag: com.android.internal.telephony.flags.national_country_code_formatting_for_local_calls

Bug: 349464585
Bug: 349745908
Test: atest PhoneNumberUtilsTest

Change-Id: Ief94e0201617be5c9570158a6369783b93a3aeb2
parent 51ddfefd

tests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java

+8 −2
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ public class PhoneNumberUtilsTest { 
    public void testFormatSingaporeInternational() {

        // Disable feature flag.

        mSetFlagsRule.disableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);

        mSetFlagsRule.enableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);



        // International call from a US iso

        assertEquals("+65 6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "US"));
@@ -636,6 +637,7 @@ public class PhoneNumberUtilsTest { 
        assertEquals("+65 6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "us"));



        // Enable feature flag

        mSetFlagsRule.disableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);

        mSetFlagsRule.enableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);



        // Internal call from a US iso
@@ -644,6 +646,7 @@ public class PhoneNumberUtilsTest { 
        // Lowercase country iso

        assertEquals("+65 6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "us"));

        mSetFlagsRule.disableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);

        mSetFlagsRule.disableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);

    }



    /**
@@ -655,14 +658,16 @@ public class PhoneNumberUtilsTest { 
    public void testFormatSingaporeNational() {

        // Disable feature flag.

        mSetFlagsRule.disableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);

        mSetFlagsRule.enableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);



        // Local call from a Singaporean number to a Singaporean number

        assertEquals("+65 6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "SG"));

        assertEquals("6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "SG"));



        // Lowercase country iso.

        assertEquals("+65 6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "sg"));

        assertEquals("6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "sg"));



        // Enable feature flag.

        mSetFlagsRule.disableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);

        mSetFlagsRule.enableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);



        // Local call from a Singaporean number to a Singaporean number.
@@ -671,6 +676,7 @@ public class PhoneNumberUtilsTest { 
        // Lowercase country iso.

        assertEquals("6521 8000", PhoneNumberUtils.formatNumber("+6565218000", "sg"));

        mSetFlagsRule.disableFlags(Flags.FLAG_REMOVE_COUNTRY_CODE_FROM_LOCAL_SINGAPORE_CALLS);

        mSetFlagsRule.disableFlags(Flags.FLAG_NATIONAL_COUNTRY_CODE_FORMATTING_FOR_LOCAL_CALLS);

    }



    @SmallTest