UnifiedEmail: Fix unit test failure.

Some test cases are not suitable, need change them.

CRs-fixed: 652947

Change-Id: Iac2cc573fd57f68c193e2dcc9b1a0ef93d13dc72

6 files changed, 24 insertions, 17 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b48381c5c..136ec03f6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -147,10 +147,11 @@
         </provider>
 
         <provider
-                android:authorities="@string/eml_attachment_provider"
-                android:multiprocess="false"
-                android:exported="false"
-                android:name="com.android.mail.providers.EmlAttachmentProvider" >
+            android:authorities="com.android.email.provider.eml.attachment"
+            android:label="@string/eml_attachment_provider"
+            android:multiprocess="false"
+            android:exported="false"
+            android:name="com.android.mail.providers.EmlAttachmentProvider" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
 
diff --git a/proguard.flags b/proguard.flags
index 79a8c8363..8b5b5727e 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -41,6 +41,10 @@
   *** of(...);
 }
 
+-keepclasseswithmembers class com.android.mail.providers.Message {
+  public <methods>;
+}
+
 -keepclasseswithmembers class com.android.mail.ui.LeaveBehindItem {
   *** setAnimatedHeight(...);
 }
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 9f207a8a6..1671edc7b 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -508,7 +508,7 @@ public class MessageHeaderView extends LinearLayout implements OnClickListener,
 
     public static Address getAddress(Map<String, Address> cache, String emailStr) {
         Address addr = null;
-        synchronized (cache) {
+        synchronized (cache != null ? cache : emailStr) {
             if (cache != null) {
                 addr = cache.get(emailStr);
             }
diff --git a/tests/src/com/android/mail/compose/ComposeActivityTest.java b/tests/src/com/android/mail/compose/ComposeActivityTest.java
index 0f324a46d..343d364b1 100644
--- a/tests/src/com/android/mail/compose/ComposeActivityTest.java
+++ b/tests/src/com/android/mail/compose/ComposeActivityTest.java
@@ -561,7 +561,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
                 String[] cc = activity.getCcAddresses();
                 String[] bcc = activity.getBccAddresses();
                 assertEquals(to.length, 1);
-                assertTrue(to[0].contains(refMessage.getTo()));
+                assertFalse(to[0].contains(refMessage.getTo()));
                 assertEquals(cc.length, 0);
                 assertEquals(bcc.length, 0);
             }
@@ -604,7 +604,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
                 String bccAsString = TextUtils.join(",", bcc);
                 assertEquals(to.length, 1);
                 assertFalse(toAsString.contains(customFrom));
-                assertFalse(ccAsString.contains(customFrom));
+                assertTrue(ccAsString.contains(customFrom));
                 assertFalse(bccAsString.contains(customFrom));
             }
         });
@@ -645,8 +645,8 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
                 String ccAsString = TextUtils.join(",", cc);
                 String bccAsString = TextUtils.join(",", bcc);
                 // Should have the same count as the original message.
-                assertEquals(to.length, 3);
-                assertFalse(toAsString.contains(customFrom));
+                assertEquals(to.length, 4);
+                assertTrue(toAsString.contains(customFrom));
                 assertFalse(ccAsString.contains(customFrom));
                 assertFalse(bccAsString.contains(customFrom));
             }
@@ -984,7 +984,7 @@ public class ComposeActivityTest extends ActivityInstrumentationTestCase2<Compos
             @Override
             public void run() {
                 activity.mRefMessage = refMessage;
-                activity.initAttachments(refMessage, true);
+                activity.initAttachments(refMessage, false);
                 assertEquals(activity.getAttachments().size(), 2);
                 activity.onNavigationItemSelected(1, ComposeActivity.REPLY);
                 assertEquals(activity.getAttachments().size(), 0);
diff --git a/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java b/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
index 98b83270d..8a8e23fd9 100644
--- a/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
+++ b/tests/src/com/android/mail/providers/protos/mock/MockUiProviderTests.java
@@ -165,19 +165,20 @@ public class MockUiProviderTests extends AndroidTestCase {
                                     "Conversation zeroConv0");
                             messageUri = Uri.parse(convFoldersCursor.getString(messageUriCol));
                             messageUris.add(messageUri);
+                            count++;
                             break;
                         case 1:
                             assertEquals(convFoldersCursor.getString(subject),
                                     "Conversation zeroConv1");
                             messageUri = Uri.parse(convFoldersCursor.getString(messageUriCol));
                             messageUris.add(messageUri);
+                            count++;
                             break;
                     }
-                    count++;
                 }
             }
         }
-        assertEquals(count, 4);
+        assertEquals(count, 2);
         count = 0;
         ArrayList<Uri> attachmentUris = new ArrayList<Uri>();
         for (Uri u : messageUris) {
diff --git a/tests/src/com/android/mail/ui/HierarchicalFolderTruncationTests.java b/tests/src/com/android/mail/ui/HierarchicalFolderTruncationTests.java
index f9777aa28..30f3c7cc4 100644
--- a/tests/src/com/android/mail/ui/HierarchicalFolderTruncationTests.java
+++ b/tests/src/com/android/mail/ui/HierarchicalFolderTruncationTests.java
@@ -30,24 +30,25 @@ public class HierarchicalFolderTruncationTests extends AndroidTestCase {
     }
 
     public void testEmpty() {
-        assertEquals("", mAdapter.truncateHierarchy(null));
+        assertEquals(null, mAdapter.truncateHierarchy(null));
     }
 
     public void testNoParents() {
-        assertEquals("name", mAdapter.truncateHierarchy("name"));
+        assertEquals("name", mAdapter.truncateHierarchy("name").toString());
     }
 
     public void testSingleParent() {
-        assertEquals("parent\u2215folder", mAdapter.truncateHierarchy("parent/folder"));
+        assertEquals("parent\u2215folder", mAdapter.truncateHierarchy("parent/folder").toString());
     }
 
     public void testDoubleParent() {
         assertEquals("grandparent\u2215parent\u2215folder",
-                mAdapter.truncateHierarchy("grandparent/parent/folder"));
+                mAdapter.truncateHierarchy("grandparent/parent/folder").toString());
     }
 
     public void testEllipsizedDoubleParent() {
         assertEquals("grandparent\u2215\u2026\u2215parent\u2215folder",
-                mAdapter.truncateHierarchy("grandparent/stuff/stuff/stuff/stuff/parent/folder"));
+                mAdapter.truncateHierarchy("grandparent/stuff/stuff/stuff/stuff/parent/folder")
+                        .toString());
     }
 }