From 7c1fa2c16195098453b3f3bd9c44a1f7a058e356 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 31 Jan 2011 15:41:58 -0800
Subject: [PATCH] Unit test for change Ieec04881 (make sure CC is visible)

Change-Id: Ic6ffbddf80dcbfe39e55d9b579316767a0ff1180
---
 tests/src/com/android/email/TestUtils.java    | 16 +++++++++
 .../email/activity/MessageComposeTests.java   | 35 ++++++++++++++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/tests/src/com/android/email/TestUtils.java b/tests/src/com/android/email/TestUtils.java
index 0697ed83a..ef74d52fe 100644
--- a/tests/src/com/android/email/TestUtils.java
+++ b/tests/src/com/android/email/TestUtils.java
@@ -22,6 +22,8 @@ import android.os.PowerManager;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
+import android.view.View;
+import android.view.ViewParent;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
@@ -159,4 +161,18 @@ public class TestUtils extends TestCase /* It tests itself */ {
         }
         return true;
     }
+
+    public static void assertViewVisible(View v) {
+        if (v == null) {
+            throw new NullPointerException();
+        }
+        for (;;) {
+            assertTrue("visibility for " + v, View.VISIBLE == v.getVisibility());
+            ViewParent parent = v.getParent();
+            if (parent == null || !(parent instanceof View)) {
+                break;
+            }
+            v = (View) parent;
+        }
+    }
 }
diff --git a/tests/src/com/android/email/activity/MessageComposeTests.java b/tests/src/com/android/email/activity/MessageComposeTests.java
index 6a71d7609..8bf685549 100644
--- a/tests/src/com/android/email/activity/MessageComposeTests.java
+++ b/tests/src/com/android/email/activity/MessageComposeTests.java
@@ -54,6 +54,7 @@ public class MessageComposeTests
 
     private MultiAutoCompleteTextView mToView;
     private MultiAutoCompleteTextView mCcView;
+    private MultiAutoCompleteTextView mBccView;
     private EditText mSubjectView;
     private EditText mMessageView;
     private long mCreatedAccountId = -1;
@@ -144,6 +145,7 @@ public class MessageComposeTests
         final MessageCompose a = getActivity();
         mToView = (MultiAutoCompleteTextView) a.findViewById(R.id.to);
         mCcView = (MultiAutoCompleteTextView) a.findViewById(R.id.cc);
+        mBccView = (MultiAutoCompleteTextView) a.findViewById(R.id.bcc);
         mSubjectView = (EditText) a.findViewById(R.id.subject);
         mMessageView = (EditText) a.findViewById(R.id.message_content);
     }
@@ -479,6 +481,8 @@ public class MessageComposeTests
                 String result = Address.parseAndPack(mToView.getText().toString());
                 String expected = Address.parseAndPack(FROM);
                 assertEquals(expected, result);
+
+                // It doesn't harm even if the CC view is visible.
             }
         });
     }
@@ -515,6 +519,7 @@ public class MessageComposeTests
                 result = Address.parseAndPack(mCcView.getText().toString());
                 expected = Address.parseAndPack(CC1 + ',' + CC2 + ',' + CC3);
                 assertEquals(expected, result);
+                TestUtils.assertViewVisible(mCcView);
             }
         });
     }
@@ -551,6 +556,7 @@ public class MessageComposeTests
                 result = Address.parseAndPack(mCcView.getText().toString());
                 expected = Address.parseAndPack(CC1 + ',' + CC3);
                 assertEquals(expected, result);
+                TestUtils.assertViewVisible(mCcView);
             }
         });
     }
@@ -587,6 +593,7 @@ public class MessageComposeTests
                 result = Address.parseAndPack(mCcView.getText().toString());
                 expected = Address.parseAndPack(CC3);
                 assertEquals(expected, result);
+                TestUtils.assertViewVisible(mCcView);
             }
         });
     }
@@ -609,7 +616,8 @@ public class MessageComposeTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.initFromIntent(i2);
-                checkFields(RECIPIENT_TO + ", ", RECIPIENT_CC, RECIPIENT_BCC, SUBJECT, null, null);
+                checkFields(RECIPIENT_TO + ", ", RECIPIENT_CC + ", ", RECIPIENT_BCC + ", ", SUBJECT,
+                        null, null);
                 checkFocused(mMessageView);
             }
         });
@@ -632,8 +640,8 @@ public class MessageComposeTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.initFromIntent(i2);
-                checkFields(UTF16_RECIPIENT_TO + ", ",
-                        UTF16_RECIPIENT_CC, UTF16_RECIPIENT_BCC, UTF16_SUBJECT, null, null);
+                checkFields(UTF16_RECIPIENT_TO + ", ", UTF16_RECIPIENT_CC + ", ",
+                        UTF16_RECIPIENT_BCC + ", ", UTF16_SUBJECT, null, null);
                 checkFocused(mMessageView);
             }
         });
@@ -656,8 +664,8 @@ public class MessageComposeTests
         runTestOnUiThread(new Runnable() {
             public void run() {
                 a.initFromIntent(i2);
-                checkFields(UTF32_RECIPIENT_TO + ", ",
-                        UTF32_RECIPIENT_CC, UTF32_RECIPIENT_BCC, UTF32_SUBJECT, null, null);
+                checkFields(UTF32_RECIPIENT_TO + ", ", UTF32_RECIPIENT_CC + ", ",
+                        UTF32_RECIPIENT_BCC + ", ", UTF32_SUBJECT, null, null);
                 checkFocused(mMessageView);
             }
         });
@@ -733,6 +741,23 @@ public class MessageComposeTests
             assertEquals(0, toText.length());
         } else {
             assertEquals(to, toText);
+            TestUtils.assertViewVisible(mToView);
+        }
+
+        String ccText = mCcView.getText().toString();
+        if (cc == null) {
+            assertEquals(0, ccText.length());
+        } else {
+            assertEquals(cc, ccText);
+            TestUtils.assertViewVisible(mCcView);
+        }
+
+        String bccText = mBccView.getText().toString();
+        if (bcc == null) {
+            assertEquals(0, bccText.length());
+        } else {
+            assertEquals(bcc, bccText);
+            TestUtils.assertViewVisible(mBccView);
         }
 
         String subjectText = mSubjectView.getText().toString();