Fix broken Bluetooth tests.

Change-Id: Ia8c5ffc58a1154289011aaed628a0e23994b2aa3

diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
index 9e318c6..d5e959f 100644 (file)
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
@@ -23,9 +23,15 @@ public class BluetoothMapContentTest extends AndroidTestCase {
     private static final boolean D = true;
     private static final boolean V = true;
 
-    private Context mContext;
     private ContentResolver mResolver;
 
+    @Override
+    public void setUp() {
+        mResolver = mContext.getContentResolver();
+        // For init of Message.CONTENT_URI.
+        Message.initMessage();
+    }
+
     static final String[] EMAIL_PROJECTION = new String[] {
         EmailContent.RECORD_ID,
         MessageColumns.DISPLAY_NAME, MessageColumns.TIMESTAMP,
@@ -84,9 +90,9 @@ public class BluetoothMapContentTest extends AndroidTestCase {
             while (c.moveToNext()) {
                 printEmail(c);
             }
+            c.close();
         } else {
             Log.d(TAG, "query failed");
-            c.close();
         }
     }
 
@@ -95,8 +101,6 @@ public class BluetoothMapContentTest extends AndroidTestCase {
     }
 
     public void testDumpMessages() {
-        mContext = this.getContext();
-        mResolver = mContext.getContentResolver();
         dumpEmailMessageTable();
     }
 }

diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
index 1fcec4e..01d75f7 100755 (executable)
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
@@ -448,10 +448,13 @@ public class BluetoothMapbMessageTest extends AndroidTestCase {
                             "EMAIL:bonde@email.add\r\n" +
                         "END:VCARD\r\n" +
                         "BEGIN:BBODY\r\n" +
-                            "CHARSET:UTF-8\r\n" +
-                            "LENGTH:45\r\n" +
+                            "LENGTH:184\r\n" +
                             "BEGIN:MSG\r\n" +
-                                "This is a short message\r\n" +
+                                "From: \"Jørn Hansen\" <bonde@email.add>;\r\n" +
+                                "To: \"Jørn Hansen\" <bonde@email.add>;\r\n" +
+                                "Cc: Jens Hansen <bonde@email.add>;\r\n\r\n" +
+                                "This is a short message\r\n\r\n" +
+                                "<partNameimage>\r\n\r\n" +
                             "END:MSG\r\n" +
                         "END:BBODY\r\n" +
                     "END:BENV\r\n" +