summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-21 17:43:20 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-21 17:43:20 -0400
commit31a12429b77e87b5047589d251642b975ad35b9a (patch)
tree31a97cca3b904f12ed6a987faf43a018401d029b /tests
parentc2f97178acaf9c406067b9b89776b87ddf9c8558 (diff)
parent35fd2e58536f83010bb385deba28068002c877b6 (diff)
downloadframeworks_base-31a12429b77e87b5047589d251642b975ad35b9a.zip
frameworks_base-31a12429b77e87b5047589d251642b975ad35b9a.tar.gz
frameworks_base-31a12429b77e87b5047589d251642b975ad35b9a.tar.bz2
Merge change 26254 into eclair
* changes: fix bug 2134685: fix tests for PhoneNumberUtilsTest.
Diffstat (limited to 'tests')
-rw-r--r--tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java12
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