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

import android.widget.EditText;

import android.widget.EditText;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mock;

import org.robolectric.util.ReflectionHelpers;

import org.robolectric.util.ReflectionHelpers;

@RunWith(SettingsLibRobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

@Ignore

public class CustomEditTextPreferenceTest {

public class CustomEditTextPreferenceTest {

    @Mock

    @Mock

    }

    }

    @Test

    @Test

    @Ignore

    public void bindDialogView_shouldRequestFocus() {

    public void bindDialogView_shouldRequestFocus() {

        final String testText = "";

        final String testText = "";

        final EditText editText = spy(new EditText(RuntimeEnvironment.application));

        final EditText editText = spy(new EditText(RuntimeEnvironment.application));

    }

    }

    @Test

    @Test

    @Ignore

    public void getEditText_noDialog_shouldNotCrash() {

    public void getEditText_noDialog_shouldNotCrash() {

        ReflectionHelpers.setField(mPreference, "mFragment",

        ReflectionHelpers.setField(mPreference, "mFragment",

                mock(CustomEditTextPreference.CustomPreferenceDialogFragment.class));

                mock(CustomEditTextPreference.CustomPreferenceDialogFragment.class));