Merge "Fix the failing test case." into jb-ub-mail-ur8

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/src/com/android/mail/browse/SendersFormattingTests.java b/tests/src/com/android/mail/browse/SendersFormattingTests.java
index 70e77b51b..dec742c43 100644
--- a/tests/src/com/android/mail/browse/SendersFormattingTests.java
+++ b/tests/src/com/android/mail/browse/SendersFormattingTests.java
@@ -59,7 +59,7 @@ public class SendersFormattingTests extends AndroidTestCase {
         conv3.addMessage(info4);
         strings = SendersView.format(getContext(), conv, "", 100, new HtmlParser(),
                 new HtmlTreeBuilder());
-        assertEquals(strings.length, 1);
+        assertEquals(1, strings.length);
         assertEquals(strings[0].toString(), "me");
     }
 
@@ -74,7 +74,15 @@ public class SendersFormattingTests extends AndroidTestCase {
         conv.addMessage(info2);
         SpannableString[] strings = SendersView.format(getContext(), conv, "", 100,
                 new HtmlParser(), new HtmlTreeBuilder());
-        assertEquals(strings.length, 1);
-        assertEquals(strings[0].toString(), sender);
+        // We actually don't remove the item, we just set it to null, so count
+        // just the non-null items.
+        int count = 0;
+        for (int i = 0; i < strings.length; i++) {
+            if (strings[i] != null) {
+                count++;
+                assertEquals(strings[i].toString(), sender);
+            }
+        }
+        assertEquals(1, count);
     }
 }