PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-12 20:49:56 +00:00
committed by Android (Google) Code Review
parent ec3055b9eb 98690197e6
commit 17cbea0112
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
View File

@@ -18,11 +18,13 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import android.content.DialogInterface;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.widget.Button;
@@ -32,6 +34,8 @@ import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
import org.junit.Before;
import org.junit.Test;
@@ -47,12 +51,17 @@ public class NetworkRequestErrorDialogFragmentTest {
private FragmentActivity mActivity;
private NetworkRequestErrorDialogFragment mFragment;
private WifiTracker mWifiTracker;
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(FragmentActivity.class);
mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());
mFragment.show(mActivity.getSupportFragmentManager(), null);
// Prevents NPE when calling up NetworkRequestDialogFragment.
mWifiTracker = mock(WifiTracker.class);
WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
}
@Test
@@ -111,4 +120,17 @@ public class NetworkRequestErrorDialogFragmentTest {
negativeButton.performClick();
assertThat(alertDialog.isShowing()).isFalse();
}
@Test
public void clickNegativeButton_shouldCallReject() {
final NetworkRequestUserSelectionCallback rejectCallback =
mock(NetworkRequestUserSelectionCallback.class);
mFragment.setRejectCallback(rejectCallback);
final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
final Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
negativeButton.performClick();
verify(rejectCallback, times(1)).reject();
}
}