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

Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445

Browse Source 
Change-Id: I035849dc12342937d00c55aa727116bc626322ab
This commit is contained in:
Goven Liu
2020-04-01 04:00:58 +00:00
committed by Automerger Merge Worker
parent 1a963d5f96 4b67490445
commit dbc337b4c5
1 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,15 +304,31 @@ public class WifiDetailPreferenceController2Test {
private void setUpForConnectedNetwork() {
when(mMockNetworkDetailsTracker.getWifiEntry()).thenReturn(mMockWifiEntry);
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
}
mController = newWifiDetailPreferenceController2();
private void setUpController() {
mController = new WifiDetailPreferenceController2(
mMockWifiEntry,
mMockConnectivityManager,
mContext,
mMockFragment,
null, // Handler
mLifecycle,
mMockWifiManager,
mMockMetricsFeatureProvider,
mMockIconInjector,
mMockClock);
}
private void setUpSpyController() {
mController = newSpyWifiDetailPreferenceController2();
}
private void setUpForDisconnectedNetwork() {
when(mMockNetworkDetailsTracker.getWifiEntry()).thenReturn(mMockWifiEntry);
when(mMockWifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_DISCONNECTED);
mController = newWifiDetailPreferenceController2();
mController = newSpyWifiDetailPreferenceController2();
}
private void setUpForNotInRangeNetwork() {
@@ -320,10 +336,10 @@ public class WifiDetailPreferenceController2Test {
when(mMockNetworkDetailsTracker.getWifiEntry()).thenReturn(mMockWifiEntry);
when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);
mController = newWifiDetailPreferenceController2();
mController = newSpyWifiDetailPreferenceController2();
}
private WifiDetailPreferenceController2 newWifiDetailPreferenceController2() {
private WifiDetailPreferenceController2 newSpyWifiDetailPreferenceController2() {
return spy(new WifiDetailPreferenceController2(
mMockWifiEntry,
mMockConnectivityManager,
@@ -383,6 +399,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void isAvailable_shouldAlwaysReturnTrue() {
setUpForConnectedNetwork();
setUpSpyController();
mController.displayPreference(mMockScreen);
assertThat(mController.isAvailable()).isTrue();
@@ -391,6 +408,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void securityPreference_stringShouldBeSet() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
verify(mMockSecurityPref).setSummary(SECURITY);
@@ -399,6 +417,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void latestWifiInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -426,6 +445,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void latestNetworkInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -453,6 +473,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void networkCallback_shouldBeRegisteredOnResume() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
verify(mMockConnectivityManager, times(1)).registerNetworkCallback(
@@ -462,6 +483,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void networkCallback_shouldBeUnregisteredOnPause() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
mController.onPause();
@@ -472,6 +494,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void entityHeader_shouldHaveIconSetForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
Drawable expectedIcon = mMockIconInjector.getIcon(LEVEL);
displayAndResume();
@@ -501,6 +524,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void entityHeader_shouldHaveLabelSetToTitle() {
setUpForConnectedNetwork();
setUpSpyController();
String label = "title";
when(mMockWifiEntry.getTitle()).thenReturn(label);
@@ -512,6 +536,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void entityHeader_shouldHaveSummarySet() {
setUpForConnectedNetwork();
setUpSpyController();
String summary = "summary";
when(mMockWifiEntry.getSummary()).thenReturn(summary);
@@ -523,6 +548,7 @@ public class WifiDetailPreferenceController2Test {
private void doShouldShowRemainingTimeTest(ZonedDateTime now, long timeRemainingMs) {
when(mMockClock.now()).thenReturn(now);
setUpForConnectedNetwork();
setUpController();
displayAndResume();
final CaptivePortalData data = new CaptivePortalData.Builder()
@@ -534,7 +560,6 @@ public class WifiDetailPreferenceController2Test {
updateLinkProperties(lp);
}
@Ignore
@Test
public void entityHeader_shouldShowShortRemainingTime() {
// Expires in 1h, 2min, 15sec
@@ -551,7 +576,6 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockHeaderController).setSecondSummary((String) null);
}
@Ignore
@Test
public void entityHeader_shouldShowExpiryDate() {
// Expires in 49h, 2min, 15sec
@@ -582,6 +606,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -609,6 +634,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void signalStrengthPref_shouldHaveDetailTextSetForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
String expectedStrength =
mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
@@ -640,6 +666,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void linkSpeedPref_shouldNotShowIfNotSet() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
displayAndResume();
@@ -650,6 +677,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void linkSpeedPref_shouldVisibleForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
String expectedLinkSpeed = mContext.getString(R.string.tx_link_speed, TX_LINK_SPEED);
displayAndResume();
@@ -681,6 +709,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void rxLinkSpeedPref_shouldNotShowIfNotSet() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
displayAndResume();
@@ -691,6 +720,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void rxLinkSpeedPref_shouldVisibleForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
String expectedLinkSpeed = mContext.getString(R.string.rx_link_speed, RX_LINK_SPEED);
displayAndResume();
@@ -722,6 +752,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void ssidPref_isSubscription_show() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSubscription()).thenReturn(true);
when(mMockWifiEntry.getSsid()).thenReturn(SSID);
@@ -734,6 +765,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void ssidPref_notSubscription_hide() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSubscription()).thenReturn(false);
displayAndResume();
@@ -745,6 +777,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void macAddressPref_shouldVisibleForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSaved()).thenReturn(true);
when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_DEVICE_MAC);
when(mMockWifiEntry.getMacAddress()).thenReturn(MAC_ADDRESS);
@@ -787,6 +820,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void ipAddressPref_shouldHaveDetailTextSetForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
displayAndResume();
@@ -807,6 +841,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void gatewayAndSubnet_shouldHaveDetailTextSetForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
mLinkProperties.addRoute(Constants.IPV4_DEFAULT);
mLinkProperties.addRoute(Constants.IPV4_SUBNET);
@@ -831,6 +866,7 @@ public class WifiDetailPreferenceController2Test {
public void dnsServersPref_shouldHaveDetailTextSetForConnectedNetwork()
throws UnknownHostException {
setUpForConnectedNetwork();
setUpSpyController();
mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 4, 4}));
mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 8, 8}));
mLinkProperties.addDnsServer(Constants.IPV6_DNS);
@@ -855,6 +891,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiManager.getCurrentNetwork()).thenReturn(null);
displayAndResume();
@@ -865,6 +902,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void noLinkProperties_allIpDetailsHidden() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockConnectivityManager.getLinkProperties(mMockNetwork)).thenReturn(null);
reset(mMockIpv6Category, mMockIpAddressPref, mMockSubnetPref, mMockGatewayPref,
mMockDnsPref);
@@ -932,10 +970,10 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockIpv6AddressesPref).setSummary(text);
}
@Ignore
@Test
public void onLinkPropertiesChanged_updatesFields() {
setUpForConnectedNetwork();
setUpController();
displayAndResume();
InOrder inOrder = inOrder(mMockIpAddressPref, mMockGatewayPref, mMockSubnetPref,
@@ -990,10 +1028,10 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockDnsPref).setVisible(true);
}
@Ignore
@Test
public void onCapabilitiesChanged_callsRefreshIfNecessary() {
setUpForConnectedNetwork();
setUpController();
NetworkCapabilities nc = makeNetworkCapabilities();
when(mMockConnectivityManager.getNetworkCapabilities(mMockNetwork))
.thenReturn(new NetworkCapabilities(nc));
@@ -1053,8 +1091,9 @@ public class WifiDetailPreferenceController2Test {
@Test
public void canForgetNetwork_shouldInvisibleIfWithoutConfiguration() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSaved()).thenReturn(false);
mController = newWifiDetailPreferenceController2();
mController = newSpyWifiDetailPreferenceController2();
displayAndResume();
@@ -1064,6 +1103,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void onUpdated_canForget_showForgetButton() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.canForget()).thenReturn(true);
displayAndResume();
@@ -1075,6 +1115,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void onUpdated_canNotForget_hideForgetButton() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.canForget()).thenReturn(false);
displayAndResume();
@@ -1086,6 +1127,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void canShareNetwork_shouldInvisibleIfWithoutConfiguration() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSaved()).thenReturn(false);
displayAndResume();
@@ -1096,6 +1138,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void canModifyNetwork_savedNetwork_returnTrue() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSaved()).thenReturn(true);
assertThat(mController.canModifyNetwork()).isTrue();
@@ -1104,6 +1147,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void canModifyNetwork_lockedDown() {
setUpForConnectedNetwork();
setUpSpyController();
lockDownNetwork();
assertThat(mController.canModifyNetwork()).isFalse();
@@ -1135,6 +1179,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void forgetNetwork_standardWifiNetwork_forget() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
mForgetClickListener.getValue().onClick(null);
@@ -1147,6 +1192,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void forgetNetwork_isSubscription_shouldShowDialog() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.isSubscription()).thenReturn(true);
displayAndResume();
@@ -1161,6 +1207,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void networkStateChangedIntent_shouldRefetchInfo() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -1171,6 +1218,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void onUpdated_shouldUpdateNetworkInfo() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -1184,6 +1232,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void networkDisconnectedState_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -1196,6 +1245,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void networkOnLost_shouldNotFinishActivityForConnectedNetwork() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -1207,6 +1257,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
setUpForConnectedNetwork();
setUpSpyController();
mLinkProperties.addLinkAddress(Constants.IPV6_LINKLOCAL);
mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL1);
mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
@@ -1224,6 +1275,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void ipv6AddressPref_shouldNotBeSelectable() {
setUpForConnectedNetwork();
setUpSpyController();
mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
displayAndResume();
@@ -1235,6 +1287,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void captivePortal_shouldShowSignInButton() {
setUpForConnectedNetwork();
setUpSpyController();
InOrder inOrder = inOrder(mMockButtonsPref);
@@ -1257,10 +1310,10 @@ public class WifiDetailPreferenceController2Test {
inOrder.verify(mMockButtonsPref).setButton2Visible(false);
}
@Ignore
@Test
public void captivePortal_shouldShowVenueInfoButton() {
setUpForConnectedNetwork();
setUpController();
InOrder inOrder = inOrder(mMockButtonsPref);
@@ -1287,6 +1340,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void testSignInButton_shouldStartCaptivePortalApp() {
setUpForConnectedNetwork();
setUpSpyController();
displayAndResume();
@@ -1323,6 +1377,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void testDisconnectButton_connectedNetwork_shouldVisible() {
setUpForConnectedNetwork();
setUpSpyController();
when(mMockWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
when(mMockWifiEntry.canDisconnect()).thenReturn(true);
@@ -1464,6 +1519,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void testRedrawIconForHeader_shouldEnlarge() {
setUpForConnectedNetwork();
setUpSpyController();
ArgumentCaptor<BitmapDrawable> drawableCaptor =
ArgumentCaptor.forClass(BitmapDrawable.class);
Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
@@ -1502,6 +1558,7 @@ public class WifiDetailPreferenceController2Test {
@Test
public void testRedrawIconForHeader_shouldNotEnlargeIfNotVectorDrawable() {
setUpForConnectedNetwork();
setUpSpyController();
ArgumentCaptor<ColorDrawable> drawableCaptor =
ArgumentCaptor.forClass(ColorDrawable.class);