commit d7b6a384a5914761f9819c28bdd8f998a6d07ad1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 23 06:29:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 23 06:29:26 2018 +0000
tree 56b6b10124c05eba7d853c6739515c37b5419536
parent 920c565264ecb6da3dc520576f506515cfd57ae2
parent 7fec7db2571e785fc4525a8e30724459b61b0e6e

Merge "Revert "Comment out CustomEditTextPreferenceTest which is failing...""

packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java

diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java
index f50c0a4..9d7f59a 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java
@@ -26,7 +26,6 @@
 import android.widget.EditText;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -35,7 +34,6 @@
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsLibRobolectricTestRunner.class)
-@Ignore
 public class CustomEditTextPreferenceTest {
 
     @Mock
@@ -50,7 +48,6 @@
     }
 
     @Test
-    @Ignore
     public void bindDialogView_shouldRequestFocus() {
         final String testText = "";
         final EditText editText = spy(new EditText(RuntimeEnvironment.application));
@@ -63,7 +60,6 @@
     }
 
     @Test
-    @Ignore
     public void getEditText_noDialog_shouldNotCrash() {
         ReflectionHelpers.setField(mPreference, "mFragment",
                 mock(CustomEditTextPreference.CustomPreferenceDialogFragment.class));