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

Commit 12ac577c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mock WifiManager.class for com.android.settingslib.wifi"

parents c5ee8aa4 30bf7a9a

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java

+7 −4
Original line number Diff line number Diff line
@@ -19,14 +19,17 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.graphics.drawable.ColorDrawable;

import android.net.wifi.WifiManager;



import androidx.test.core.app.ApplicationProvider;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -37,7 +40,7 @@ import org.robolectric.RuntimeEnvironment; 
@RunWith(RobolectricTestRunner.class)

public class AccessPointPreferenceTest {



    private Context mContext = RuntimeEnvironment.application;

    private Context mContext;



    @Mock

    private AccessPoint mockAccessPoint;
@@ -54,12 +57,13 @@ public class AccessPointPreferenceTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mock(WifiManager.class));



        when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());

    }



    @Test

    @Ignore

    public void refresh_openNetwork_updateContentDescription() {

        final String ssid = "ssid";

        final String summary = "connected";
@@ -90,7 +94,6 @@ public class AccessPointPreferenceTest { 
    }



    @Test

    @Ignore

    public void refresh_setTitle_shouldUseSsidString() {

        final String ssid = "ssid";

        final String summary = "connected";

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.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;
@@ -32,6 +33,7 @@ import android.net.ScoredNetwork; 
import android.net.WifiKey;

import android.net.wifi.ScanResult;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiNetworkScoreCache;

import android.os.Bundle;

import android.os.Parcelable;
@@ -44,7 +46,6 @@ import androidx.test.core.app.ApplicationProvider; 
import com.android.settingslib.R;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -75,10 +76,10 @@ public class WifiUtilsTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mock(WifiManager.class));

    }



    @Test

    @Ignore

    public void testVerboseSummaryString_showsScanResultSpeedLabel() {

        WifiTracker.sVerboseLogging = true;