From beafc363604d10422266f43caf536bcbae25a533 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 2 Jun 2017 17:55:55 +0900 Subject: [PATCH] Minor tweaks to WifiDetailPreferenceControllerTest. Add makeNetworkCapabilities and updateNetworkCapabilities methods, and use them. These are not very useful in the current code but we introduce in their own CL to limit test changes in an upcoming CL that will make use them to test new code. Bug: 62209358 Test: make -j64 RunSettingsRoboTests Change-Id: I67269e1add40ecb3c2b693548e8bf29ae776a79f --- .../WifiDetailPreferenceControllerTest.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 41825a5fc21..5a4eafc5ad2 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -445,6 +445,17 @@ public class WifiDetailPreferenceControllerTest { mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp)); } + private void updateNetworkCapabilities(NetworkCapabilities nc) { + mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc)); + } + + private NetworkCapabilities makeNetworkCapabilities() { + NetworkCapabilities nc = new NetworkCapabilities(); + nc.clearAll(); + nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); + return nc; + } + private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) { String text = Arrays.stream(addresses) .map(address -> asString(address)) @@ -589,7 +600,7 @@ public class WifiDetailPreferenceControllerTest { } @Test - public void networkDisconnectdState_shouldFinishActivity() { + public void networkDisconnectedState_shouldFinishActivity() { mController.onResume(); when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null); @@ -644,22 +655,16 @@ public class WifiDetailPreferenceControllerTest { inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE); - NetworkCapabilities nc = new NetworkCapabilities(); - nc.clearAll(); - nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); - - NetworkCallback callback = mCallbackCaptor.getValue(); - callback.onCapabilitiesChanged(mockNetwork, nc); + NetworkCapabilities nc = makeNetworkCapabilities(); + updateNetworkCapabilities(nc); inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE); - nc = new NetworkCapabilities(nc); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL); - callback.onCapabilitiesChanged(mockNetwork, nc); + updateNetworkCapabilities(nc); inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE); - nc = new NetworkCapabilities(nc); nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL); - callback.onCapabilitiesChanged(mockNetwork, nc); + updateNetworkCapabilities(nc); inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE); }