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

[Wi-Fi] Refactor add wifi networks feature to use WifiNetworkSuggestion.

Browse Source 
WifiConfiguration used in the feature of add apps Wi-Fi networks was Deprecated, need to be changed to use WifiNetworkSuggestion.

Bug: 136472483
Test: Refactor AddAppNetworksFragmentTest to apply WifiNetowrkSuggestion
Change-Id: I022d200905880f7f7bd367f5fa62fa88e785db02
This commit is contained in:
govenliu
2020-01-14 19:15:04 +08:00
parent d0811849ec
commit 237290f854
3 changed files with 171 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
View File

@@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy;
import android.app.settings.SettingsEnums;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiNetworkSuggestion;
import android.os.Bundle;
import android.os.Parcelable;
import android.provider.Settings;
@@ -46,31 +47,32 @@ public class AddAppNetworksFragmentTest {
private static final String FAKE_APP_NAME = "fake_app_name";
private static final String FAKE_NEW_WPA_SSID = "fake_new_wpa_ssid";
private static final String FAKE_NEW_OPEN_SSID = "fake_new_open_ssid";
private static final String FAKE_NEW_OPEN_SSID_WITH_QUOTE = "\"fake_new_open_ssid\"";
private static final String FAKE_NEW_SAVED_WPA_SSID = "\"fake_new_wpa_ssid\"";
private AddAppNetworksFragment mAddAppNetworksFragment;
private List<WifiConfiguration> mFakedSpecifiedNetworksList;
private List<WifiNetworkSuggestion> mFakedSpecifiedNetworksList;
private List<WifiConfiguration> mFakeSavedNetworksList;
private WifiConfiguration mNewWpaConfigEntry;
private WifiConfiguration mNewOpenConfigEntry;
private WifiConfiguration mSavedWpaConfigEntry;
private WifiNetworkSuggestion mNewWpaSuggestionEntry;
private WifiNetworkSuggestion mNewOpenSuggestionEntry;
private WifiConfiguration mSavedWpaConfigurationEntry;
private Bundle mBundle;
private ArrayList<Integer> mFakedResultArrayList = new ArrayList<>();
@Before
public void setUp() {
mAddAppNetworksFragment = spy(new AddAppNetworksFragment());
mNewWpaConfigEntry = generateWifiConfig(FAKE_NEW_WPA_SSID,
WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
mNewOpenConfigEntry = generateWifiConfig(FAKE_NEW_OPEN_SSID,
mNewWpaSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_WPA_SSID,
WifiConfiguration.KeyMgmt.WPA_PSK, "1234567890");
mNewOpenSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_OPEN_SSID,
WifiConfiguration.KeyMgmt.NONE, null);
mSavedWpaConfigEntry = generateWifiConfig(FAKE_NEW_SAVED_WPA_SSID,
mSavedWpaConfigurationEntry = generateRegularWifiConfiguration(FAKE_NEW_SAVED_WPA_SSID,
WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
}
@Test
public void callingPackageName_onCreateView_shouldBeCorrect() {
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
@@ -79,7 +81,7 @@ public class AddAppNetworksFragmentTest {
@Test
public void launchFragment_shouldShowSaveButton() {
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
@@ -88,7 +90,7 @@ public class AddAppNetworksFragmentTest {
@Test
public void launchFragment_shouldShowCancelButton() {
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
@@ -97,7 +99,7 @@ public class AddAppNetworksFragmentTest {
@Test
public void requestOneNetwork_shouldShowCorrectSSID() {
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
TextView ssidView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
@@ -108,7 +110,7 @@ public class AddAppNetworksFragmentTest {
@Test
public void withNoExtra_requestNetwork_shouldFinished() {
addOneSpecifiedNetworkConfig(null);
addOneSpecifiedRegularNetworkSuggestion(null);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
@@ -119,13 +121,13 @@ public class AddAppNetworksFragmentTest {
public void withOneHalfSavedNetworks_uiListAndResultListShouldBeCorrect() {
// Arrange
// Setup a fake saved network list and assign to fragment.
addOneSavedNetworkConfig(mSavedWpaConfigEntry);
addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
// Setup two specified networks and their results and assign to fragment.
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedNetworkConfig(mNewOpenConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
mAddAppNetworksFragment.mAllSpecifiedNetworksList = mFakedSpecifiedNetworksList;
mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_INITIAL);
mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_INITIAL);
mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_SUCCESS);
mFakedResultArrayList.add(mAddAppNetworksFragment.RESULT_NETWORK_SUCCESS);
mAddAppNetworksFragment.mResultCodeArrayList = mFakedResultArrayList;
// Act
@@ -136,7 +138,8 @@ public class AddAppNetworksFragmentTest {
assertThat(mAddAppNetworksFragment.mResultCodeArrayList.get(0)).isEqualTo(
mAddAppNetworksFragment.RESULT_NETWORK_ALREADY_EXISTS);
assertThat(mAddAppNetworksFragment.mUiToRequestedList.get(
0).mWifiConfiguration.SSID).isEqualTo(FAKE_NEW_OPEN_SSID);
0).mWifiNetworkSuggestion.wifiConfiguration.SSID).isEqualTo(
FAKE_NEW_OPEN_SSID_WITH_QUOTE);
}
@Test
@@ -147,13 +150,13 @@ public class AddAppNetworksFragmentTest {
@Test
public void getThreeNetworksNewIntent_shouldHaveThreeItemsInUiList() {
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
setupFragment();
// Add two more networks and update framework bundle.
addOneSpecifiedNetworkConfig(mNewWpaConfigEntry);
addOneSpecifiedNetworkConfig(mNewOpenConfigEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
setUpBundle(mFakedSpecifiedNetworksList);
Bundle bundle = mAddAppNetworksFragment.getArguments();
mAddAppNetworksFragment.createContent(bundle);
@@ -162,7 +165,7 @@ public class AddAppNetworksFragmentTest {
assertThat(mAddAppNetworksFragment.mUiToRequestedList).hasSize(3);
}
private void addOneSavedNetworkConfig(@NonNull WifiConfiguration wifiConfiguration) {
private void addOneSavedNetworkConfiguration(@NonNull WifiConfiguration wifiConfiguration) {
if (mFakeSavedNetworksList == null) {
mFakeSavedNetworksList = new ArrayList<>();
}
@@ -170,20 +173,21 @@ public class AddAppNetworksFragmentTest {
mFakeSavedNetworksList.add(wifiConfiguration);
}
private void addOneSpecifiedNetworkConfig(@NonNull WifiConfiguration wifiConfiguration) {
if (wifiConfiguration != null) {
private void addOneSpecifiedRegularNetworkSuggestion(
@NonNull WifiNetworkSuggestion wifiNetworkSuggestion) {
if (wifiNetworkSuggestion != null) {
if (mFakedSpecifiedNetworksList == null) {
mFakedSpecifiedNetworksList = new ArrayList<>();
}
mFakedSpecifiedNetworksList.add(wifiConfiguration);
mFakedSpecifiedNetworksList.add(wifiNetworkSuggestion);
}
}
private void setUpBundle(List<WifiConfiguration> allFakedNetworksList) {
private void setUpBundle(List<WifiNetworkSuggestion> allFakedNetworksList) {
// Set up bundle.
final Bundle bundle = new Bundle();
bundle.putString(AddAppNetworksActivity.KEY_CALLING_PACKAGE_NAME, FAKE_APP_NAME);
bundle.putParcelableArrayList(Settings.EXTRA_WIFI_CONFIGURATION_LIST,
bundle.putParcelableArrayList(Settings.EXTRA_WIFI_NETWORK_LIST,
(ArrayList<? extends Parcelable>) allFakedNetworksList);
doReturn(bundle).when(mAddAppNetworksFragment).getArguments();
}
@@ -192,7 +196,8 @@ public class AddAppNetworksFragmentTest {
FragmentController.setupFragment(mAddAppNetworksFragment);
}
private static WifiConfiguration generateWifiConfig(String ssid, int securityType,
private static WifiConfiguration generateRegularWifiConfiguration(String ssid, int
securityType,
String password) {
final WifiConfiguration config = new WifiConfiguration();
config.SSID = ssid;
@@ -203,4 +208,29 @@ public class AddAppNetworksFragmentTest {
}
return config;
}
private static WifiNetworkSuggestion generateRegularWifiSuggestion(String ssid,
int securityType,
String password) {
WifiNetworkSuggestion suggestion = null;
switch (securityType) {
case WifiConfiguration.KeyMgmt.NONE:
suggestion = new WifiNetworkSuggestion.Builder()
.setSsid(ssid)
.build();
break;
case WifiConfiguration.KeyMgmt.WPA_PSK:
suggestion = new WifiNetworkSuggestion.Builder()
.setSsid(ssid)
.setWpa2Passphrase(password)
.build();
break;
default:
break;
}
return suggestion;
}
}