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

Merge "Remove use of forceUpdate."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-21 20:16:00 +00:00
committed by Android (Google) Code Review
parent b6cae12255 0f711f86a6
commit a0d8315762
2 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
View File

@@ -51,6 +51,7 @@ import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.TestAccessPointBuilder;
import com.android.settingslib.wifi.WifiTracker;
@@ -260,26 +261,6 @@ public class WifiSettingsUiTest {
matches(isDisplayed()));
}
@Test
public void resumingAp_shouldNotForceUpdateWhenExistingAPsAreListed() {
setWifiState(WifiManager.WIFI_STATE_ENABLED);
setupConnectedAccessPoint();
when(mWifiTracker.isConnected()).thenReturn(true);
launchActivity();
onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
matches(isDisplayed()));
verify(mWifiTracker).forceUpdate();
Activity activity = mActivityRule.getActivity();
activity.finish();
getInstrumentation().waitForIdleSync();
getInstrumentation().callActivityOnStart(activity);
verify(mWifiTracker, atMost(1)).forceUpdate();
}
@Test
public void changingSecurityStateOnApShouldNotCauseMultipleListItems() {
setWifiState(WifiManager.WIFI_STATE_ENABLED);
@@ -305,10 +286,10 @@ public class WifiSettingsUiTest {
onView(withText(TEST_SSID)).check(matches(isDisplayed()));
mWifiListener.onAccessPointsChanged();
ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
onView(withText(TEST_SSID)).check(matches(isDisplayed()));
mWifiListener.onAccessPointsChanged();
ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
onView(withText(TEST_SSID)).check(matches(isDisplayed()));
}
@@ -367,7 +348,6 @@ public class WifiSettingsUiTest {
launchActivity();
verify(mWifiTracker, atMost(1)).forceUpdate();
verify(mWifiTracker, times(1)).getAccessPoints();
onView(withText(WIFI_DISPLAY_STATUS_CONNECTED)).check(matches(isDisplayed()));