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

Commit 24267318 authored by Steven Liu's avatar Steven Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix the unit test failure of WifiPickerTrackerHelperTest"

parents f005055e 70a74e13

tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java

+13 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -50,9 +51,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 


import com.android.settings.Utils;

import com.android.settings.network.telephony.NetworkProviderWorker;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.ResourcesUtils;

import com.android.settings.wifi.slice.WifiSliceItem;

import com.android.wifitrackerlib.WifiEntry;

import com.android.wifitrackerlib.WifiPickerTracker;



import org.junit.Before;

import org.junit.Test;
@@ -100,12 +103,22 @@ public class ProviderModelSliceTest { 
    @Mock

    GridRowBuilder mMockGridRowBuilderAllNetworkUnavailable;



    private FakeFeatureFactory mFeatureFactory;

    @Mock

    private WifiPickerTracker mWifiPickerTracker;



    @Before

    @UiThreadTest

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());



        mFeatureFactory = FakeFeatureFactory.setupForTest();

        when(mFeatureFactory.wifiTrackerLibProvider

                .createWifiPickerTracker(

                        any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mWifiPickerTracker);



        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);

        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);

        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);

tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.wifi; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;
@@ -29,6 +31,7 @@ import androidx.lifecycle.Lifecycle; 
import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.testutils.FakeFeatureFactory;

import com.android.wifitrackerlib.MergedCarrierEntry;

import com.android.wifitrackerlib.WifiEntry;

import com.android.wifitrackerlib.WifiPickerTracker;
@@ -55,8 +58,15 @@ public class WifiPickerTrackerHelperTest { 


    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;



    private FakeFeatureFactory mFeatureFactory;



    @Before

    public void setUp() {

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        when(mFeatureFactory.wifiTrackerLibProvider

                .createWifiPickerTracker(

                        any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mWifiPickerTracker);

        mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),

                ApplicationProvider.getApplicationContext(), null);

    }