Fix WifiDialogActivityTest broken
- The ShadowWifiManager class is not working as expected - Use Mockito class instead of Shadow class Bug: 175369329 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest Change-Id: Idbc851c4d9702be23561c2c48c9d7d077e5f452e
This commit is contained in:
@@ -105,6 +105,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
private Intent mIntent;
|
private Intent mIntent;
|
||||||
private NetworkDetailsTracker mNetworkDetailsTracker;
|
private NetworkDetailsTracker mNetworkDetailsTracker;
|
||||||
private HandlerThread mWorkerThread;
|
private HandlerThread mWorkerThread;
|
||||||
|
private WifiManager mWifiManager;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@@ -150,22 +151,12 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
if (mDialog2 != null || mDialog != null) {
|
if (mDialog2 != null || mDialog != null || !hasWifiManager()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
|
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
|
||||||
final int targetStyle = ThemeHelper.isSetupWizardDayNightEnabled(this)
|
createDialogWithSuwTheme();
|
||||||
? R.style.SuwAlertDialogThemeCompat_DayNight :
|
|
||||||
R.style.SuwAlertDialogThemeCompat_Light;
|
|
||||||
if (mIsWifiTrackerLib) {
|
|
||||||
mDialog2 = WifiDialog2.createModal(this, this,
|
|
||||||
mNetworkDetailsTracker.getWifiEntry(),
|
|
||||||
WifiConfigUiBase2.MODE_CONNECT, targetStyle);
|
|
||||||
} else {
|
|
||||||
mDialog = WifiDialog.createModal(this, this, mAccessPoint,
|
|
||||||
WifiConfigUiBase.MODE_CONNECT, targetStyle);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (mIsWifiTrackerLib) {
|
if (mIsWifiTrackerLib) {
|
||||||
mDialog2 = WifiDialog2.createModal(this, this,
|
mDialog2 = WifiDialog2.createModal(this, this,
|
||||||
@@ -177,11 +168,30 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mIsWifiTrackerLib) {
|
if (mIsWifiTrackerLib) {
|
||||||
mDialog2.show();
|
if (mDialog2 != null) {
|
||||||
mDialog2.setOnDismissListener(this);
|
mDialog2.show();
|
||||||
|
mDialog2.setOnDismissListener(this);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
mDialog.show();
|
if (mDialog != null) {
|
||||||
mDialog.setOnDismissListener(this);
|
mDialog.show();
|
||||||
|
mDialog.setOnDismissListener(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
protected void createDialogWithSuwTheme() {
|
||||||
|
final int targetStyle = ThemeHelper.isSetupWizardDayNightEnabled(this)
|
||||||
|
? R.style.SuwAlertDialogThemeCompat_DayNight :
|
||||||
|
R.style.SuwAlertDialogThemeCompat_Light;
|
||||||
|
if (mIsWifiTrackerLib) {
|
||||||
|
mDialog2 = WifiDialog2.createModal(this, this,
|
||||||
|
mNetworkDetailsTracker.getWifiEntry(),
|
||||||
|
WifiConfigUiBase2.MODE_CONNECT, targetStyle);
|
||||||
|
} else {
|
||||||
|
mDialog = WifiDialog.createModal(this, this, mAccessPoint,
|
||||||
|
WifiConfigUiBase.MODE_CONNECT, targetStyle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,21 +231,21 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onForget(WifiDialog dialog) {
|
public void onForget(WifiDialog dialog) {
|
||||||
final WifiManager wifiManager = getSystemService(WifiManager.class);
|
if (!hasWifiManager()) return;
|
||||||
final AccessPoint accessPoint = dialog.getController().getAccessPoint();
|
final AccessPoint accessPoint = dialog.getController().getAccessPoint();
|
||||||
if (accessPoint != null) {
|
if (accessPoint != null) {
|
||||||
if (!accessPoint.isSaved()) {
|
if (!accessPoint.isSaved()) {
|
||||||
if (accessPoint.getNetworkInfo() != null &&
|
if (accessPoint.getNetworkInfo() != null &&
|
||||||
accessPoint.getNetworkInfo().getState() != NetworkInfo.State.DISCONNECTED) {
|
accessPoint.getNetworkInfo().getState() != NetworkInfo.State.DISCONNECTED) {
|
||||||
// Network is active but has no network ID - must be ephemeral.
|
// Network is active but has no network ID - must be ephemeral.
|
||||||
wifiManager.disableEphemeralNetwork(
|
mWifiManager.disableEphemeralNetwork(
|
||||||
AccessPoint.convertToQuotedString(accessPoint.getSsidStr()));
|
AccessPoint.convertToQuotedString(accessPoint.getSsidStr()));
|
||||||
} else {
|
} else {
|
||||||
// Should not happen, but a monkey seems to trigger it
|
// Should not happen, but a monkey seems to trigger it
|
||||||
Log.e(TAG, "Failed to forget invalid network " + accessPoint.getConfig());
|
Log.e(TAG, "Failed to forget invalid network " + accessPoint.getConfig());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
wifiManager.forget(accessPoint.getConfig().networkId, null /* listener */);
|
mWifiManager.forget(accessPoint.getConfig().networkId, null /* listener */);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,6 +261,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSubmit(WifiDialog2 dialog) {
|
public void onSubmit(WifiDialog2 dialog) {
|
||||||
|
if (!hasWifiManager()) return;
|
||||||
final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
|
final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
|
||||||
final WifiConfiguration config = dialog.getController().getConfig();
|
final WifiConfiguration config = dialog.getController().getConfig();
|
||||||
|
|
||||||
@@ -258,7 +269,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
if (config == null && wifiEntry != null && wifiEntry.canConnect()) {
|
if (config == null && wifiEntry != null && wifiEntry.canConnect()) {
|
||||||
wifiEntry.connect(null /* callback */);
|
wifiEntry.connect(null /* callback */);
|
||||||
} else {
|
} else {
|
||||||
getSystemService(WifiManager.class).connect(config, null /* listener */);
|
mWifiManager.connect(config, null /* listener */);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -269,22 +280,22 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSubmit(WifiDialog dialog) {
|
public void onSubmit(WifiDialog dialog) {
|
||||||
|
if (!hasWifiManager()) return;
|
||||||
final WifiConfiguration config = dialog.getController().getConfig();
|
final WifiConfiguration config = dialog.getController().getConfig();
|
||||||
final AccessPoint accessPoint = dialog.getController().getAccessPoint();
|
final AccessPoint accessPoint = dialog.getController().getAccessPoint();
|
||||||
final WifiManager wifiManager = getSystemService(WifiManager.class);
|
|
||||||
|
|
||||||
if (getIntent().getBooleanExtra(KEY_CONNECT_FOR_CALLER, true)) {
|
if (getIntent().getBooleanExtra(KEY_CONNECT_FOR_CALLER, true)) {
|
||||||
if (config == null) {
|
if (config == null) {
|
||||||
if (accessPoint != null && accessPoint.isSaved()) {
|
if (accessPoint != null && accessPoint.isSaved()) {
|
||||||
wifiManager.connect(accessPoint.getConfig(), null /* listener */);
|
mWifiManager.connect(accessPoint.getConfig(), null /* listener */);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
wifiManager.save(config, null /* listener */);
|
mWifiManager.save(config, null /* listener */);
|
||||||
if (accessPoint != null) {
|
if (accessPoint != null) {
|
||||||
// accessPoint is null for "Add network"
|
// accessPoint is null for "Add network"
|
||||||
NetworkInfo networkInfo = accessPoint.getNetworkInfo();
|
NetworkInfo networkInfo = accessPoint.getNetworkInfo();
|
||||||
if (networkInfo == null || !networkInfo.isConnected()) {
|
if (networkInfo == null || !networkInfo.isConnected()) {
|
||||||
wifiManager.connect(config, null /* listener */);
|
mWifiManager.connect(config, null /* listener */);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -350,6 +361,12 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean hasWifiManager() {
|
||||||
|
if (mWifiManager != null) return true;
|
||||||
|
mWifiManager = getSystemService(WifiManager.class);
|
||||||
|
return (mWifiManager != null);
|
||||||
|
}
|
||||||
|
|
||||||
protected boolean hasPermissionForResult() {
|
protected boolean hasPermissionForResult() {
|
||||||
final String callingPackage = getCallingPackage();
|
final String callingPackage = getCallingPackage();
|
||||||
if (callingPackage == null) {
|
if (callingPackage == null) {
|
||||||
|
@@ -26,7 +26,8 @@ import static com.android.settings.wifi.WifiDialogActivity.RESULT_OK;
|
|||||||
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.Mockito.doReturn;
|
import static org.mockito.Mockito.doNothing;
|
||||||
|
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 static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
@@ -36,41 +37,25 @@ import android.content.pm.PackageManager;
|
|||||||
import android.net.wifi.WifiConfiguration;
|
import android.net.wifi.WifiConfiguration;
|
||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
|
|
||||||
import androidx.lifecycle.Lifecycle.State;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
import androidx.test.core.app.ActivityScenario;
|
|
||||||
|
|
||||||
import com.android.settings.R;
|
|
||||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
|
||||||
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
|
|
||||||
import com.android.settings.testutils.shadow.ShadowNetworkDetailsTracker;
|
|
||||||
import com.android.settings.testutils.shadow.ShadowWifiManager;
|
|
||||||
import com.android.settingslib.wifi.AccessPoint;
|
import com.android.settingslib.wifi.AccessPoint;
|
||||||
|
import com.android.wifitrackerlib.WifiEntry;
|
||||||
|
|
||||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||||
|
|
||||||
import org.junit.After;
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
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.util.ReflectionHelpers;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = {
|
|
||||||
ShadowAlertDialogCompat.class,
|
|
||||||
ShadowConnectivityManager.class,
|
|
||||||
ShadowNetworkDetailsTracker.class,
|
|
||||||
ShadowWifiManager.class
|
|
||||||
})
|
|
||||||
public class WifiDialogActivityTest {
|
public class WifiDialogActivityTest {
|
||||||
|
|
||||||
private static final String CALLING_PACKAGE = "calling_package";
|
static final String CALLING_PACKAGE = "calling_package";
|
||||||
private static final String AP1_SSID = "\"ap1\"";
|
static final int REQUEST_CODE = REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER;
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
PackageManager mPackageManager;
|
PackageManager mPackageManager;
|
||||||
@@ -87,13 +72,13 @@ public class WifiDialogActivityTest {
|
|||||||
@Mock
|
@Mock
|
||||||
WifiConfigController2 mWifiConfiguration2;
|
WifiConfigController2 mWifiConfiguration2;
|
||||||
@Mock
|
@Mock
|
||||||
|
WifiEntry mWifiEntry;
|
||||||
|
@Mock
|
||||||
Intent mResultData;
|
Intent mResultData;
|
||||||
@Mock
|
@Mock
|
||||||
private WifiConfigController mController;
|
WifiConfigController mController;
|
||||||
@Mock
|
|
||||||
private WifiConfigController2 mController2;
|
|
||||||
|
|
||||||
private ActivityScenario<WifiDialogActivity> mWifiDialogActivity;
|
WifiDialogActivity mActivity;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
@@ -102,254 +87,190 @@ public class WifiDialogActivityTest {
|
|||||||
when(mController.getConfig()).thenReturn(mWifiConfiguration);
|
when(mController.getConfig()).thenReturn(mWifiConfiguration);
|
||||||
when(mController.getAccessPoint()).thenReturn(mAccessPoint);
|
when(mController.getAccessPoint()).thenReturn(mAccessPoint);
|
||||||
when(mWifiDialog2.getController()).thenReturn(mWifiConfiguration2);
|
when(mWifiDialog2.getController()).thenReturn(mWifiConfiguration2);
|
||||||
|
when(mWifiConfiguration2.getWifiEntry()).thenReturn(mWifiEntry);
|
||||||
|
when(mWifiEntry.canConnect()).thenReturn(true);
|
||||||
|
FakeFeatureFactory.setupForTest();
|
||||||
|
|
||||||
WifiConfiguration wifiConfig = new WifiConfiguration();
|
mActivity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
||||||
wifiConfig.SSID = AP1_SSID;
|
when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||||
doReturn(wifiConfig).when(mController).getConfig();
|
|
||||||
doReturn(wifiConfig).when(mController2).getConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void cleanUp() {
|
|
||||||
if (mWifiDialogActivity != null) {
|
|
||||||
mWifiDialogActivity.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private ActivityScenario<WifiDialogActivity> createTargetActivity(Intent activityIntent) {
|
|
||||||
return ActivityScenario.launch(activityIntent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit_shouldConnectToNetwork() {
|
public void onSubmit_shouldConnectToNetwork() {
|
||||||
WifiDialogActivity activity = Robolectric.setupActivity(WifiDialogActivity.class);
|
mActivity.onSubmit(mWifiDialog);
|
||||||
WifiDialog dialog = (WifiDialog) ShadowAlertDialogCompat.getLatestAlertDialog();
|
|
||||||
assertThat(dialog).isNotNull();
|
|
||||||
|
|
||||||
ReflectionHelpers.setField(dialog, "mController", mController);
|
verify(mWifiManager).connect(any(), any());
|
||||||
|
|
||||||
activity.onSubmit(dialog);
|
|
||||||
|
|
||||||
assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit_noPermissionForResult_setResultWithoutData() {
|
public void onSubmit_noPermissionForResult_setResultWithoutData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(false);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(false);
|
|
||||||
when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
|
||||||
|
|
||||||
activity.onSubmit(mWifiDialog);
|
mActivity.onSubmit(mWifiDialog);
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED, null);
|
verify(mActivity).setResult(RESULT_CONNECTED, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit_hasPermissionForResult_setResultWithData() {
|
public void onSubmit_hasPermissionForResult_setResultWithData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(true);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(true);
|
when(mActivity.createResultData(any(), any())).thenReturn(mResultData);
|
||||||
when(activity.createResultData(any(), any())).thenReturn(mResultData);
|
|
||||||
when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
|
||||||
|
|
||||||
activity.onSubmit(mWifiDialog);
|
mActivity.onSubmit(mWifiDialog);
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED, mResultData);
|
verify(mActivity).setResult(RESULT_CONNECTED, mResultData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit2_noPermissionForResult_setResultWithoutData() {
|
public void onSubmit2_noPermissionForResult_setResultWithoutData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(false);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(false);
|
|
||||||
when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
|
||||||
|
|
||||||
activity.onSubmit(mWifiDialog2);
|
mActivity.onSubmit(mWifiDialog2);
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED, null);
|
verify(mActivity).setResult(RESULT_CONNECTED, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit2_hasPermissionForResult_setResultWithData() {
|
public void onSubmit2_hasPermissionForResult_setResultWithData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(true);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(true);
|
when(mActivity.createResultData(any(), any())).thenReturn(mResultData);
|
||||||
when(activity.createResultData(any(), any())).thenReturn(mResultData);
|
|
||||||
when(activity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
|
||||||
|
|
||||||
activity.onSubmit(mWifiDialog2);
|
mActivity.onSubmit(mWifiDialog2);
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED, mResultData);
|
verify(mActivity).setResult(RESULT_CONNECTED, mResultData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void onSubmit2_whenConnectForCallerIsTrue_shouldConnectToNetwork() {
|
public void onSubmit2_whenConnectForCallerIsTrue_shouldConnectToNetwork() {
|
||||||
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
|
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
|
||||||
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
|
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
|
||||||
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true);
|
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true);
|
||||||
mWifiDialogActivity = createTargetActivity(intent);
|
mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get());
|
||||||
|
when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||||
|
|
||||||
mWifiDialogActivity.moveToState(State.CREATED);
|
mActivity.onSubmit(mWifiDialog2);
|
||||||
mWifiDialogActivity.moveToState(State.STARTED);
|
|
||||||
|
|
||||||
WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
|
verify(mWifiEntry).connect(any());
|
||||||
assertThat(dialog).isNotNull();
|
|
||||||
|
|
||||||
ReflectionHelpers.setField(dialog, "mController", mController2);
|
|
||||||
|
|
||||||
mWifiDialogActivity.onActivity(activity -> {
|
|
||||||
activity.onSubmit(dialog);
|
|
||||||
assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
|
public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
|
||||||
WifiDialogActivity activity =
|
final Intent intent = new Intent();
|
||||||
Robolectric.buildActivity(
|
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
|
||||||
WifiDialogActivity.class,
|
mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get());
|
||||||
new Intent().putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false))
|
when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||||
.setup().get();
|
|
||||||
WifiDialog dialog = (WifiDialog) ShadowAlertDialogCompat.getLatestAlertDialog();
|
|
||||||
|
|
||||||
assertThat(dialog).isNotNull();
|
mActivity.onSubmit(mWifiDialog);
|
||||||
|
|
||||||
ReflectionHelpers.setField(dialog, "mController", mController);
|
verify(mWifiManager, never()).connect(any(), any());
|
||||||
|
|
||||||
activity.onSubmit(dialog);
|
|
||||||
|
|
||||||
assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void onSubmit2_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
|
public void onSubmit2_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
|
||||||
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
|
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
|
||||||
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
|
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
|
||||||
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
|
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
|
||||||
mWifiDialogActivity = createTargetActivity(intent);
|
mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get());
|
||||||
|
when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||||
|
|
||||||
mWifiDialogActivity.moveToState(State.CREATED);
|
mActivity.onSubmit(mWifiDialog2);
|
||||||
mWifiDialogActivity.moveToState(State.STARTED);
|
|
||||||
|
|
||||||
WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
|
verify(mWifiEntry, never()).connect(any());
|
||||||
assertThat(dialog).isNotNull();
|
|
||||||
|
|
||||||
ReflectionHelpers.setField(dialog, "mController", mController2);
|
|
||||||
|
|
||||||
mWifiDialogActivity.onActivity(activity -> {
|
|
||||||
activity.onSubmit(dialog);
|
|
||||||
assertThat(ShadowWifiManager.get().savedWifiConfig).isEqualTo(null);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSubmit_whenLaunchInSetupFlow_shouldBeLightThemeForWifiDialog() {
|
public void onStart_whenLaunchInSetupFlow_shouldCreateDialogWithSuwTheme() {
|
||||||
WifiDialogActivity activity =
|
final Intent intent = new Intent();
|
||||||
Robolectric.buildActivity(
|
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
|
||||||
WifiDialogActivity.class,
|
intent.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
|
||||||
new Intent()
|
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
|
||||||
.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false)
|
mActivity = spy(Robolectric.buildActivity(WifiDialogActivity.class, intent).setup().get());
|
||||||
.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true)
|
when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||||
.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true))
|
doNothing().when(mActivity).createDialogWithSuwTheme();
|
||||||
.setup().get();
|
|
||||||
WifiDialog dialog = (WifiDialog) ShadowAlertDialogCompat.getLatestAlertDialog();
|
|
||||||
|
|
||||||
assertThat(dialog).isNotNull();
|
mActivity.onStart();
|
||||||
|
|
||||||
activity.onSubmit(dialog);
|
verify(mActivity).createDialogWithSuwTheme();
|
||||||
|
|
||||||
assertThat(dialog.getContext().getThemeResId())
|
|
||||||
.isEqualTo(R.style.SuwAlertDialogThemeCompat_Light);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onActivityResult_noPermissionForResult_setResultWithoutData() {
|
public void onActivityResult_noPermissionForResult_setResultWithoutData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(false);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(false);
|
|
||||||
final Intent data = new Intent();
|
|
||||||
|
|
||||||
activity.onActivityResult(REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER, RESULT_OK,
|
mActivity.onActivityResult(REQUEST_CODE, RESULT_OK, mResultData);
|
||||||
data);
|
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED);
|
verify(mActivity).setResult(RESULT_CONNECTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onActivityResult_hasPermissionForResult_setResultWithData() {
|
public void onActivityResult_hasPermissionForResult_setResultWithData() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.hasPermissionForResult()).thenReturn(true);
|
||||||
when(activity.hasPermissionForResult()).thenReturn(true);
|
|
||||||
final Intent data = new Intent();
|
|
||||||
|
|
||||||
activity.onActivityResult(REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER, RESULT_OK,
|
mActivity.onActivityResult(REQUEST_CODE, RESULT_OK, mResultData);
|
||||||
data);
|
|
||||||
|
|
||||||
verify(activity).setResult(RESULT_CONNECTED, data);
|
verify(mActivity).setResult(RESULT_CONNECTED, mResultData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void hasPermissionForResult_noCallingPackage_returnFalse() {
|
public void hasPermissionForResult_noCallingPackage_returnFalse() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.getCallingPackage()).thenReturn(null);
|
||||||
when(activity.getCallingPackage()).thenReturn(null);
|
|
||||||
|
|
||||||
final boolean result = activity.hasPermissionForResult();
|
final boolean result = mActivity.hasPermissionForResult();
|
||||||
|
|
||||||
assertThat(result).isFalse();
|
assertThat(result).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void hasPermissionForResult_noPermission_returnFalse() {
|
public void hasPermissionForResult_noPermission_returnFalse() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.getCallingPackage()).thenReturn(null);
|
||||||
when(activity.getCallingPackage()).thenReturn(null);
|
|
||||||
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_DENIED);
|
.thenReturn(PackageManager.PERMISSION_DENIED);
|
||||||
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_DENIED);
|
.thenReturn(PackageManager.PERMISSION_DENIED);
|
||||||
|
|
||||||
final boolean result = activity.hasPermissionForResult();
|
final boolean result = mActivity.hasPermissionForResult();
|
||||||
|
|
||||||
assertThat(result).isFalse();
|
assertThat(result).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void hasPermissionForResult_hasCoarseLocationPermission_returnFalse() {
|
public void hasPermissionForResult_hasCoarseLocationPermission_returnFalse() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
||||||
when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
|
||||||
when(activity.getPackageManager()).thenReturn(mPackageManager);
|
|
||||||
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
||||||
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_DENIED);
|
.thenReturn(PackageManager.PERMISSION_DENIED);
|
||||||
|
|
||||||
final boolean result = activity.hasPermissionForResult();
|
final boolean result = mActivity.hasPermissionForResult();
|
||||||
|
|
||||||
assertThat(result).isFalse();
|
assertThat(result).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void hasPermissionForResult_hasFineLocationPermission_returnTrue() {
|
public void hasPermissionForResult_hasFineLocationPermission_returnTrue() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
||||||
when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
|
||||||
when(activity.getPackageManager()).thenReturn(mPackageManager);
|
|
||||||
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_DENIED);
|
.thenReturn(PackageManager.PERMISSION_DENIED);
|
||||||
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
||||||
|
|
||||||
final boolean result = activity.hasPermissionForResult();
|
final boolean result = mActivity.hasPermissionForResult();
|
||||||
|
|
||||||
assertThat(result).isTrue();
|
assertThat(result).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void hasPermissionForResult_haveBothLocationPermissions_returnTrue() {
|
public void hasPermissionForResult_haveBothLocationPermissions_returnTrue() {
|
||||||
WifiDialogActivity activity = spy(Robolectric.setupActivity(WifiDialogActivity.class));
|
when(mActivity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
||||||
when(activity.getCallingPackage()).thenReturn(CALLING_PACKAGE);
|
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
|
||||||
when(activity.getPackageManager()).thenReturn(mPackageManager);
|
|
||||||
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_COARSE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
||||||
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
when(mPackageManager.checkPermission(ACCESS_FINE_LOCATION, CALLING_PACKAGE))
|
||||||
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
.thenReturn(PackageManager.PERMISSION_GRANTED);
|
||||||
|
|
||||||
final boolean result = activity.hasPermissionForResult();
|
final boolean result = mActivity.hasPermissionForResult();
|
||||||
|
|
||||||
assertThat(result).isTrue();
|
assertThat(result).isTrue();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user