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

wifi: fix test failure due to no WifiManager mock

Browse Source 
Bug: 0
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1d53be79789446ea8fdd9e929130edb56ff21399
This commit is contained in:
Jimmy Chen
2022-01-11 13:57:49 +08:00
parent 20ec35ec34
commit 1eac7941ce
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
View File

@@ -19,8 +19,7 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -36,7 +35,6 @@ import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Eap;
import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiEnterpriseConfig.Phase2;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.UserHandle;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -86,6 +84,8 @@ public class WifiConfigController2Test {
private WifiEntry mWifiEntry; private WifiEntry mWifiEntry;
@Mock @Mock
private AndroidKeystoreAliasLoader mAndroidKeystoreAliasLoader; private AndroidKeystoreAliasLoader mAndroidKeystoreAliasLoader;
@Mock
private WifiManager mWifiManager;
private View mView; private View mView;
private Spinner mHiddenSettingsSpinner; private Spinner mHiddenSettingsSpinner;
private Spinner mEapCaCertSpinner; private Spinner mEapCaCertSpinner;
@@ -127,6 +127,7 @@ public class WifiConfigController2Test {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(eq(WifiManager.class))).thenReturn(mWifiManager);
when(mConfigUiBase.getContext()).thenReturn(mContext); when(mConfigUiBase.getContext()).thenReturn(mContext);
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK); when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null); mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
@@ -420,7 +421,7 @@ public class WifiConfigController2Test {
private TestWifiConfigController2( private TestWifiConfigController2(
WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry, int mode) { WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry, int mode) {
super(parent, view, wifiEntry, mode); super(parent, view, wifiEntry, mode, mWifiManager);
} }
private TestWifiConfigController2( private TestWifiConfigController2(