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

Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev

Browse Source
This commit is contained in:
Quang Luong
2022-04-14 16:14:21 +00:00
committed by Android (Google) Code Review
parent 7877c073e5 29bc66a352
commit 93ae7acbf4
3 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
View File

@@ -52,7 +52,6 @@ import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.RouteInfo;
import android.net.Uri;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
@@ -85,7 +84,6 @@ import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.NetworkDetailsTracker;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
import org.junit.Before;
import org.junit.Test;
@@ -943,22 +941,22 @@ public class WifiDetailPreferenceController2Test {
}
@Test
public void onConnectedNetwork_getKnownNetworkType_visibleWifiTypePref() {
public void onConnectedNetwork_getStandardString_visibleWifiTypePref() {
setUpForConnectedNetwork();
setUpSpyController();
setWifiType(ScanResult.WIFI_STANDARD_11AX);
when(mMockWifiEntry.getStandardString()).thenReturn("Standard");
displayAndResume();
verify(mMockTypePref).setSummary(R.string.wifi_type_11AX);
verify(mMockTypePref).setSummary("Standard");
verify(mMockTypePref).setVisible(true);
}
@Test
public void onConnectedNetwork_getUnKnownNetworkType_invisibleWifiTypePref() {
public void onConnectedNetwork_getEmptyStandardString_invisibleWifiTypePref() {
setUpForConnectedNetwork();
setUpSpyController();
setWifiType(ScanResult.WIFI_STANDARD_UNKNOWN);
when(mMockWifiEntry.getStandardString()).thenReturn("");
displayAndResume();
@@ -974,12 +972,6 @@ public class WifiDetailPreferenceController2Test {
verify(mMockTypePref).setVisible(false);
}
private void setWifiType(int type) {
ConnectedInfo connectedInfo = new ConnectedInfo();
connectedInfo.wifiStandard = type;
when(mMockWifiEntry.getConnectedInfo()).thenReturn(connectedInfo);
}
@Test
public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();