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

[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity

Browse Source 
After this change, WifiDialogactivity supports both WifiTrackerLib and
SettingsLib because this is an exported UI component, some other APPs
(e.g., SetupWizard) still use SettingsLib.

Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.WifiDialogActivityTest
      manual
      In Wi-Fi Settings, manually add a Wi-Fi network.
      In SetupWizard, manually add a Wi-Fi network.
Change-Id: I87f477d905cc6ea34ef1afbfade3773920dad6eb
This commit is contained in:
Arc Wang
2020-07-17 16:53:42 +08:00
parent a12c827b1d
commit e57ead9a75
3 changed files with 286 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
View File

@@ -23,13 +23,18 @@ import static org.mockito.Mockito.doReturn;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import androidx.lifecycle.Lifecycle.State;
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.google.android.setupcompat.util.WizardManagerHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,15 +47,20 @@ import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowAlertDialogCompat.class,
ShadowConnectivityManager.class,
ShadowWifiManager.class,
ShadowAlertDialogCompat.class
ShadowNetworkDetailsTracker.class,
ShadowWifiManager.class
})
public class WifiDialogActivityTest {
private static final String AP1_SSID = "\"ap1\"";
@Mock
private WifiConfigController mController;
@Mock
private WifiConfigController2 mController2;
private ActivityScenario<WifiDialogActivity> mWifiDialogActivity;
@Before
public void setUp() {
@@ -59,6 +69,18 @@ public class WifiDialogActivityTest {
WifiConfiguration wifiConfig = new WifiConfiguration();
wifiConfig.SSID = AP1_SSID;
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
@@ -74,6 +96,27 @@ public class WifiDialogActivityTest {
assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
}
@Test
public void onSubmit2_whenConnectForCallerIsTrue_shouldConnectToNetwork() {
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true);
mWifiDialogActivity = createTargetActivity(intent);
mWifiDialogActivity.moveToState(State.CREATED);
mWifiDialogActivity.moveToState(State.STARTED);
WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
ReflectionHelpers.setField(dialog, "mController", mController2);
mWifiDialogActivity.onActivity(activity -> {
activity.onSubmit(dialog);
assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
});
}
@Test
public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
WifiDialogActivity activity =
@@ -92,6 +135,27 @@ public class WifiDialogActivityTest {
assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
}
@Test
public void onSubmit2_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
mWifiDialogActivity = createTargetActivity(intent);
mWifiDialogActivity.moveToState(State.CREATED);
mWifiDialogActivity.moveToState(State.STARTED);
WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
ReflectionHelpers.setField(dialog, "mController", mController2);
mWifiDialogActivity.onActivity(activity -> {
activity.onSubmit(dialog);
assertThat(ShadowWifiManager.get().savedWifiConfig).isEqualTo(null);
});
}
@Test
public void onSubmit_whenLaunchInSetupFlow_shouldBeLightThemeForWifiDialog() {
WifiDialogActivity activity =