diff options
| author | Alexander Dorokhine <adorokhine@google.com> | 2020-10-13 19:55:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-13 19:55:35 +0000 |
| commit | 1e361b95704f9caa987cf322ee4b8e93e95a08b2 (patch) | |
| tree | 04921df4e02794c6ffd76449a381c59cf0655e9a /packages/SettingsLib | |
| parent | ab35de13744347662d68ebca7bc1ae495ea1c238 (diff) | |
| parent | e52360b58f54be0c64408ac2fa3488d6f2f00f32 (diff) | |
Merge "Migrate away from deprecated Truth APIs." am: b65c13a7b9 am: e52360b58f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457153
Change-Id: I2bee34221667cb52f7a30d54670126c144b31c35
Diffstat (limited to 'packages/SettingsLib')
4 files changed, 6 insertions, 5 deletions
diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index 81cf118031bf..b0a913617ba0 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -1090,7 +1090,7 @@ public class WifiTrackerTest { // Verify second update AP is the same object as the first update AP assertThat(passpointAccessPointsFirstUpdate.get(0)) - .isSameAs(passpointAccessPointsSecondUpdate.get(0)); + .isSameInstanceAs(passpointAccessPointsSecondUpdate.get(0)); // Verify second update AP has the average of the first and second update RSSIs assertThat(passpointAccessPointsSecondUpdate.get(0).getRssi()) .isEqualTo((prevRssi + newRssi) / 2); @@ -1210,7 +1210,8 @@ public class WifiTrackerTest { providersAndScans, cachedAccessPoints); // Verify second update AP is the same object as the first update AP - assertThat(osuAccessPointsFirstUpdate.get(0)).isSameAs(osuAccessPointsSecondUpdate.get(0)); + assertThat(osuAccessPointsFirstUpdate.get(0)) + .isSameInstanceAs(osuAccessPointsSecondUpdate.get(0)); // Verify second update AP has the average of the first and second update RSSIs assertThat(osuAccessPointsSecondUpdate.get(0).getRssi()) .isEqualTo((prevRssi + newRssi) / 2); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java index a83d7e099e51..b392c5e5d772 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java @@ -69,7 +69,7 @@ public class IpAddressPreferenceControllerTest { assertWithMessage("Intent filter should contain expected intents") .that(ipAddressPreferenceController.getConnectivityIntents()) - .asList().containsAllIn(expectedIntents); + .asList().containsAtLeastElementsIn(expectedIntents); } private static class ConcreteIpAddressPreferenceController extends diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java index 40b9b13ef55f..37052673eb4d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java @@ -90,7 +90,7 @@ public class WifiMacAddressPreferenceControllerTest { assertWithMessage("Intent filter should contain expected intents") .that(mController.getConnectivityIntents()) - .asList().containsAllIn(expectedIntents); + .asList().containsAtLeastElementsIn(expectedIntents); } @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java index 176905305506..906e06e81e2b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java @@ -284,7 +284,7 @@ public class TileUtilsTest { assertThat(outTiles).hasSize(1); final Bundle newMetaData = outTiles.get(0).getMetaData(); - assertThat(newMetaData).isNotSameAs(oldMetadata); + assertThat(newMetaData).isNotSameInstanceAs(oldMetadata); } @Test |