diff options
| author | Wei Huang <weih@google.com> | 2009-09-21 14:50:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-21 14:50:01 -0700 |
| commit | 0562eac4639573db3b4ce294e4612e7f4d62b6a8 (patch) | |
| tree | 62372d564cb82a5a34e3fce125dacc4a0d6a8c9f /tests | |
| parent | 6bf39fdbec979908e8a23bf69aa624812d0b377e (diff) | |
| parent | 31a12429b77e87b5047589d251642b975ad35b9a (diff) | |
| download | frameworks_base-0562eac4639573db3b4ce294e4612e7f4d62b6a8.zip frameworks_base-0562eac4639573db3b4ce294e4612e7f4d62b6a8.tar.gz frameworks_base-0562eac4639573db3b4ce294e4612e7f4d62b6a8.tar.bz2 | |
am 31a12429: Merge change 26254 into eclair
Merge commit '31a12429b77e87b5047589d251642b975ad35b9a' into eclair-plus-aosp
* commit '31a12429b77e87b5047589d251642b975ad35b9a':
fix bug 2134685: fix tests for PhoneNumberUtilsTest.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java index 7426d33..20ea4d7 100644 --- a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java +++ b/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java @@ -257,19 +257,19 @@ public class PhoneNumberUtilsTest extends TestCase { @SmallTest public void testToCallerIDIndexable() throws Exception { - assertEquals("14145", PhoneNumberUtils.toCallerIDMinMatch("17005554141")); - assertEquals("14145", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141")); - assertEquals("14145", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141,1234")); - assertEquals("14145", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141;1234")); + assertEquals("1414555", PhoneNumberUtils.toCallerIDMinMatch("17005554141")); + assertEquals("1414555", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141")); + assertEquals("1414555", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141,1234")); + assertEquals("1414555", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-4141;1234")); //this seems wrong, or at least useless - assertEquals("NN145", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-41NN")); + assertEquals("NN14555", PhoneNumberUtils.toCallerIDMinMatch("1-700-555-41NN")); //<shrug> -- these are all not useful, but not terribly wrong assertEquals("", PhoneNumberUtils.toCallerIDMinMatch("")); assertEquals("0032", PhoneNumberUtils.toCallerIDMinMatch("2300")); assertEquals("0032+", PhoneNumberUtils.toCallerIDMinMatch("+2300")); - assertEquals("#130#", PhoneNumberUtils.toCallerIDMinMatch("*#031#")); + assertEquals("#130#*", PhoneNumberUtils.toCallerIDMinMatch("*#031#")); } @SmallTest |