diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-03-15 15:17:20 -0700 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2016-03-15 15:34:31 -0700 |
commit | b1e450864849436c7c7708ceca5c8f4142492c68 (patch) | |
tree | 9fecc2f5d55de0afee807155af1074f3a44b133c /tests/src/com/android | |
parent | aae1559613cc24ad1d960b550c15af9f61675f38 (diff) |
Keeping migration dialog up while migration in progress
+ This CL ensures that while the migration work is in progress, the
MigrateDialogFragment remains visible, with its buttons greyed out.
Bug: 26664600
Change-Id: Ied32d05fac46b700f14aee06d383fd2db2fa7913
Diffstat (limited to 'tests/src/com/android')
-rw-r--r-- | tests/src/com/android/dialer/filterednumber/MigrateBlockedNumbersDialogFragmentInstrumentationTest.java | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/tests/src/com/android/dialer/filterednumber/MigrateBlockedNumbersDialogFragmentInstrumentationTest.java b/tests/src/com/android/dialer/filterednumber/MigrateBlockedNumbersDialogFragmentInstrumentationTest.java index 16b6f3fac..0bfa6bcb2 100644 --- a/tests/src/com/android/dialer/filterednumber/MigrateBlockedNumbersDialogFragmentInstrumentationTest.java +++ b/tests/src/com/android/dialer/filterednumber/MigrateBlockedNumbersDialogFragmentInstrumentationTest.java @@ -16,12 +16,9 @@ package com.android.dialer.filterednumber; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import android.app.AlertDialog; import android.app.DialogFragment; +import android.content.ContentResolver; import android.content.DialogInterface; import android.test.ActivityInstrumentationTestCase2; @@ -40,9 +37,8 @@ public class MigrateBlockedNumbersDialogFragmentInstrumentationTest extends private static final String SHOW_TAG = "ShowTag"; - @Mock private BlockedNumbersMigrator mBlockedNumbersMigrator; + private BlockedNumbersMigrator mBlockedNumbersMigrator; @Mock private Listener mListener; - private DialtactsActivity mActivity; private DialogFragment mMigrateDialogFragment; public MigrateBlockedNumbersDialogFragmentInstrumentationTest() { @@ -53,13 +49,14 @@ public class MigrateBlockedNumbersDialogFragmentInstrumentationTest extends public void setUp() throws Exception { super.setUp(); MockitoAnnotations.initMocks(this); - mActivity = getActivity(); + mBlockedNumbersMigrator = new SynchronousBlockedNumbersMigrator( + getActivity().getContentResolver()); mMigrateDialogFragment = MigrateBlockedNumbersDialogFragment .newInstance(mBlockedNumbersMigrator, mListener); getInstrumentation().runOnMainSync(new Runnable() { @Override public void run() { - mMigrateDialogFragment.show(mActivity.getFragmentManager(), SHOW_TAG); + mMigrateDialogFragment.show(getActivity().getFragmentManager(), SHOW_TAG); } }); getInstrumentation().waitForIdleSync(); @@ -70,7 +67,6 @@ public class MigrateBlockedNumbersDialogFragmentInstrumentationTest extends } public void testDialogPositiveButtonPress() { - when(mBlockedNumbersMigrator.migrate(mListener)).thenReturn(true); getInstrumentation().runOnMainSync(new Runnable() { @Override public void run() { @@ -81,6 +77,17 @@ public class MigrateBlockedNumbersDialogFragmentInstrumentationTest extends getInstrumentation().waitForIdleSync(); // Dialog was dismissed assertNull(mMigrateDialogFragment.getDialog()); - verify(mBlockedNumbersMigrator).migrate(mListener); + } + + private static class SynchronousBlockedNumbersMigrator extends BlockedNumbersMigrator { + public SynchronousBlockedNumbersMigrator(ContentResolver contentResolver) { + super(contentResolver); + } + + @Override + public boolean migrate(BlockedNumbersMigrator.Listener listener) { + listener.onComplete(); + return true; + } } } |