Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-07 12:27:45 +00:00
committed by Android (Google) Code Review

View File

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