diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java index 46ecbd45a8605..cb41743a02e41 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java @@ -694,6 +694,16 @@ public class AccessPointTest { assertThat(ap.getTitle()).isEqualTo(providerFriendlyName); } + // This method doesn't copy mIsFailover, mIsAvailable and mIsRoaming because NetworkInfo + // doesn't expose those three set methods. But that's fine since the tests don't use those three + // variables. + private NetworkInfo copyNetworkInfo(NetworkInfo ni) { + final NetworkInfo copy = new NetworkInfo(ni.getType(), ni.getSubtype(), ni.getTypeName(), + ni.getSubtypeName()); + copy.setDetailedState(ni.getDetailedState(), ni.getReason(), ni.getExtraInfo()); + return copy; + } + @Test public void testUpdateNetworkInfo_returnsTrue() { int networkId = 123; @@ -715,7 +725,7 @@ public class AccessPointTest { .setWifiInfo(wifiInfo) .build(); - NetworkInfo newInfo = new NetworkInfo(networkInfo); + NetworkInfo newInfo = copyNetworkInfo(networkInfo); newInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", ""); assertThat(ap.update(config, wifiInfo, newInfo)).isTrue(); } @@ -741,7 +751,7 @@ public class AccessPointTest { .setWifiInfo(wifiInfo) .build(); - NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values + NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values assertThat(ap.update(config, wifiInfo, newInfo)).isFalse(); } @@ -766,7 +776,7 @@ public class AccessPointTest { .setWifiInfo(wifiInfo) .build(); - NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values + NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values wifiInfo.setRssi(rssi + 1); assertThat(ap.update(config, wifiInfo, newInfo)).isTrue(); } @@ -792,7 +802,7 @@ public class AccessPointTest { .setWifiInfo(wifiInfo) .build(); - NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values + NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values wifiInfo.setRssi(WifiInfo.INVALID_RSSI); assertThat(ap.update(config, wifiInfo, newInfo)).isFalse(); }