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

Merge "Avoid launching captive portal pages when uri is empty" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-09-16 10:40:36 +00:00
committed by Android (Google) Code Review
parent 1e733f0177 0256fe816d
commit 16b9831831
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,7 @@ public class WifiDetailPreferenceController2Test {
private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
private static final String SECURITY = "None";
private static final String FQDN = "fqdn";
private static final Uri TEST_URI = Uri.parse("content://test/test");
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceScreen mMockScreen;
@@ -1876,6 +1877,24 @@ public class WifiDetailPreferenceController2Test {
verify(mMockSignalStrengthPref).setTitle(R.string.hotspot_connection_strength);
}
@Test
public void launchCaptivePortal_uriNull_doNothing() {
setUpSpyController();
mController.launchCaptivePortal(null);
verify(mContext, never()).startActivity(any());
}
@Test
public void launchCaptivePortal_uriNotNull_startActivity() {
setUpSpyController();
mController.launchCaptivePortal(TEST_URI);
verify(mContext).startActivity(any());
}
private SubscriptionInfo mockSubscriptionInfo(int subId, String displayName, int carrierId) {
SubscriptionInfo info = mock(SubscriptionInfo.class);
when(info.getSubscriptionId()).thenReturn(subId);