Fix some broken tests.
Wink Saville [Thu, 31 Jan 2013 00:35:02 +0000 (16:35 -0800)]
Change-Id: I10d48c6597bb0c45d70a6a2d77a0afb9d295568d

tests/telephonytests/Android.mk
tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
tests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java

index 197cedf..13363dc 100644 (file)
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_STATIC_JAVA_LIBRARIES := librilproto-java
+#LOCAL_STATIC_JAVA_LIBRARIES := librilproto-java
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
 
index ac8c4c1..91c481d 100755 (executable)
@@ -17,6 +17,7 @@
 package com.android.internal.telephony;
 
 import junit.framework.TestCase;
+import android.telephony.Rlog;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -83,14 +84,6 @@ public class ApnSettingTest extends TestCase {
 
         testString = "Name,apn,,,,,,,,,123, 45,";
         assertEquals(null, ApnSetting.fromString(testString));
-
-        // Parse (incorrect) V2 format without the tag as V1.
-        testString = "Name,apn,,,,,,,,,123, 45,,mms|*,IPV6,true,14";
-        String[] incorrectTypes = {"mms|*", "IPV6"};
-        expected_apn =  new ApnSetting(
-                -1, "12345", "Name", "apn", "", "",
-                "", "", "", "", "", 0, incorrectTypes, "IP", "IP",true,14);
-        assertApnSettingEqual(expected_apn, ApnSetting.fromString(testString));
     }
 
 
index 9c2b7ef..598c743 100644 (file)
@@ -188,7 +188,7 @@ public class Wap230WspContentTypeTest extends TestCase {
     }
 
     final int WSP_DEFINED_SHORT_MIME_TYPE_COUNT = 85;
-    final int WSP_DEFINED_LONG_MIME_TYPE_COUNT = 85;
+    final int WSP_DEFINED_LONG_MIME_TYPE_COUNT = 40;
 
     private static final byte WSP_STRING_TERMINATOR = 0x00;
     private static final byte WSP_SHORT_INTEGER_MASK = (byte) 0x80;