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

Commit 5b1cd91c authored by David Su's avatar David Su
Browse files

NetworkKeyTest: remove @hide Wifi API usages 

new ScanResult() is @hide. Instead use Mockito to
create a new instance of ScanResult.

Bug: 138801922
Test: atest NetworkKeyTest
Change-Id: I16431a4df088220b631e873db116b30d19a9b674
parent 1de3ed98

core/tests/coretests/src/android/net/NetworkKeyTest.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 




import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.net.wifi.ScanResult;

import android.net.wifi.ScanResult;
@@ -107,7 +108,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_nullSsid() {

    public void createFromScanResult_nullSsid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.BSSID = VALID_BSSID;

        scanResult.BSSID = VALID_BSSID;





        assertNull(NetworkKey.createFromScanResult(scanResult));

        assertNull(NetworkKey.createFromScanResult(scanResult));
@@ -115,7 +116,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_emptySsid() {

    public void createFromScanResult_emptySsid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = "";

        scanResult.SSID = "";

        scanResult.BSSID = VALID_BSSID;

        scanResult.BSSID = VALID_BSSID;
@@ -124,7 +125,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_noneSsid() {

    public void createFromScanResult_noneSsid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = WifiManager.UNKNOWN_SSID;

        scanResult.SSID = WifiManager.UNKNOWN_SSID;

        scanResult.BSSID = VALID_BSSID;

        scanResult.BSSID = VALID_BSSID;
@@ -133,7 +134,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_nullBssid() {

    public void createFromScanResult_nullBssid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.SSID = VALID_UNQUOTED_SSID;





        assertNull(NetworkKey.createFromScanResult(scanResult));

        assertNull(NetworkKey.createFromScanResult(scanResult));
@@ -141,7 +142,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_emptyBssid() {

    public void createFromScanResult_emptyBssid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.BSSID = "";

        scanResult.BSSID = "";
@@ -150,7 +151,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_invalidBssid() {

    public void createFromScanResult_invalidBssid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.BSSID = INVALID_BSSID;

        scanResult.BSSID = INVALID_BSSID;
@@ -159,7 +160,7 @@ public class NetworkKeyTest { 




    @Test

    @Test

    public void createFromScanResult_validSsid() {

    public void createFromScanResult_validSsid() {

        ScanResult scanResult = new ScanResult();

        ScanResult scanResult = mock(ScanResult.class);

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.SSID = VALID_UNQUOTED_SSID;

        scanResult.BSSID = VALID_BSSID;

        scanResult.BSSID = VALID_BSSID;