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

[Wi-Fi] Fix Wi-Fi broken tests

Browse Source 
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
This commit is contained in:
Arc Wang
2020-03-19 14:42:14 +08:00
parent 9b72496123
commit 4fafe6716c
7 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -1049,7 +1049,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
public void onFailure(int reason) { public void onFailure(int reason) {
Activity activity = mFragment.getActivity(); Activity activity = mFragment.getActivity();
if (activity != null) { if (activity != null) {
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_failed_save_message, R.string.wifi_failed_save_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
@@ -1090,7 +1090,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
final Activity activity = mFragment.getActivity(); final Activity activity = mFragment.getActivity();
// error handling, connected/saved network should have mWifiConfig. // error handling, connected/saved network should have mWifiConfig.
if (mWifiConfig == null) { if (mWifiConfig == null) {
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_failed_connect_message, R.string.wifi_failed_connect_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
return; return;
@@ -1116,7 +1116,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
if (state == STATE_ENABLE_WIFI) { if (state == STATE_ENABLE_WIFI) {
Log.d(TAG, "Turn on Wi-Fi automatically!"); Log.d(TAG, "Turn on Wi-Fi automatically!");
updateConnectedButton(STATE_ENABLE_WIFI); updateConnectedButton(STATE_ENABLE_WIFI);
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_turned_on_message, R.string.wifi_turned_on_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
mWifiManager.setWifiEnabled(true); mWifiManager.setWifiEnabled(true);
@@ -1137,7 +1137,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
stopTimer(); stopTimer();
// reset state // reset state
state = STATE_NONE; state = STATE_NONE;
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_failed_connect_message, R.string.wifi_failed_connect_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
updateConnectedButton(STATE_ENABLE_WIFI_FAILED); updateConnectedButton(STATE_ENABLE_WIFI_FAILED);
@@ -1159,7 +1159,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
Log.d(TAG, "connected"); Log.d(TAG, "connected");
stopTimer(); stopTimer();
updateConnectedButton(STATE_CONNECTED); updateConnectedButton(STATE_CONNECTED);
Toast.makeText(activity, Toast.makeText(mContext,
mContext.getString(R.string.wifi_connected_to_message, mContext.getString(R.string.wifi_connected_to_message,
mAccessPoint.getTitle()), mAccessPoint.getTitle()),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
@@ -1170,7 +1170,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
stopTimer(); stopTimer();
// reset state // reset state
state = STATE_NONE; state = STATE_NONE;
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_not_in_range_message, R.string.wifi_not_in_range_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
updateConnectedButton(STATE_NOT_IN_RANGE); updateConnectedButton(STATE_NOT_IN_RANGE);
@@ -1179,7 +1179,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
stopTimer(); stopTimer();
// reset state // reset state
state = STATE_NONE; state = STATE_NONE;
Toast.makeText(activity, Toast.makeText(mContext,
R.string.wifi_failed_connect_message, R.string.wifi_failed_connect_message,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
updateConnectedButton(STATE_FAILED); updateConnectedButton(STATE_FAILED);

2
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -94,7 +94,7 @@ public class WifiTetherSwitchBarController implements
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (mSwitch.isChecked()) { if (((Switch) v).isChecked()) {
startTether(); startTether();
} else { } else {
stopTether(); stopTether();

2
tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
View File

@@ -41,7 +41,6 @@ import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
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;
@@ -79,7 +78,6 @@ public class WifiScanningRequiredFragmentTest {
} }
@Test @Test
@Ignore
public void onClick_positiveButtonSetsWifiScanningOn() public void onClick_positiveButtonSetsWifiScanningOn()
throws Settings.SettingNotFoundException { throws Settings.SettingNotFoundException {
mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE); mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);

3
tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
View File

@@ -160,11 +160,10 @@ public class WifiSettings2Test {
} }
@Test @Test
@Ignore
public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() { public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
final ContentResolver contentResolver = mContext.getContentResolver(); final ContentResolver contentResolver = mContext.getContentResolver();
when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0); Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
when(mPowerManager.isPowerSaveMode()).thenReturn(false); when(mPowerManager.isPowerSaveMode()).thenReturn(false);

17
tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
View File

@@ -49,6 +49,7 @@ import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.View; import android.view.View;
@@ -70,7 +71,6 @@ import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory; import com.android.settingslib.wifi.WifiTrackerFactory;
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.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -295,9 +295,12 @@ public class WifiSettingsTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class}) @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() { public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
return;
}
setUpForOnCreate(); setUpForOnCreate();
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false; ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
@@ -307,9 +310,12 @@ public class WifiSettingsTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class}) @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() { public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
return;
}
setUpForOnCreate(); setUpForOnCreate();
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true; ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
@@ -352,9 +358,12 @@ public class WifiSettingsTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class}) @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
public void clickOnWifiNetworkWith_shouldStartCaptivePortalApp() { public void clickOnWifiNetworkWith_shouldStartCaptivePortalApp() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
return;
}
when(mWifiManager.getConfiguredNetworks()).thenReturn(createMockWifiConfigurations( when(mWifiManager.getConfiguredNetworks()).thenReturn(createMockWifiConfigurations(
NUM_NETWORKS)); NUM_NETWORKS));
when(mWifiTracker.isConnected()).thenReturn(true); when(mWifiTracker.isConnected()).thenReturn(true);

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

@@ -84,7 +84,6 @@ import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory; import com.android.settingslib.wifi.WifiTrackerFactory;
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.Answers; import org.mockito.Answers;
@@ -1428,7 +1427,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnect_displayAsSuccess() { public void testConnectButton_clickConnect_displayAsSuccess() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(true); when(mockWifiManager.isWifiEnabled()).thenReturn(true);
@@ -1461,7 +1459,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectButFailed_displayFailMessage() { public void testConnectButton_clickConnectButFailed_displayFailMessage() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
ArgumentCaptor<WifiManager.ActionListener> connectListenerCaptor = ArgumentCaptor<WifiManager.ActionListener> connectListenerCaptor =
@@ -1510,7 +1507,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectButTimeout_displayFailMessage() { public void testConnectButton_clickConnectButTimeout_displayFailMessage() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(true); when(mockWifiManager.isWifiEnabled()).thenReturn(true);
@@ -1540,7 +1536,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectButTimeout_displayNotInRangeMessage() { public void testConnectButton_clickConnectButTimeout_displayNotInRangeMessage() {
setUpForNotInRangeNetwork(); setUpForNotInRangeNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(true); when(mockWifiManager.isWifiEnabled()).thenReturn(true);
@@ -1570,7 +1565,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectWhenWiFiDisabled_displaySuccessMessage() { public void testConnectButton_clickConnectWhenWiFiDisabled_displaySuccessMessage() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
@@ -1612,7 +1606,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWiFi() { public void testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWiFi() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
@@ -1651,7 +1644,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void public void
testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWifiBecauseNotInRange() { testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWifiBecauseNotInRange() {
setUpForNotInRangeNetwork(); setUpForNotInRangeNetwork();
@@ -1691,7 +1683,6 @@ public class WifiDetailPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void testConnectButton_clickConnectWhenWiFiDisabled_failedToEnableWifi() { public void testConnectButton_clickConnectWhenWiFiDisabled_failedToEnableWifi() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled

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

@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
@@ -32,11 +32,11 @@ import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.widget.Switch;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
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;
@@ -99,15 +99,21 @@ public class WifiTetherSwitchBarControllerTest {
} }
@Test @Test
@Ignore public void onSwitchToggled_switchOff_noStartTethering() {
public void onSwitchToggled_onlyStartsTetherWhenNeeded() { final Switch mockSwitch = mock(Switch.class);
when(mWifiManager.isWifiApEnabled()).thenReturn(true); when(mockSwitch.isChecked()).thenReturn(false);
mController.onClick(mSwitchBar.getSwitch());
mController.onClick(mockSwitch);
verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any()); verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any());
}
doReturn(false).when(mWifiManager).isWifiApEnabled(); @Test
mController.onClick(mSwitchBar.getSwitch()); public void onSwitchToggled_switchOn_startTethering() {
final Switch mockSwitch = mock(Switch.class);
when(mockSwitch.isChecked()).thenReturn(true);
mController.onClick(mockSwitch);
verify(mConnectivityManager, times(1)) verify(mConnectivityManager, times(1))
.startTethering(anyInt(), anyBoolean(), any(), any()); .startTethering(anyInt(), anyBoolean(), any(), any());