am b89cfb0f: Merge change 26566 into eclair

Merge commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9' into eclair-plus-aosp

* commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9':
  Conditionalized CDMA-specific test.

1 files changed, 12 insertions, 4 deletions

diff --git a/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
index 98d4c25..4a77e19 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
@@ -16,6 +16,8 @@
 
 package com.android.unit_tests;
 
+import android.telephony.TelephonyManager;
+
 import com.android.internal.telephony.GsmAlphabet;
 import com.android.internal.telephony.SmsHeader;
 import com.android.internal.telephony.cdma.SmsMessage;
@@ -820,6 +822,8 @@ public class CdmaSmsTest extends AndroidTestCase {
 
     @SmallTest
     public void testFragmentText() throws Exception {
+        boolean isCdmaPhone = (TelephonyManager.getDefault().getPhoneType() ==
+                TelephonyManager.PHONE_TYPE_CDMA);
         // Valid 160 character ASCII text.
         String text1 = "123456789012345678901234567890123456789012345678901234567890" +
                 "1234567890123456789012345678901234567890123456789012345678901234567890" +
@@ -828,8 +832,10 @@ public class CdmaSmsTest extends AndroidTestCase {
         assertEquals(ted.msgCount, 1);
         assertEquals(ted.codeUnitCount, 160);
         assertEquals(ted.codeUnitSize, 1);
-        ArrayList<String> fragments = android.telephony.SmsMessage.fragmentText(text1);
-        assertEquals(fragments.size(), 1);
+        if (isCdmaPhone) {
+            ArrayList<String> fragments = android.telephony.SmsMessage.fragmentText(text1);
+            assertEquals(fragments.size(), 1);
+        }
         // Valid 160 character GSM text -- the last character is
         // non-ASCII, and so this will currently generate a singleton
         // EMS message, which is not necessarily supported by Verizon.
@@ -840,7 +846,9 @@ public class CdmaSmsTest extends AndroidTestCase {
         assertEquals(ted.msgCount, 1);
         assertEquals(ted.codeUnitCount, 160);
         assertEquals(ted.codeUnitSize, 1);
-        fragments = android.telephony.SmsMessage.fragmentText(text2);
-        assertEquals(fragments.size(), 1);
+        if (isCdmaPhone) {
+            ArrayList<String> fragments = android.telephony.SmsMessage.fragmentText(text2);
+            assertEquals(fragments.size(), 1);
+        }
     }
 }