From 60204898ecd9d77ccdf390455f632edbd1af033e Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Fri, 6 Mar 2020 10:15:28 -0800
Subject: [PATCH] Fixes ContactDiscoveryDialogFragmentTest

Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
---
 .../ContactDiscoveryDialogFragmentTest.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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 17c121a19b2..6aef69955c6 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 @@ package com.android.settings.network.telephony;
 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.Mock;
 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 @@ public class ContactDiscoveryDialogFragmentTest {
     @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 @@ public class ContactDiscoveryDialogFragmentTest {
 
     private AlertDialog startDialog() {
         mDialogFragmentUT.show(mActivity.getSupportFragmentManager(), null);
-        return ShadowAlertDialogCompat.getLatestAlertDialog();
+        return ShadowAlertDialog.getLatestAlertDialog();
     }
 }