[Wi-Fi] Fix Wi-Fi broken tests

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

View File

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