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

Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: I86b367dd8c072aeb8de4a610e7cf6c19fc5c8287
This commit is contained in:
Alexander Dorokhine
2020-10-06 11:05:22 +00:00
committed by Automerger Merge Worker
parent 2f068a914e 1b69ab26e9
commit 94fa8e0921
36 changed files with 139 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
View File

@@ -36,6 +36,6 @@ public class ConfigureWifiSettingsTest {
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
assertThat(keys).isNotNull();
assertThat(niks).containsAllIn(keys);
assertThat(niks).containsAtLeastElementsIn(keys);
}
}

2
tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
View File

@@ -103,7 +103,7 @@ public class WifiP2pSettingsTest {
preferenceKeys.add(controller.getPreferenceKey());
}
assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
}
@Test