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

[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment

Browse Source 
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie6f63cb8aa81d61bfa41687c73f8c8764cb3cefe
This commit is contained in:
Arc Wang
2020-06-10 09:11:00 +08:00
parent f1e2e25a87
commit 97659b2dfc
5 changed files with 267 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
View File

@@ -18,19 +18,18 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -40,13 +39,13 @@ import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@@ -65,8 +64,6 @@ public class NetworkRequestDialogFragmentTest {
private FragmentActivity mActivity;
private NetworkRequestDialogFragment networkRequestDialogFragment;
private Context mContext;
private WifiTracker mWifiTracker;
@Before
public void setUp() {
@@ -74,10 +71,7 @@ public class NetworkRequestDialogFragmentTest {
new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME,
TEST_APP_NAME)).setup().get();
networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance());
mContext = spy(RuntimeEnvironment.application);
mWifiTracker = mock(WifiTracker.class);
WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
networkRequestDialogFragment.mWifiPickerTracker = mock(WifiPickerTracker.class);
}
@Test
@@ -93,7 +87,7 @@ public class NetworkRequestDialogFragmentTest {
networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
final String targetTitle = mContext.getString(
final String targetTitle = RuntimeEnvironment.application.getString(
R.string.network_connection_request_dialog_title, TEST_APP_NAME);
final TextView view = alertDialog.findViewById(R.id.network_request_title_text);
assertThat(view.getText()).isEqualTo(targetTitle);
@@ -113,124 +107,95 @@ public class NetworkRequestDialogFragmentTest {
}
@Test
public void onUserSelectionCallbackRegistration_onClick_shouldCallSelect() {
public void onClick_validSelection_shouldCallSelect() {
final int indexClickItem = 3;
List<AccessPoint> accessPointList = createAccessPointList();
AccessPoint clickedAccessPoint = accessPointList.get(indexClickItem);
clickedAccessPoint.generateOpenNetworkConfig();
when(networkRequestDialogFragment.getAccessPointList()).thenReturn(accessPointList);
NetworkRequestUserSelectionCallback selectionCallback = mock(
final List<WifiEntry> wifiEntryList = createWifiEntryList();
final WifiEntry clickedWifiEntry = wifiEntryList.get(indexClickItem);
final WifiConfiguration wifiConfig = new WifiConfiguration();
when(clickedWifiEntry.getWifiConfiguration()).thenReturn(wifiConfig);
networkRequestDialogFragment.mFilteredWifiEntries = wifiEntryList;
final NetworkRequestUserSelectionCallback selectionCallback = mock(
NetworkRequestUserSelectionCallback.class);
AlertDialog dialog = mock(AlertDialog.class);
final AlertDialog dialog = mock(AlertDialog.class);
networkRequestDialogFragment.onUserSelectionCallbackRegistration(selectionCallback);
// Act.
networkRequestDialogFragment.onClick(dialog, indexClickItem);
// Check.
verify(selectionCallback, times(1)).select(clickedAccessPoint.getConfig());
verify(selectionCallback, times(1)).select(wifiConfig);
}
@Test
public void onMatch_shouldUpdatedList() {
when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
when(mContext.getApplicationContext()).thenReturn(applicationContext);
WifiManager wifiManager = mock(WifiManager.class);
when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
networkRequestDialogFragment.onResume();
public void onMatch_shouldUpdateWifiEntries() {
final InOrder inOrder = inOrder(networkRequestDialogFragment);
List<AccessPoint> accessPointList = createAccessPointList();
when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
networkRequestDialogFragment.onMatch(new ArrayList<ScanResult>());
final String ssidAp1 = "Test AP 1";
final String ssidAp2 = "Test AP 2";
List<ScanResult> scanResults = new ArrayList<>();
ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp1;
scanResult.capabilities = "WEP";
scanResults.add(scanResult);
scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp2;
scanResult.capabilities = "WEP";
scanResults.add(scanResult);
// Act.
networkRequestDialogFragment.onMatch(scanResults);
// Check.
List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
assertThat(returnList).isNotEmpty();
assertThat(returnList.size()).isEqualTo(2);
assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
assertThat(returnList.get(1).getSsid()).isEqualTo(ssidAp2);
inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
inOrder.verify(networkRequestDialogFragment).updateUi();
}
@Test
public void onAccessPointsChanged_shouldUpdatedList() {
when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
when(mContext.getApplicationContext()).thenReturn(applicationContext);
WifiManager wifiManager = mock(WifiManager.class);
when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
networkRequestDialogFragment.onResume();
public void onWifiStateChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
final InOrder inOrder = inOrder(networkRequestDialogFragment);
List<AccessPoint> accessPointList = new ArrayList<>();
when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
final String ssidAp1 = "Test AP 1";
List<ScanResult> scanResults = new ArrayList<>();
final List<ScanResult> scanResults = new ArrayList<>();
networkRequestDialogFragment.mMatchedScanResults = scanResults;
ScanResult scanResult = mock(ScanResult.class);
scanResult.SSID = ssidAp1;
scanResult.capabilities = "WEP";
scanResults.add(scanResult);
// Act.
networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
networkRequestDialogFragment.onMatch(scanResults);
accessPointList = createAccessPointList();
when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
// Act.
networkRequestDialogFragment.mFilterWifiTracker.mWifiListener.onAccessPointsChanged();
// Check.
List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
assertThat(returnList).isNotEmpty();
assertThat(returnList.size()).isEqualTo(1);
assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
inOrder.verify(networkRequestDialogFragment).updateUi();
}
private List<AccessPoint> createAccessPointList() {
List<AccessPoint> accessPointList = spy(new ArrayList<>());
Bundle bundle = new Bundle();
@Test
public void onWifiEntriesChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
final InOrder inOrder = inOrder(networkRequestDialogFragment);
bundle.putString(KEY_SSID, "Test AP 1");
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
accessPointList.add(new AccessPoint(mContext, bundle));
final List<ScanResult> scanResults = new ArrayList<>();
networkRequestDialogFragment.mMatchedScanResults = scanResults;
ScanResult scanResult = mock(ScanResult.class);
networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
networkRequestDialogFragment.onMatch(scanResults);
bundle.putString(KEY_SSID, "Test AP 2");
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
accessPointList.add(new AccessPoint(mContext, bundle));
inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
inOrder.verify(networkRequestDialogFragment).updateUi();
}
bundle.putString(KEY_SSID, "Test AP 3");
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
accessPointList.add(new AccessPoint(mContext, bundle));
private List<WifiEntry> createWifiEntryList() {
List<WifiEntry> wifiEntryList = spy(new ArrayList<>());
bundle.putString(KEY_SSID, "Test AP 4");
bundle.putInt(KEY_SECURITY, 0 /* NONE */);
accessPointList.add(new AccessPoint(mContext, bundle));
final WifiEntry wifiEntry1 = mock(WifiEntry.class);
when(wifiEntry1.getSsid()).thenReturn("Test AP 1");
when(wifiEntry1.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
wifiEntryList.add(wifiEntry1);
bundle.putString(KEY_SSID, "Test AP 5");
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
accessPointList.add(new AccessPoint(mContext, bundle));
final WifiEntry wifiEntry2 = mock(WifiEntry.class);
when(wifiEntry2.getSsid()).thenReturn("Test AP 2");
when(wifiEntry2.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
wifiEntryList.add(wifiEntry2);
bundle.putString(KEY_SSID, "Test AP 6");
bundle.putInt(KEY_SECURITY, 1 /* WEP */);
accessPointList.add(new AccessPoint(mContext, bundle));
final WifiEntry wifiEntry3 = mock(WifiEntry.class);
when(wifiEntry3.getSsid()).thenReturn("Test AP 3");
when(wifiEntry3.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
wifiEntryList.add(wifiEntry3);
return accessPointList;
final WifiEntry wifiEntry4 = mock(WifiEntry.class);
when(wifiEntry4.getSsid()).thenReturn("Test AP 4");
when(wifiEntry4.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
wifiEntryList.add(wifiEntry4);
final WifiEntry wifiEntry5 = mock(WifiEntry.class);
when(wifiEntry5.getSsid()).thenReturn("Test AP 5");
when(wifiEntry5.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
wifiEntryList.add(wifiEntry5);
final WifiEntry wifiEntry6 = mock(WifiEntry.class);
when(wifiEntry6.getSsid()).thenReturn("Test AP 6");
when(wifiEntry6.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
wifiEntryList.add(wifiEntry6);
return wifiEntryList;
}
@Test
@@ -247,8 +212,10 @@ public class NetworkRequestDialogFragmentTest {
public void onMatchManyResult_showNeutralButton() {
networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
List<AccessPoint> accessPointList = createAccessPointList();
when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
List<WifiEntry> wifiEntryList = createWifiEntryList();
final WifiPickerTracker wifiPickerTracker = mock(WifiPickerTracker.class);
when(wifiPickerTracker.getWifiEntries()).thenReturn(wifiEntryList);
networkRequestDialogFragment.mWifiPickerTracker = wifiPickerTracker;
final String ssidAp = "Test AP ";
final List<ScanResult> scanResults = new ArrayList<>();

35
tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
View File

@@ -18,20 +18,18 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.net.wifi.WifiConfiguration;
import com.android.settingslib.wifi.AccessPoint;
import com.android.wifitrackerlib.WifiEntry;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import com.android.settingslib.wifi.AccessPoint;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class WifiUtilsTest {
@@ -56,14 +54,12 @@ public class WifiUtilsTest {
}
@Test
public void getWifiConfigByAccessPoint_shouldReturnCorrectConfig() {
String testSSID = "WifiUtilsTest";
Bundle bundle = new Bundle();
bundle.putString("key_ssid", testSSID);
Context context = spy(RuntimeEnvironment.application);
AccessPoint accessPoint = new AccessPoint(context, bundle);
public void getWifiConfigByWifiEntry_shouldReturnCorrectConfig() {
final String testSSID = "WifiUtilsTest";
final WifiEntry wifiEntry = mock(WifiEntry.class);
when(wifiEntry.getSsid()).thenReturn(testSSID);
WifiConfiguration config = WifiUtils.getWifiConfig(accessPoint, null, null);
final WifiConfiguration config = WifiUtils.getWifiConfig(wifiEntry, null /* scanResult */);
assertThat(config).isNotNull();
assertThat(config.SSID).isEqualTo(AccessPoint.convertToQuotedString(testSSID));
@@ -71,6 +67,7 @@ public class WifiUtilsTest {
@Test(expected = IllegalArgumentException.class)
public void getWifiConfigWithNullInput_ThrowIllegalArgumentException() {
WifiConfiguration config = WifiUtils.getWifiConfig(null, null, null);
WifiConfiguration config = WifiUtils.getWifiConfig(null /* wifiEntry */,
null /* scanResult */);
}
}
}