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

Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev

Browse Source 
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
This commit is contained in:
Arc Wang
2020-03-24 07:25:17 +00:00
committed by Android (Google) Code Review
parent 9a0f633600 fafcd3b362
commit e4b0989766
3 changed files with 122 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2188,8 +2188,6 @@
<string name="wifi_connected_to_message">@string/bluetooth_connected_summary</string> <string name="wifi_connected_to_message">@string/bluetooth_connected_summary</string>
<!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] --> <!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->
<string name="wifi_connecting">Connecting\u2026</string> <string name="wifi_connecting">Connecting\u2026</string>
<!-- Button label to disconnect to a Wi-Fi network [CHAR LIMIT=NONE] -->
<string name="wifi_disconnect">@string/bluetooth_device_context_disconnect</string>
<!-- Failured notification for connect --> <!-- Failured notification for connect -->
<string name="wifi_failed_connect_message">Failed to connect to network</string> <string name="wifi_failed_connect_message">Failed to connect to network</string>
<!-- Not in range notification for connect [CHAR LIMIT=40] --> <!-- Not in range notification for connect [CHAR LIMIT=40] -->

21
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -456,7 +456,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
} }
} }
private void updateNetworkInfo() { @VisibleForTesting
void updateNetworkInfo() {
if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) { if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
mNetwork = mWifiManager.getCurrentNetwork(); mNetwork = mWifiManager.getCurrentNetwork();
mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork); mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork);
@@ -632,7 +633,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
} }
private void refreshMacAddress() { private void refreshMacAddress() {
String macAddress = getMacAddress(); String macAddress = mWifiEntry.getMacAddress();
if (macAddress == null) { if (macAddress == null) {
mMacAddressPref.setVisible(false); mMacAddressPref.setVisible(false);
return; return;
@@ -649,21 +650,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
refreshMacTitle(); refreshMacTitle();
} }
private String getMacAddress() {
if (mWifiEntry.isSaved() && mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
return mWifiEntry.getMacAddress();
}
// return device MAC address
final String[] macAddresses = mWifiManager.getFactoryMacAddresses();
if (macAddresses != null && macAddresses.length > 0) {
return macAddresses[0];
}
Log.e(TAG, "Can't get device MAC address!");
return null;
}
private void updatePreference(Preference pref, String detailText) { private void updatePreference(Preference pref, String detailText) {
if (!TextUtils.isEmpty(detailText)) { if (!TextUtils.isEmpty(detailText)) {
pref.setSummary(detailText); pref.setSummary(detailText);
@@ -969,6 +955,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
*/ */
@Override @Override
public void onUpdated() { public void onUpdated() {
updateNetworkInfo();
refreshPage(); refreshPage();
// Refresh the Preferences in fragment. // Refresh the Preferences in fragment.

333
tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
View File

@@ -46,7 +46,6 @@ import android.net.ConnectivityManager.NetworkCallback;
import android.net.IpPrefix; import android.net.IpPrefix;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.MacAddress;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
@@ -81,6 +80,7 @@ import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.NetworkDetailsTracker; import com.android.wifitrackerlib.NetworkDetailsTracker;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@@ -109,8 +109,6 @@ import java.util.Arrays;
import java.util.stream.Collectors; import java.util.stream.Collectors;
// TODO(b/143326832): Should add test cases for connect button. // TODO(b/143326832): Should add test cases for connect button.
// TODO(b/143326832): WifiEntry is not mature, should remove @Ignore after it's constructed.
@Ignore
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) @Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class})
public class WifiDetailPreferenceController2Test { public class WifiDetailPreferenceController2Test {
@@ -123,8 +121,7 @@ public class WifiDetailPreferenceController2Test {
private static final String MAC_ADDRESS = "01:23:45:67:89:ab"; private static final String MAC_ADDRESS = "01:23:45:67:89:ab";
private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS"; private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";
private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS"; private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
// TODO(b/143326832): Add WifiEntry#getSecurityString private static final String SECURITY = "None";
//private static final String SECURITY = "None";
private static final String FQDN = "fqdn"; private static final String FQDN = "fqdn";
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -156,8 +153,6 @@ public class WifiDetailPreferenceController2Test {
private WifiDetailPreferenceController2.IconInjector mMockIconInjector; private WifiDetailPreferenceController2.IconInjector mMockIconInjector;
@Mock @Mock
private WifiDetailPreferenceController2.Clock mMockClock; private WifiDetailPreferenceController2.Clock mMockClock;
@Mock
private MacAddress mMockMacAddress;
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private EntityHeaderController mMockHeaderController; private EntityHeaderController mMockHeaderController;
@@ -270,9 +265,9 @@ public class WifiDetailPreferenceController2Test {
when(mContext.getPackageManager()).thenReturn(mMockPackageManager); when(mContext.getPackageManager()).thenReturn(mMockPackageManager);
when(mMockWifiEntry.getLevel()).thenReturn(LEVEL); when(mMockWifiEntry.getLevel()).thenReturn(LEVEL);
// TODO(b/143326832): Add WifiEntry#getSecurityString when(mMockWifiEntry.getSecurityString(false /* concise */)).thenReturn(SECURITY);
//when(mMockWifiEntry.getSecurityString(false)).thenReturn(SECURITY);
when(mMockWifiEntry.getTitle()).thenReturn(SSID); when(mMockWifiEntry.getTitle()).thenReturn(SSID);
when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mMockWifiConfig);
when(mMockConnectivityManager.getNetworkInfo(any(Network.class))) when(mMockConnectivityManager.getNetworkInfo(any(Network.class)))
.thenReturn(mMockNetworkInfo); .thenReturn(mMockNetworkInfo);
doNothing().when(mMockConnectivityManager).registerNetworkCallback( doNothing().when(mMockConnectivityManager).registerNetworkCallback(
@@ -393,7 +388,6 @@ public class WifiDetailPreferenceController2Test {
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
} }
/* TODO(b/143326832): Add WifiEntry#getSecurityString
@Test @Test
public void securityPreference_stringShouldBeSet() { public void securityPreference_stringShouldBeSet() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -401,7 +395,6 @@ public class WifiDetailPreferenceController2Test {
verify(mMockSecurityPref).setSummary(SECURITY); verify(mMockSecurityPref).setSummary(SECURITY);
} }
*/
@Test @Test
public void latestWifiInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() { public void latestWifiInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
@@ -541,6 +534,7 @@ public class WifiDetailPreferenceController2Test {
updateLinkProperties(lp); updateLinkProperties(lp);
} }
@Ignore
@Test @Test
public void entityHeader_shouldShowShortRemainingTime() { public void entityHeader_shouldShowShortRemainingTime() {
// Expires in 1h, 2min, 15sec // Expires in 1h, 2min, 15sec
@@ -557,6 +551,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockHeaderController).setSecondSummary((String) null); inOrder.verify(mMockHeaderController).setSecondSummary((String) null);
} }
@Ignore
@Test @Test
public void entityHeader_shouldShowExpiryDate() { public void entityHeader_shouldShowExpiryDate() {
// Expires in 49h, 2min, 15sec // Expires in 49h, 2min, 15sec
@@ -724,77 +719,68 @@ public class WifiDetailPreferenceController2Test {
verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class)); verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class));
} }
/* TODO(b/143326832): Support Passpoint test cases while WifiTracker2 supports it.
@Test @Test
public void ssidPref_shouldHaveDetailTextSetForPasspointR1() { public void ssidPref_isSubscription_show() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockAccessPoint.isPasspoint()).thenReturn(true); when(mMockWifiEntry.isSubscription()).thenReturn(true);
when(mMockAccessPoint.isOsuProvider()).thenReturn(false);
displayAndResume(); displayAndResume();
verify(mMockSsidPref, times(1)).setSummary(SSID); verify(mMockSsidPref).setSummary(SSID);
verify(mMockSsidPref, times(1)).setVisible(true); verify(mMockSsidPref).setVisible(true);
} }
@Test @Test
public void ssidPref_shouldHaveDetailTextSetForPasspointR2() { public void ssidPref_notSubscription_hide() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockAccessPoint.isPasspoint()).thenReturn(false); when(mMockWifiEntry.isSubscription()).thenReturn(false);
when(mMockAccessPoint.isOsuProvider()).thenReturn(true);
displayAndResume();
verify(mMockSsidPref, times(1)).setSummary(SSID);
verify(mMockSsidPref, times(1)).setVisible(true);
}
@Test
public void ssidPref_shouldNotShowIfNotPasspoint() {
setUpForConnectedNetwork();
when(mMockAccessPoint.isPasspoint()).thenReturn(false);
when(mMockAccessPoint.isOsuProvider()).thenReturn(false);
displayAndResume(); displayAndResume();
verify(mMockSsidPref, never()).setSummary(SSID);
verify(mMockSsidPref).setVisible(false); verify(mMockSsidPref).setVisible(false);
} }
*/
@Test @Test
public void macAddressPref_shouldVisibleForConnectedNetwork() { public void macAddressPref_shouldVisibleForConnectedNetwork() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockWifiEntry.isSaved()).thenReturn(true);
when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_DEVICE_MAC);
when(mMockWifiEntry.getMacAddress()).thenReturn(MAC_ADDRESS);
displayAndResume(); displayAndResume();
verify(mMockMacAddressPref).setVisible(true); verify(mMockMacAddressPref).setVisible(true);
verify(mMockMacAddressPref).setSummary(MAC_ADDRESS); verify(mMockMacAddressPref).setSummary(MAC_ADDRESS);
verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);
} }
@Test @Test
public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() { public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
mMockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT; when(mMockWifiEntry.isSaved()).thenReturn(true);
when(mMockWifiConfig.getRandomizedMacAddress()).thenReturn(mMockMacAddress); when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_RANDOMIZED_MAC);
when(mMockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS); when(mMockWifiEntry.getMacAddress()).thenReturn(RANDOMIZED_MAC_ADDRESS);
displayAndResume(); displayAndResume();
verify(mMockMacAddressPref).setVisible(true); verify(mMockMacAddressPref).setVisible(true);
verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS); verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
} }
@Test @Test
public void macAddressPref_shouldVisibleAsFactoryForDisconnectedNetwork() { public void macAddressPref_shouldVisibleAsFactoryForDisconnectedNetwork() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
mMockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE; when(mMockWifiEntry.isSaved()).thenReturn(true);
when(mMockWifiManager.getFactoryMacAddresses()) when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_DEVICE_MAC);
.thenReturn(new String[]{FACTORY_MAC_ADDRESS}); when(mMockWifiEntry.getMacAddress()).thenReturn(FACTORY_MAC_ADDRESS);
displayAndResume(); displayAndResume();
verify(mMockMacAddressPref).setVisible(true); verify(mMockMacAddressPref).setVisible(true);
verify(mMockMacAddressPref).setSummary(FACTORY_MAC_ADDRESS); verify(mMockMacAddressPref).setSummary(FACTORY_MAC_ADDRESS);
verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);
} }
@Test @Test
@@ -945,6 +931,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockIpv6AddressesPref).setSummary(text); inOrder.verify(mMockIpv6AddressesPref).setSummary(text);
} }
@Ignore
@Test @Test
public void onLinkPropertiesChanged_updatesFields() { public void onLinkPropertiesChanged_updatesFields() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -1002,6 +989,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockDnsPref).setVisible(true); inOrder.verify(mMockDnsPref).setVisible(true);
} }
@Ignore
@Test @Test
public void onCapabilitiesChanged_callsRefreshIfNecessary() { public void onCapabilitiesChanged_callsRefreshIfNecessary() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -1073,32 +1061,25 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void canForgetNetwork_ephemeral() { public void onUpdated_canForget_showForgetButton() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockWifiInfo.isEphemeral()).thenReturn(true); when(mMockWifiEntry.canForget()).thenReturn(true);
when(mMockWifiEntry.isSaved()).thenReturn(false);
displayAndResume(); displayAndResume();
mController.onUpdated();
verify(mMockButtonsPref).setButton1Visible(true); verify(mMockButtonsPref, times(2)).setButton1Visible(true);
} }
@Test @Test
public void canForgetNetwork_saved() { public void onUpdated_canNotForget_hideForgetButton() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
displayAndResume(); when(mMockWifiEntry.canForget()).thenReturn(false);
verify(mMockButtonsPref).setButton1Visible(true);
}
@Test
public void canForgetNetwork_lockedDown() {
setUpForConnectedNetwork();
lockDownNetwork();
displayAndResume(); displayAndResume();
mController.onUpdated();
verify(mMockButtonsPref).setButton1Visible(false); verify(mMockButtonsPref, times(2)).setButton1Visible(false);
} }
@Test @Test
@@ -1112,8 +1093,10 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void canModifyNetwork_saved() { public void canModifyNetwork_savedNetwork_returnTrue() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockWifiEntry.isSaved()).thenReturn(true);
assertThat(mController.canModifyNetwork()).isTrue(); assertThat(mController.canModifyNetwork()).isTrue();
} }
@@ -1149,52 +1132,30 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void forgetNetwork_ephemeral() { public void forgetNetwork_standardWifiNetwork_forget() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
String ssid = "ssid";
when(mMockWifiInfo.isEphemeral()).thenReturn(true);
when(mMockWifiInfo.getSSID()).thenReturn(ssid);
displayAndResume(); displayAndResume();
mForgetClickListener.getValue().onClick(null); mForgetClickListener.getValue().onClick(null);
verify(mMockWifiManager).disableEphemeralNetwork(ssid); verify(mMockWifiEntry).forget(mController);
verify(mMockMetricsFeatureProvider) verify(mMockMetricsFeatureProvider)
.action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); .action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
} }
@Test @Test
public void forgetNetwork_saved() { public void forgetNetwork_isSubscription_shouldShowDialog() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
mMockWifiConfig.networkId = 5; when(mMockWifiEntry.isSubscription()).thenReturn(true);
displayAndResume();
mController.displayPreference(mMockScreen);
mForgetClickListener.getValue().onClick(null);
verify(mMockWifiManager).forget(mMockWifiConfig.networkId, null);
verify(mMockMetricsFeatureProvider)
.action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
}
/* TODO(b/143326832): Support Passpoint test cases while WifiTracker2 supports it.
@Test
public void forgetNetwork_shouldShowDialog() {
setUpForConnectedNetwork();
final WifiDetailPreferenceController2 spyController = spy(mController);
mMockWifiConfig.networkId = 5;
when(mMockAccessPoint.isPasspoint()).thenReturn(true);
when(mMockAccessPoint.getPasspointFqdn()).thenReturn(FQDN);
spyController.displayPreference(mMockScreen);
mForgetClickListener.getValue().onClick(null); mForgetClickListener.getValue().onClick(null);
verify(mMockWifiManager, times(0)).removePasspointConfiguration(FQDN); verify(mMockWifiEntry, never()).forget(mController);
verify(mMockMetricsFeatureProvider, times(0)) verify(mMockMetricsFeatureProvider, never())
.action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET); .action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
verify(spyController).showConfirmForgetDialog(); verify(mController).showConfirmForgetDialog();
} }
*/
@Test @Test
public void networkStateChangedIntent_shouldRefetchInfo() { public void networkStateChangedIntent_shouldRefetchInfo() {
@@ -1204,55 +1165,19 @@ public class WifiDetailPreferenceController2Test {
verify(mMockConnectivityManager, times(1)).getNetworkInfo(any(Network.class)); verify(mMockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(1)).getConnectionInfo(); verify(mMockWifiManager, times(1)).getConnectionInfo();
mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
verify(mMockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(2)).getConnectionInfo();
} }
@Test @Test
public void networkStateChangedIntent_shouldRefetchInfoForConnectedNetwork() { public void onUpdated_shouldUpdateNetworkInfo() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
displayAndResume(); displayAndResume();
verify(mMockConnectivityManager, times(1)).getNetworkInfo(any(Network.class)); verify(mController, times(1)).updateNetworkInfo();
verify(mMockWifiManager, times(1)).getConnectionInfo();
mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION)); mController.onUpdated();
verify(mMockConnectivityManager, times(2)).getNetworkInfo(any(Network.class)); verify(mController, times(2)).updateNetworkInfo();
verify(mMockWifiManager, times(2)).getConnectionInfo();
}
@Test
public void rssiChangedIntent_shouldRefetchInfo() {
setUpForConnectedNetwork();
displayAndResume();
verify(mMockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(1)).getConnectionInfo();
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mMockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(2)).getConnectionInfo();
}
@Test
public void rssiChangedIntent_shouldRefetchInfoForConnectedNetwork() {
setUpForConnectedNetwork();
displayAndResume();
verify(mMockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(1)).getConnectionInfo();
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mMockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
verify(mMockWifiManager, times(2)).getConnectionInfo();
} }
@Test @Test
@@ -1305,6 +1230,7 @@ public class WifiDetailPreferenceController2Test {
assertThat(mMockIpv6AddressesPref.isSelectable()).isFalse(); assertThat(mMockIpv6AddressesPref.isSelectable()).isFalse();
} }
@Ignore
@Test @Test
public void captivePortal_shouldShowSignInButton() { public void captivePortal_shouldShowSignInButton() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -1330,6 +1256,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockButtonsPref).setButton2Visible(false); inOrder.verify(mMockButtonsPref).setButton2Visible(false);
} }
@Ignore
@Test @Test
public void captivePortal_shouldShowVenueInfoButton() { public void captivePortal_shouldShowVenueInfoButton() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -1355,6 +1282,7 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockButtonsPref).setButton2Visible(false); inOrder.verify(mMockButtonsPref).setButton2Visible(false);
} }
@Ignore
@Test @Test
public void testSignInButton_shouldStartCaptivePortalApp() { public void testSignInButton_shouldStartCaptivePortalApp() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -1395,22 +1323,24 @@ public class WifiDetailPreferenceController2Test {
public void testDisconnectButton_connectedNetwork_shouldVisible() { public void testDisconnectButton_connectedNetwork_shouldVisible() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX); when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
when(mMockWifiEntry.canDisconnect()).thenReturn(true);
displayAndResume(); displayAndResume();
verify(mMockButtonsPref).setButton3Visible(true); verify(mMockButtonsPref).setButton3Visible(true);
verify(mMockButtonsPref).setButton3Text(R.string.wifi_disconnect); verify(mMockButtonsPref, times(2)).setButton3Text(R.string.wifi_disconnect_button_text);
} }
@Test @Test
public void testConnectButton_disconnectedNetwork_shouldVisibleIfReachable() { public void testConnectButton_disconnectedNetwork_shouldVisibleIfReachable() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX); when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
when(mMockWifiEntry.canConnect()).thenReturn(true);
displayAndResume(); displayAndResume();
verify(mMockButtonsPref).setButton3Visible(true); verify(mMockButtonsPref).setButton3Visible(true);
verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect); verify(mMockButtonsPref, times(2)).setButton3Text(R.string.wifi_connect);
} }
@Test @Test
@@ -1431,30 +1361,41 @@ public class WifiDetailPreferenceController2Test {
@Test @Test
public void testConnectButton_clickConnect_displayAsSuccess() { public void testConnectButton_clickConnect_displayAsSuccess() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
when(mMockWifiManager.isWifiEnabled()).thenReturn(true); final ArgumentCaptor<ConnectCallback> connectCallbackCaptor =
InOrder inOrder = inOrder(mMockButtonsPref); ArgumentCaptor.forClass(ConnectCallback.class);
String label = "title"; final InOrder inOrder = inOrder(mMockButtonsPref);
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED);
when(mMockWifiEntry.canConnect()).thenReturn(true);
final String label = "title";
when(mMockWifiEntry.getTitle()).thenReturn(label); when(mMockWifiEntry.getTitle()).thenReturn(label);
setUpForToast(); setUpForToast();
displayAndResume(); displayAndResume();
// check connect button enabled // check connect button displayed
verifyConnectBtnSetUpAsEnabled(inOrder); inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect);
inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_wireless);
// click connect button // click connect button
mController.connectDisconnectNetwork(); mController.connectDisconnectNetwork();
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTING);
when(mMockWifiEntry.canConnect()).thenReturn(false);
when(mMockWifiEntry.canDisconnect()).thenReturn(false);
mController.onUpdated();
// check display button as connecting // check display button as connecting
verify(mMockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class)); verify(mMockWifiEntry, times(1)).connect(connectCallbackCaptor.capture());
verifyConnectBtnSetUpAsConnecting(inOrder); verifyConnectingBtnAvailable(inOrder);
// update as connected // update as connected
connectCallbackCaptor.getValue().onConnectResult(
ConnectCallback.CONNECT_STATUS_SUCCESS);
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED); when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
when(mMockWifiEntry.canDisconnect()).thenReturn(true);
mController.onUpdated();
// check connect button invisible, be init as default state and toast success message // check disconnect button invisible, be init as default state and toast success message
verifyConnectBtnBeInitAsDefault(inOrder); verifyDisconnecBtnAvailable(inOrder);
inOrder.verify(mMockButtonsPref).setButton3Enabled(false);
assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo( assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
mContext.getString(R.string.wifi_connected_to_message, label)); mContext.getString(R.string.wifi_connected_to_message, label));
} }
@@ -1462,70 +1403,61 @@ public class WifiDetailPreferenceController2Test {
@Test @Test
public void testConnectButton_clickConnectButFailed_displayFailMessage() { public void testConnectButton_clickConnectButFailed_displayFailMessage() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
ArgumentCaptor<WifiManager.ActionListener> connectListenerCaptor = final ArgumentCaptor<ConnectCallback> connectCallbackCaptor =
ArgumentCaptor.forClass(WifiManager.ActionListener.class); ArgumentCaptor.forClass(ConnectCallback.class);
when(mMockWifiManager.isWifiEnabled()).thenReturn(true); final InOrder inOrder = inOrder(mMockButtonsPref);
InOrder inOrder = inOrder(mMockButtonsPref); when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED);
when(mMockWifiEntry.canDisconnect()).thenReturn(true);
setUpForToast(); setUpForToast();
displayAndResume(); displayAndResume();
// check connect button enabled // check connect button displayed
verifyConnectBtnSetUpAsEnabled(inOrder); inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect);
inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_wireless);
// click connect button // click connect button
mController.connectDisconnectNetwork(); mController.connectDisconnectNetwork();
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTING);
when(mMockWifiEntry.canConnect()).thenReturn(false);
when(mMockWifiEntry.canDisconnect()).thenReturn(false);
mController.onUpdated();
// check display button as connecting // check display button as connecting
verify(mMockWifiManager, times(1)).connect(anyInt(), connectListenerCaptor.capture()); verify(mMockWifiEntry, times(1)).connect(connectCallbackCaptor.capture());
verifyConnectBtnSetUpAsConnecting(inOrder); verifyConnectingBtnAvailable(inOrder);
// update as failed // update as failed
connectListenerCaptor.getValue().onFailure(-1); connectCallbackCaptor.getValue().onConnectResult(
ConnectCallback.CONNECT_STATUS_FAILURE_UNKNOWN);
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED);
when(mMockWifiEntry.canConnect()).thenReturn(true);
mController.onUpdated();
// check connect button visible, be init as default and toast failed message // check connect button available, be init as default and toast failed message
verifyConnectBtnBeInitAsDefault(inOrder); verifyConnectBtnAvailable(inOrder);
inOrder.verify(mMockButtonsPref).setButton3Enabled(true);
assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo( assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
mContext.getString(R.string.wifi_failed_connect_message)); mContext.getString(R.string.wifi_failed_connect_message));
} }
private void verifyConnectBtnSetUpAsEnabled(InOrder inOrder) { private void verifyConnectBtnAvailable(InOrder inOrder) {
inOrder.verify(mMockButtonsPref).setButton3Visible(true);
inOrder.verify(mMockButtonsPref).setButton3Enabled(true);
inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect); inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect);
inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_wireless); inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_wireless);
inOrder.verify(mMockButtonsPref).setButton3Enabled(true);
} }
private void verifyConnectBtnSetUpAsConnecting(InOrder inOrder) { private void verifyDisconnecBtnAvailable(InOrder inOrder) {
inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connecting); inOrder.verify(mMockButtonsPref).setButton3Visible(true);
inOrder.verify(mMockButtonsPref).setButton3Enabled(true);
inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_disconnect_button_text);
inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_close);
}
private void verifyConnectingBtnAvailable(InOrder inOrder) {
inOrder.verify(mMockButtonsPref).setButton3Visible(true);
inOrder.verify(mMockButtonsPref).setButton3Enabled(false); inOrder.verify(mMockButtonsPref).setButton3Enabled(false);
} inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connecting);
private void verifyConnectBtnBeInitAsDefault(InOrder inOrder) {
inOrder.verify(mMockButtonsPref).setButton3Text(R.string.wifi_connect);
inOrder.verify(mMockButtonsPref).setButton3Icon(R.drawable.ic_settings_wireless);
inOrder.verify(mMockButtonsPref).setButton3Enabled(true);
}
@Test
public void testRefreshRssiViews_shouldOnUpdated() {
setUpForConnectedNetwork();
displayAndResume();
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mController).onUpdated();
}
@Test
public void testRefreshRssiViews_shouldNotUpdateForNotInRangeNetwork() {
setUpForNotInRangeNetwork();
displayAndResume();
when(mMockWifiEntry.getLevel()).thenReturn(0);
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mMockSignalStrengthPref, times(2)).setVisible(false);
} }
@Test @Test
@@ -1580,46 +1512,17 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void checkMacTitle_whenPrivacyRandomizedMac_shouldBeRandom() { public void entityHeader_expired_shouldHandleExpiration() {
setUpForDisconnectedNetwork(); setUpForDisconnectedNetwork();
mMockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT; when(mMockWifiEntry.isExpired()).thenReturn(true);
when(mMockWifiConfig.getRandomizedMacAddress()).thenReturn(mMockMacAddress); final String expired = "Expired";
when(mMockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS); when(mMockWifiEntry.getSummary()).thenReturn(expired);
displayAndResume();
verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
}
@Test
public void checkMacTitle_whenPrivacyDeviceMac_shouldBeFactory() {
setUpForDisconnectedNetwork();
mMockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
when(mMockWifiConfig.getRandomizedMacAddress()).thenReturn(mMockMacAddress);
when(mMockWifiManager.getFactoryMacAddresses())
.thenReturn(new String[]{FACTORY_MAC_ADDRESS});
displayAndResume();
verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);
}
/* TODO(b/143326832): Support Passpoint test cases while WifiTracker2 supports it.
@Test
public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
when(mMockAccessPoint.isPasspoint()).thenReturn(true);
when(mMockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
when(mMockAccessPoint.isExpired()).thenReturn(true);
setUpForDisconnectedNetwork();
String expireSummary = mContext.getResources().getString(
com.android.settingslib.R.string.wifi_passpoint_expired);
displayAndResume(); displayAndResume();
verify(mMockButtonsPref, atLeastOnce()).setButton3Visible(false); verify(mMockButtonsPref, atLeastOnce()).setButton3Visible(false);
verify(mMockHeaderController).setSummary(expireSummary); verify(mMockHeaderController).setSummary(expired);
} }
*/
private ActionButtonsPreference createMock() { private ActionButtonsPreference createMock() {
final ActionButtonsPreference pref = mock(ActionButtonsPreference.class); final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);