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

SettingsRoboTests: Remove @hide Wifi API usages

Browse Source 
Constructors are @hide, instead use Mockito to
create mock objects.

Bug: 138801922
Test: atest SettingsRoboTests
Change-Id: I3fb22ffd7b04fd62649b42f455230c6372beef26
This commit is contained in:
David Su
2020-01-07 16:29:14 -08:00
parent da1e6b845a
commit 6768f057b0
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
View File

@@ -147,11 +147,11 @@ public class NetworkRequestDialogFragmentTest {
final String ssidAp1 = "Test AP 1"; final String ssidAp1 = "Test AP 1";
final String ssidAp2 = "Test AP 2"; final String ssidAp2 = "Test AP 2";
List<ScanResult> scanResults = new ArrayList<>(); List<ScanResult> scanResults = new ArrayList<>();
ScanResult scanResult = new ScanResult(); ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp1; scanResult.SSID = ssidAp1;
scanResult.capabilities = "WEP"; scanResult.capabilities = "WEP";
scanResults.add(scanResult); scanResults.add(scanResult);
scanResult = new ScanResult(); scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp2; scanResult.SSID = ssidAp2;
scanResult.capabilities = "WEP"; scanResult.capabilities = "WEP";
scanResults.add(scanResult); scanResults.add(scanResult);
@@ -181,7 +181,7 @@ public class NetworkRequestDialogFragmentTest {
final String ssidAp1 = "Test AP 1"; final String ssidAp1 = "Test AP 1";
List<ScanResult> scanResults = new ArrayList<>(); List<ScanResult> scanResults = new ArrayList<>();
ScanResult scanResult = new ScanResult(); ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp1; scanResult.SSID = ssidAp1;
scanResult.capabilities = "WEP"; scanResult.capabilities = "WEP";
scanResults.add(scanResult); scanResults.add(scanResult);
@@ -253,7 +253,7 @@ public class NetworkRequestDialogFragmentTest {
final String ssidAp = "Test AP "; final String ssidAp = "Test AP ";
final List<ScanResult> scanResults = new ArrayList<>(); final List<ScanResult> scanResults = new ArrayList<>();
for (int i = 0; i < 7 ; i ++) { for (int i = 0; i < 7 ; i ++) {
ScanResult scanResult = new ScanResult(); ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp + i; scanResult.SSID = ssidAp + i;
scanResult.capabilities = "WEP"; scanResult.capabilities = "WEP";
scanResults.add(scanResult); scanResults.add(scanResult);
@@ -273,7 +273,7 @@ public class NetworkRequestDialogFragmentTest {
final String ssidAp = "Test AP "; final String ssidAp = "Test AP ";
final List<ScanResult> scanResults = new ArrayList<>(); final List<ScanResult> scanResults = new ArrayList<>();
for (int i = 0; i < 6 ; i ++) { for (int i = 0; i < 6 ; i ++) {
ScanResult scanResult = new ScanResult(); ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp + i; scanResult.SSID = ssidAp + i;
scanResult.capabilities = "WEP"; scanResult.capabilities = "WEP";
scanResults.add(scanResult); scanResults.add(scanResult);

10
tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
View File

@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -57,7 +59,7 @@ public class ConnectToWifiHandlerTest {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mHandler = new ConnectToWifiHandler(); mHandler = new ConnectToWifiHandler();
mWifiConfig = new WifiConfiguration(); mWifiConfig = spy(new WifiConfiguration());
mWifiConfig.SSID = AP_SSID; mWifiConfig.SSID = AP_SSID;
doReturn(mWifiConfig).when(mAccessPoint).getConfig(); doReturn(mWifiConfig).when(mAccessPoint).getConfig();
} }
@@ -97,9 +99,9 @@ public class ConnectToWifiHandlerTest {
public void connect_shouldConnectToSavedSecuredNetwork() { public void connect_shouldConnectToSavedSecuredNetwork() {
when(mAccessPoint.isSaved()).thenReturn(true); when(mAccessPoint.isSaved()).thenReturn(true);
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK); when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
final NetworkSelectionStatus status = new NetworkSelectionStatus(); final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);
status.setHasEverConnected(true); when(status.getHasEverConnected()).thenReturn(true);
mWifiConfig.setNetworkSelectionStatus(status); when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);
mHandler.connect(mContext, mAccessPoint); mHandler.connect(mContext, mAccessPoint);

14
tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
View File

@@ -28,6 +28,7 @@ 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.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -39,7 +40,6 @@ import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiSsid;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
@@ -47,10 +47,6 @@ import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTracker;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -62,6 +58,10 @@ import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowNetworkInfo; import org.robolectric.shadows.ShadowNetworkInfo;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = { @Config(shadows = {
ShadowWifiManager.class, ShadowWifiManager.class,
@@ -205,8 +205,8 @@ public class WifiScanWorkerTest {
} }
static void setConnectionInfoSSID(String ssid) { static void setConnectionInfoSSID(String ssid) {
final WifiInfo wifiInfo = new WifiInfo(); final WifiInfo wifiInfo = mock(WifiInfo.class);
wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(ssid)); when(wifiInfo.getSSID()).thenReturn(ssid);
ShadowWifiManager.get().setConnectionInfo(wifiInfo); ShadowWifiManager.get().setConnectionInfo(wifiInfo);
} }