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

[PasspointV2] Clear feature flag settings_wifi_details_saved_screen

Browse Source 
Clear feature flag settings_wifi_details_saved_screen

Bug: b/128369527
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ib8fc9c9eb52bee12d6501a2041c32aa60c80e70e
This commit is contained in:
cosmohsieh
2019-04-11 11:21:10 +08:00
parent db7f321526
commit 6938ad1630
7 changed files with 30 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -290,16 +290,12 @@ public class WifiDetailPreferenceControllerTest {
setupMockedPreferenceScreen();
// Disable saved network detail page feature for this test
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.WIFI_DETAILS_SAVED_SCREEN, false);
when(mockAccessPoint.isActive()).thenReturn(true);
mController = newWifiDetailPreferenceController();
}
private void setUpForConnectedNetwork() {
// Enable saved network detail page feature for this test
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.WIFI_DETAILS_SAVED_SCREEN, true);
when(mockAccessPoint.isActive()).thenReturn(true);
ArrayList list = new ArrayList<>();
list.add(mockAccessPoint);
@@ -312,8 +308,6 @@ public class WifiDetailPreferenceControllerTest {
}
private void setUpForDisconnectedNetwork() {
// Enable saved network detail page feature for this test
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.WIFI_DETAILS_SAVED_SCREEN, true);
when(mockAccessPoint.isActive()).thenReturn(false);
ArrayList list = new ArrayList<>();
list.add(mockAccessPoint);
@@ -326,8 +320,6 @@ public class WifiDetailPreferenceControllerTest {
}
private void setUpForNotInRangeNetwork() {
// Enable saved network detail page feature for this test
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.WIFI_DETAILS_SAVED_SCREEN, true);
when(mockAccessPoint.isActive()).thenReturn(false);
ArrayList list = new ArrayList<>();
list.add(mockAccessPoint);
@@ -494,15 +486,6 @@ public class WifiDetailPreferenceControllerTest {
.unregisterNetworkCallback(mCallbackCaptor.getValue());
}
@Test
public void entityHeader_shouldHaveIconSet() {
Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
displayAndResume();
verify(mockHeaderController).setIcon(expectedIcon);
}
@Test
public void entityHeader_shouldHaveIconSetForConnectedNetwork() {
setUpForConnectedNetwork();
@@ -552,13 +535,6 @@ public class WifiDetailPreferenceControllerTest {
verify(mockHeaderController).setSummary(summary);
}
@Test
public void signalStrengthPref_shouldHaveIconSet() {
displayAndResume();
verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
}
@Test
public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
setUpForConnectedNetwork();
@@ -586,16 +562,6 @@ public class WifiDetailPreferenceControllerTest {
verify(mockSignalStrengthPref, never()).setIcon(any(Drawable.class));
}
@Test
public void signalStrengthPref_shouldHaveDetailTextSet() {
String expectedStrength =
mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
displayAndResume();
verify(mockSignalStrengthPref).setSummary(expectedStrength);
}
@Test
public void signalStrengthPref_shouldHaveDetailTextSetForConnectedNetwork() {
setUpForConnectedNetwork();
@@ -917,17 +883,6 @@ public class WifiDetailPreferenceControllerTest {
verify(mockDnsPref).setVisible(false);
}
@Test
public void noCurrentNetwork_shouldFinishActivity() {
// If WifiManager#getCurrentNetwork() returns null, then the network is neither connected
// nor connecting and WifiStateMachine has not reached L2ConnectedState.
when(mockWifiManager.getCurrentNetwork()).thenReturn(null);
displayAndResume();
verify(mockActivity).finish();
}
@Test
public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
// For new feature for display detail page for saved network for disconnected network,
@@ -1306,16 +1261,6 @@ public class WifiDetailPreferenceControllerTest {
verify(mockWifiManager, times(2)).getConnectionInfo();
}
@Test
public void networkDisconnectedState_shouldFinishActivity() {
displayAndResume();
when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
verify(mockActivity).finish();
}
@Test
public void networkDisconnectedState_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();
@@ -1328,15 +1273,6 @@ public class WifiDetailPreferenceControllerTest {
verify(mockActivity, never()).finish();
}
@Test
public void networkOnLost_shouldFinishActivity() {
displayAndResume();
mCallbackCaptor.getValue().onLost(mockNetwork);
verify(mockActivity).finish();
}
@Test
public void networkOnLost_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();
@@ -1428,23 +1364,25 @@ public class WifiDetailPreferenceControllerTest {
}
@Test
public void testRefreshRssiViews_shouldNotUpdateIfLevelIsSame() {
public void testRefreshRssiViews_shouldNotUpdateIfLevelIsSameForConnectedNetwork() {
setUpForConnectedNetwork();
displayAndResume();
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mockAccessPoint, times(2)).getLevel();
verify(mockAccessPoint, times(3)).getLevel();
verify(mockIconInjector, times(1)).getIcon(anyInt());
}
@Test
public void testRefreshRssiViews_shouldUpdateOnLevelChange() {
public void testRefreshRssiViews_shouldUpdateOnLevelChangeForConnectedNetwork() {
setUpForConnectedNetwork();
displayAndResume();
when(mockAccessPoint.getLevel()).thenReturn(0);
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mockAccessPoint, times(2)).getLevel();
verify(mockAccessPoint, times(4)).getLevel();
verify(mockIconInjector, times(2)).getIcon(anyInt());
}

63
tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
View File

@@ -17,46 +17,22 @@
package com.android.settings.wifi.savedaccesspoints;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.wifi.WifiConfigController;
import com.android.settings.wifi.WifiDialog;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wifi.AccessPoint;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class SavedAccessPointsWifiSettingsTest {
@Mock
private WifiManager mWifiManager;
@Mock
private WifiDialog mWifiDialog;
@Mock
private WifiConfigController mConfigController;
@Mock
private WifiConfiguration mWifiConfiguration;
@Mock
private AccessPoint mAccessPoint;
@Mock
private SubscribedAccessPointsPreferenceController mSubscribedApController;
@Mock
@@ -73,45 +49,6 @@ public class SavedAccessPointsWifiSettingsTest {
.use(SubscribedAccessPointsPreferenceController.class);
doReturn(mSavedApController).when(mSettings)
.use(SavedAccessPointsPreferenceController.class);
ReflectionHelpers.setField(mSettings, "mWifiManager", mWifiManager);
when(mWifiDialog.getController()).thenReturn(mConfigController);
when(mConfigController.getConfig()).thenReturn(mWifiConfiguration);
}
@Test
public void onForget_isPasspointConfig_shouldRefreshAPList() {
FeatureFlagPersistent.setEnabled(RuntimeEnvironment.application,
FeatureFlags.NETWORK_INTERNET_V2, false);
when(mAccessPoint.isPasspointConfig()).thenReturn(true);
ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mAccessPoint);
mSettings.onForget(null);
verify(mSavedApController).postRefreshSavedAccessPoints();
}
@Test
public void onForget_isPasspointConfig_shouldRefreshSubscribedAPList() {
FeatureFlagPersistent.setEnabled(RuntimeEnvironment.application,
FeatureFlags.NETWORK_INTERNET_V2, true);
when(mAccessPoint.isPasspointConfig()).thenReturn(true);
ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mAccessPoint);
mSettings.onForget(null);
verify(mSubscribedApController).postRefreshSubscribedAccessPoints();
}
@Test
public void onForget_shouldInvokeForgetApi() {
ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mAccessPoint);
when(mAccessPoint.getConfig()).thenReturn(mWifiConfiguration);
mSettings.onForget(mWifiDialog);
verify(mWifiManager).forget(mWifiConfiguration.networkId, mSavedApController);
}
@Test