Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aeb6ce7 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "SettingsRoboTests: Remove @hide Wifi API usages"

parents 01a55e95 6768f057

tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java

+5 −5
Original line number Diff line number Diff line
@@ -147,11 +147,11 @@ public class NetworkRequestDialogFragmentTest { 
        final String ssidAp1 = "Test AP 1";

        final String ssidAp2 = "Test AP 2";

        List<ScanResult> scanResults = new ArrayList<>();

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = ssidAp1;

        scanResult.capabilities = "WEP";

        scanResults.add(scanResult);

        scanResult = new ScanResult();

        scanResult = mock(ScanResult.class);

        scanResult.SSID = ssidAp2;

        scanResult.capabilities = "WEP";

        scanResults.add(scanResult);
@@ -181,7 +181,7 @@ public class NetworkRequestDialogFragmentTest { 


        final String ssidAp1 = "Test AP 1";

        List<ScanResult> scanResults = new ArrayList<>();

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = ssidAp1;

        scanResult.capabilities = "WEP";

        scanResults.add(scanResult);
@@ -253,7 +253,7 @@ public class NetworkRequestDialogFragmentTest { 
        final String ssidAp = "Test AP ";

        final List<ScanResult> scanResults = new ArrayList<>();

        for (int i = 0; i < 7 ; i ++) {

            ScanResult scanResult = new ScanResult();

            ScanResult scanResult = mock(ScanResult.class);

            scanResult.SSID = ssidAp + i;

            scanResult.capabilities = "WEP";

            scanResults.add(scanResult);
@@ -273,7 +273,7 @@ public class NetworkRequestDialogFragmentTest { 
        final String ssidAp = "Test AP ";

        final List<ScanResult> scanResults = new ArrayList<>();

        for (int i = 0; i < 6 ; i ++) {

            ScanResult scanResult = new ScanResult();

            ScanResult scanResult = mock(ScanResult.class);

            scanResult.SSID = ssidAp + i;

            scanResult.capabilities = "WEP";

            scanResults.add(scanResult);

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

+6 −4
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

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.when;
@@ -57,7 +59,7 @@ public class ConnectToWifiHandlerTest { 


        mContext = RuntimeEnvironment.application;

        mHandler = new ConnectToWifiHandler();

        mWifiConfig = new WifiConfiguration();

        mWifiConfig = spy(new WifiConfiguration());

        mWifiConfig.SSID = AP_SSID;

        doReturn(mWifiConfig).when(mAccessPoint).getConfig();

    }
@@ -97,9 +99,9 @@ public class ConnectToWifiHandlerTest { 
    public void connect_shouldConnectToSavedSecuredNetwork() {

        when(mAccessPoint.isSaved()).thenReturn(true);

        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);

        final NetworkSelectionStatus status = new NetworkSelectionStatus();

        status.setHasEverConnected(true);

        mWifiConfig.setNetworkSelectionStatus(status);

        final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);

        when(status.getHasEverConnected()).thenReturn(true);

        when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);



        mHandler.connect(mContext, mAccessPoint);

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

+7 −7
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.ContentResolver;

import android.content.Context;
@@ -39,7 +40,6 @@ import android.net.NetworkInfo; 
import android.net.NetworkInfo.DetailedState;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiSsid;

import android.os.Bundle;

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.WifiTracker;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;
@@ -62,6 +58,10 @@ import org.robolectric.annotation.Implementation; 
import org.robolectric.annotation.Implements;

import org.robolectric.shadows.ShadowNetworkInfo;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        ShadowWifiManager.class,
@@ -205,8 +205,8 @@ public class WifiScanWorkerTest { 
    }



    static void setConnectionInfoSSID(String ssid) {

        final WifiInfo wifiInfo = new WifiInfo();

        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(ssid));

        final WifiInfo wifiInfo = mock(WifiInfo.class);

        when(wifiInfo.getSSID()).thenReturn(ssid);

        ShadowWifiManager.get().setConnectionInfo(wifiInfo);

    }