Merge "Add unit test for CdmaSmsAddress"android-o-mr1-iot-preview-6o-mr1-iot-preview-6

2 files changed, 75 insertions, 4 deletions

diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsAddressTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsAddressTest.java
new file mode 100644
index 0000000000..0c706f4d16
--- /dev/null
+++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsAddressTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telephony.cdma.sms;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import android.test.AndroidTestCase;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link CdmaSmsAddress}.
+ */
+public class CdmaSmsAddressTest extends AndroidTestCase {
+    @Test
+    public void testNumberAddress() {
+        String address = "3141592653";
+        CdmaSmsAddress cdmaAddress = CdmaSmsAddress.parse(address);
+        assertEquals(address, cdmaAddress.address);
+        assertEquals(CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF, cdmaAddress.digitMode);
+        assertEquals(CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK, cdmaAddress.numberMode);
+        assertArrayEquals(CdmaSmsAddress.parseToDtmf(address), cdmaAddress.origBytes);
+    }
+
+    @Test
+    public void testNumberWithSugar() {
+        String address = "(314)1592653";
+        CdmaSmsAddress cdmaAddress = CdmaSmsAddress.parse(address);
+        assertEquals(address, cdmaAddress.address);
+        assertEquals(CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF, cdmaAddress.digitMode);
+        assertEquals(CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK, cdmaAddress.numberMode);
+        assertArrayEquals(CdmaSmsAddress.parseToDtmf("3141592653"), cdmaAddress.origBytes);
+    }
+
+    @Test
+    public void testInternationalAddress() {
+        String address = "+10068";
+        CdmaSmsAddress cdmaAddress = CdmaSmsAddress.parse(address);
+        assertEquals(address, cdmaAddress.address);
+        assertEquals(CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR, cdmaAddress.digitMode);
+        assertEquals(CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK, cdmaAddress.numberMode);
+        assertEquals(CdmaSmsAddress.NUMBERING_PLAN_ISDN_TELEPHONY, cdmaAddress.numberPlan);
+        assertEquals(CdmaSmsAddress.TON_INTERNATIONAL_OR_IP, cdmaAddress.ton);
+        assertArrayEquals(UserData.stringToAscii("10068"), cdmaAddress.origBytes);
+    }
+
+    @Test
+    public void testEmailAddress() {
+        String address = "fb769394+10086@tvb.com";
+        CdmaSmsAddress cdmaAddress = CdmaSmsAddress.parse(address);
+        assertEquals(address, cdmaAddress.address);
+        assertEquals(CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR, cdmaAddress.digitMode);
+        assertEquals(CdmaSmsAddress.NUMBER_MODE_DATA_NETWORK, cdmaAddress.numberMode);
+        assertEquals(CdmaSmsAddress.TON_NATIONAL_OR_EMAIL, cdmaAddress.ton);
+        assertArrayEquals(UserData.stringToAscii(address), cdmaAddress.origBytes);
+    }
+}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
index 6f60e64202..2e8c34b0ea 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
@@ -77,13 +77,13 @@ public class CdmaSmsTest extends AndroidTestCase {
         }
         addr = CdmaSmsAddress.parse("(+886) 917 222 555");
         assertEquals(addr.ton, CdmaSmsAddress.TON_INTERNATIONAL_OR_IP);
-        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF);
+        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR);
         assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK);
         assertEquals(addr.numberOfDigits, 12);
         assertEquals(addr.origBytes.length, 12);
-        byte[] data3 = {8, 8, 6, 9, 1, 7, 2, 2, 2, 5, 5, 5};
-        for (int i = 0; i < data3.length; i++) {
-            assertEquals(addr.origBytes[i], data3[i]);
+        String expectedAddr = "886917222555";
+        for (int i = 0; i < addr.numberOfDigits; i++) {
+            assertEquals((int) expectedAddr.charAt(i), addr.origBytes[i]);
         }
         addr = CdmaSmsAddress.parse("(650) *253-1000 #600");
         byte[] data4 = {6, 5, 10, 11, 2, 5, 3, 1, 10, 10, 10, 12, 6, 10, 10};