commit f660f826c9f2607ccdb8729ca9026015df0d654b
author Chris Banes <chrisbanes@google.com> Wed Jun 22 09:36:21 2016 +0100
committer Chris Banes <chrisbanes@google.com> Wed Jun 22 09:36:21 2016 +0100
tree 006304e19fcebd8e5f40276870a950cdf9220298
parent 966dfa6935a1c219b0e9dbcf655d380a72c5d389

Fix TextInputLayout password tests

BUG: 29550300
Change-Id: I134f657ba10d09201a6f63e49392f37120c6c754

design/tests/src/android/support/design/widget/TextInputLayoutTest.java

diff --git a/design/tests/src/android/support/design/widget/TextInputLayoutTest.java b/design/tests/src/android/support/design/widget/TextInputLayoutTest.java
index d612932..d5236a4 100755
--- a/design/tests/src/android/support/design/widget/TextInputLayoutTest.java
+++ b/design/tests/src/android/support/design/widget/TextInputLayoutTest.java
@@ -82,7 +82,6 @@
     }
 
     @Test
-    @UiThreadTest
     public void testPasswordToggleClick() {
         // Set some text on the EditText
         onView(withId(R.id.textinput_edittext_pwd)).perform(setText(INPUT_TEXT));
@@ -91,17 +90,16 @@
         final EditText textInput = (EditText) activity.findViewById(R.id.textinput_edittext_pwd);
 
         // Assert that the password is disguised
-        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText());
+        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
 
         // Now click the toggle button
         onView(withId(R.id.text_input_password_toggle)).perform(click());
 
         // And assert that the password is not disguised
-        assertEquals(INPUT_TEXT, textInput.getLayout().getText());
+        assertEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
     }
 
     @Test
-    @UiThreadTest
     public void testPasswordToggleDisable() {
         final Activity activity = mActivityTestRule.getActivity();
         final EditText textInput = (EditText) activity.findViewById(R.id.textinput_edittext_pwd);
@@ -109,15 +107,35 @@
         // Set some text on the EditText
         onView(withId(R.id.textinput_edittext_pwd)).perform(setText(INPUT_TEXT));
         // Assert that the password is disguised
-        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText());
+        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
 
         // Disable the password toggle
-        onView(withId(R.id.text_input_password_toggle))
+        onView(withId(R.id.textinput_password))
                 .perform(setPasswordVisibilityToggleEnabled(false));
 
         // Check that the password toggle view is not visible
         onView(withId(R.id.text_input_password_toggle)).check(matches(not(isDisplayed())));
-        // ...and that the password is not disguised
-        assertEquals(INPUT_TEXT, textInput.getLayout().getText());
+        // ...and that the password is disguised still
+        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
+    }
+
+    @Test
+    public void testPasswordToggleDisableWhenVisible() {
+        final Activity activity = mActivityTestRule.getActivity();
+        final EditText textInput = (EditText) activity.findViewById(R.id.textinput_edittext_pwd);
+
+        // Set some text on the EditText
+        onView(withId(R.id.textinput_edittext_pwd)).perform(setText(INPUT_TEXT));
+        // Assert that the password is disguised
+        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
+
+        // Now click the toggle button
+        onView(withId(R.id.text_input_password_toggle)).perform(click());
+        // Disable the password toggle
+        onView(withId(R.id.textinput_password))
+                .perform(setPasswordVisibilityToggleEnabled(false));
+
+        // Check that the password is disguised again
+        assertNotEquals(INPUT_TEXT, textInput.getLayout().getText().toString());
     }
 }