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

Fix the bug of "Connecting" is rarely appearing on Wi-Fi slice

Browse Source 
- AccessPoint treats connected and connecting as equal so slice doesn't
refresh in this case
- Add a new method to determine if two lists are the same in SliceBackgroundWorker
- WifiScanWorker overrides this method to check the access point states

Fixes: 123941320
Test: robotest
Change-Id: I78d610da4b6b1d40f5785ba6701fb71b987fe31c
This commit is contained in:
Jason Chiu
2019-03-07 17:42:39 +08:00
parent b5b61b202b
commit 4e42f53896
3 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
View File

@@ -34,8 +34,10 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkInfo;
import android.net.NetworkInfo.State;
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.Slice;
@@ -61,6 +63,7 @@ import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@@ -253,11 +256,42 @@ public class WifiSliceTest {
verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
}
@Test
public void onConnectedChanged_shouldNotifyChange() {
mWifiScanWorker.onConnectedChanged();
private AccessPoint createAccessPoint(String name, State state) {
final NetworkInfo info = mock(NetworkInfo.class);
doReturn(state).when(info).getState();
verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
final Bundle savedState = new Bundle();
savedState.putString("key_ssid", name);
savedState.putParcelable("key_networkinfo", info);
return new AccessPoint(mContext, savedState);
}
@Test
public void SliceAccessPoint_sameState_shouldBeTheSame() {
final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTED);
final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);
assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
.isTrue();
}
@Test
public void SliceAccessPoint_differentState_shouldBeDifferent() {
final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTING);
final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);
assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
.isFalse();
}
@Test
public void SliceAccessPoint_differentLength_shouldBeDifferent() {
final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTED);
final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);
final List<AccessPoint> list = new ArrayList<>();
list.add(ap1);
list.add(ap2);
assertThat(mWifiScanWorker.areListsTheSame(list, Arrays.asList(ap1))).isFalse();
}
@Implements(SliceBackgroundWorker.class)