Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragmentTest.java
index 17c121a..6aef699 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragmentTest.java
@@ -19,22 +19,21 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import android.app.AlertDialog;
import android.content.DialogInterface;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsRcsManager;
import android.telephony.ims.RcsUceAdapter;
import android.widget.Button;
-import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,8 +41,11 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowAlertDialog.class)
public class ContactDiscoveryDialogFragmentTest {
private static final int TEST_SUB_ID = 2;
@@ -67,15 +69,17 @@
@Test
public void testCancelDoesNothing() throws Exception {
final AlertDialog dialog = startDialog();
+ assertThat(dialog).isNotNull();
final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
assertThat(negativeButton).isNotNull();
negativeButton.performClick();
- verify(mRcsUceAdapter, never()).setUceSettingEnabled(any());
+ verify(mRcsUceAdapter, never()).setUceSettingEnabled(anyBoolean());
}
@Test
public void testOkEnablesDiscovery() throws Exception {
final AlertDialog dialog = startDialog();
+ assertThat(dialog).isNotNull();
final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
assertThat(positiveButton).isNotNull();
positiveButton.performClick();
@@ -84,6 +88,6 @@
private AlertDialog startDialog() {
mDialogFragmentUT.show(mActivity.getSupportFragmentManager(), null);
- return ShadowAlertDialogCompat.getLatestAlertDialog();
+ return ShadowAlertDialog.getLatestAlertDialog();
}
}