commit 4214c6d7079064ebf283909d45602395e321d9b5
author John Wang <johnwang@google.com> Wed Sep 08 18:04:35 2010 -0700
committer John Wang <johnwang@google.com> Wed Sep 08 18:04:35 2010 -0700
tree 579556ed09e0066cdbdf7bb8c12c7f86432ccfe0
parent 35dc79da11639117aab34d3278a7ae90984c0f87

Fix SimUtilsTest after changing in bcdToString.

After changes in IccUtils.bcdToString() to ignore high nibble 'F'

(see change #55090), the testBasic() need to be changed accordingly.

Change-Id: If52a66b1c80b5d16af5bd3f431284e79012be300

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

diff --git a/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
index db38ede..ef62d85 100644
--- a/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
+++ b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
@@ -28,7 +28,7 @@
     public void testBasic() throws Exception {
         byte[] data, data2;
 
-        /* 
+        /*
          * bcdToString()
          */
 
@@ -40,9 +40,13 @@
         assertEquals("0126045001448486", IccUtils.bcdToString(data, 1, data.length - 2));
 
         // Stops on invalid BCD value
-        data = IccUtils.hexStringToBytes("98F062400510444868f2");
+        data = IccUtils.hexStringToBytes("98E062400510444868f2");
         assertEquals("890", IccUtils.bcdToString(data, 0, data.length));
 
+        // skip the high nibble 'F' since some PLMNs have it
+        data = IccUtils.hexStringToBytes("98F062400510444868f2");
+        assertEquals("890260450014484862", IccUtils.bcdToString(data, 0, data.length));
+
         /*
          * gsmBcdByteToInt()
          */