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

Add capport info to WiFi details

Browse Source 
Session expiration time and venue webpage can be obtained through the
captive portal API.

Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
Bug: 139269711
Change-Id: Ie767a9b8eb17de2c1b70928a8f3cdf4cf2a1dbd1
This commit is contained in:
lucaslin
2020-02-19 17:31:25 +08:00
parent e6704dc37d
commit 9f7f0b5baf
3 changed files with 191 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doNothing;
@@ -41,6 +40,7 @@ import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.CaptivePortalData;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.IpPrefix;
@@ -52,6 +52,7 @@ import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.RouteInfo;
import android.net.Uri;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -75,6 +76,7 @@ import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference;
import com.android.settingslib.wifi.AccessPoint;
@@ -99,6 +101,10 @@ import org.robolectric.shadows.ShadowToast;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Collectors;
@@ -146,6 +152,8 @@ public class WifiDetailPreferenceControllerTest {
@Mock
private WifiDetailPreferenceController.IconInjector mockIconInjector;
@Mock
private WifiDetailPreferenceController.Clock mMockClock;
@Mock
private MacAddress mockMacAddress;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -286,7 +294,10 @@ public class WifiDetailPreferenceControllerTest {
// builder pattern
when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
.thenReturn(mockHeaderController);
when(mockHeaderController.setSummary(anyString())).thenReturn(mockHeaderController);
when(mockHeaderController.setSummary(nullable(String.class)))
.thenReturn(mockHeaderController);
when(mockHeaderController.setSecondSummary(nullable(String.class)))
.thenReturn(mockHeaderController);
when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
setupMockedPreferenceScreen();
@@ -338,7 +349,8 @@ public class WifiDetailPreferenceControllerTest {
mLifecycle,
mockWifiManager,
mockMetricsFeatureProvider,
mockIconInjector);
mockIconInjector,
mMockClock);
}
private void setupMockedPreferenceScreen() {
@@ -525,6 +537,54 @@ public class WifiDetailPreferenceControllerTest {
verify(mockHeaderController).setSummary(summary);
}
private void doShouldShowRemainingTimeTest(ZonedDateTime now, long timeRemainingMs) {
when(mMockClock.now()).thenReturn(now);
setUpForConnectedNetwork();
displayAndResume();
final CaptivePortalData data = new CaptivePortalData.Builder()
.setExpiryTime(now.toInstant().getEpochSecond() * 1000 + timeRemainingMs)
.build();
final LinkProperties lp = new LinkProperties();
lp.setCaptivePortalData(data);
updateLinkProperties(lp);
}
@Test
public void entityHeader_shouldShowShortRemainingTime() {
// Expires in 1h, 2min, 15sec
final long timeRemainingMs = (3600 + 2 * 60 + 15) * 1000;
final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
ZoneId.of("Europe/London"));
doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
final String expectedSummary = mContext.getString(R.string.wifi_time_remaining,
StringUtil.formatElapsedTime(mContext, timeRemainingMs, false /* withSeconds */));
final InOrder inOrder = inOrder(mockHeaderController);
inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
updateLinkProperties(new LinkProperties());
inOrder.verify(mockHeaderController).setSecondSummary((String) null);
}
@Test
public void entityHeader_shouldShowExpiryDate() {
// Expires in 49h, 2min, 15sec
final long timeRemainingMs = (49 * 3600 + 2 * 60 + 15) * 1000;
final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
ZoneId.of("Europe/London"));
doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
final String expectedSummary = mContext.getString(
R.string.wifi_expiry_time,
DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(
fakeNow.plusNanos(timeRemainingMs * 1_000_000)));
final InOrder inOrder = inOrder(mockHeaderController);
inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
updateLinkProperties(new LinkProperties());
inOrder.verify(mockHeaderController).setSecondSummary((String) null);
}
@Test
public void entityHeader_shouldConvertSavedAsDisconnected() {
setUpForDisconnectedNetwork();
@@ -1272,6 +1332,8 @@ public class WifiDetailPreferenceControllerTest {
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
updateNetworkCapabilities(nc);
inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_sign_in_button_text);
inOrder.verify(mockButtonsPref).setButton2Visible(true);
nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
@@ -1279,6 +1341,31 @@ public class WifiDetailPreferenceControllerTest {
inOrder.verify(mockButtonsPref).setButton2Visible(false);
}
@Test
public void captivePortal_shouldShowVenueInfoButton() {
setUpForConnectedNetwork();
InOrder inOrder = inOrder(mockButtonsPref);
displayAndResume();
inOrder.verify(mockButtonsPref).setButton2Visible(false);
LinkProperties lp = new LinkProperties();
final CaptivePortalData data = new CaptivePortalData.Builder()
.setVenueInfoUrl(Uri.parse("https://example.com/info"))
.build();
lp.setCaptivePortalData(data);
updateLinkProperties(lp);
inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_venue_website_button_text);
inOrder.verify(mockButtonsPref).setButton2Visible(true);
lp.setCaptivePortalData(null);
updateLinkProperties(lp);
inOrder.verify(mockButtonsPref).setButton2Visible(false);
}
@Test
public void testSignInButton_shouldStartCaptivePortalApp() {
setUpForConnectedNetwork();
@@ -1286,7 +1373,8 @@ public class WifiDetailPreferenceControllerTest {
displayAndResume();
ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
verify(mockButtonsPref).setButton2OnClickListener(captor.capture());
verify(mockButtonsPref, atLeastOnce()).setButton2OnClickListener(captor.capture());
// getValue() returns the last captured value
captor.getValue().onClick(null);
verify(mockConnectivityManager).startCaptivePortalApp(mockNetwork);
verify(mockMetricsFeatureProvider)