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

Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-01 09:39:12 +00:00
committed by Android (Google) Code Review
parent cfbdcaf9f5 26d3b7dd1b
commit 93162ce9f4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,6 @@ import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -1283,11 +1282,10 @@ public class WifiDetailPreferenceController2Test {
assertThat(mMockIpv6AddressesPref.isSelectable()).isFalse();
}
@Ignore
@Test
public void captivePortal_shouldShowSignInButton() {
setUpForConnectedNetwork();
setUpSpyController();
setUpController();
InOrder inOrder = inOrder(mMockButtonsPref);
@@ -1299,14 +1297,17 @@ public class WifiDetailPreferenceController2Test {
updateNetworkCapabilities(nc);
inOrder.verify(mMockButtonsPref).setButton2Visible(false);
when(mMockWifiEntry.canSignIn()).thenReturn(true);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
updateNetworkCapabilities(nc);
inOrder.verify(mMockButtonsPref).setButton2Text(R.string.wifi_sign_in_button_text);
inOrder.verify(mMockButtonsPref).setButton2Visible(true);
when(mMockWifiEntry.canSignIn()).thenReturn(false);
nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
updateNetworkCapabilities(nc);
inOrder.verify(mMockButtonsPref).setButton2Visible(false);
}
@@ -1336,7 +1337,6 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockButtonsPref).setButton2Visible(false);
}
@Ignore
@Test
public void testSignInButton_shouldStartCaptivePortalApp() {
setUpForConnectedNetwork();
@@ -1348,7 +1348,7 @@ public class WifiDetailPreferenceController2Test {
verify(mMockButtonsPref, atLeastOnce()).setButton2OnClickListener(captor.capture());
// getValue() returns the last captured value
captor.getValue().onClick(null);
verify(mMockConnectivityManager).startCaptivePortalApp(mMockNetwork);
verify(mMockWifiEntry).signIn(any(WifiEntry.SignInCallback.class));
verify(mMockMetricsFeatureProvider)
.action(mMockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
}