wifi: adapt to multi-type config conversion
A multi-type configuration might be converted to more than 1
single-type configuration. As a result, the list checking codes
should be revised to a loose comparison.
Bug: 186066324
Bug: 195612845
Test: atest CtsWifiTestCases
Change-Id: Id2d31e3fd6466b02f6edb1d849aa85f37ec84adc
(cherry picked from commit b7aeca0a8c0ba00294c9b9dd38277551634f5693)
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiBackupRestoreTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiBackupRestoreTest.java
index ae2ad6f..723ef39 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiBackupRestoreTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiBackupRestoreTest.java
@@ -375,12 +375,13 @@
}
/**
- * Asserts that the 2 lists of WifiConfigurations are equal. This compares all the elements
- * saved for backup/restore.
+ * Check that expected configrations could be found in restored configurations.
+ * As multi-type configurations would be converted to several single-type configurations,
+ * two list could not be compared directly.
*/
public static void assertConfigurationsEqual(
List<WifiConfiguration> expected, List<WifiConfiguration> actual) {
- assertThat(actual.size()).isEqualTo(expected.size());
+ assertThat(actual.size() >= expected.size()).isTrue();
for (WifiConfiguration expectedConfiguration : expected) {
String expectedConfigKey = expectedConfiguration.getKey();
boolean didCompare = false;
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index 025b7e3..b43037a 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -20,6 +20,7 @@
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
+import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertNotEquals;
@@ -1978,7 +1979,8 @@
newNetworkId = mWifiManager.addNetwork(newOpenNetwork);
assertNotEquals(INVALID_NETWORK_ID, newNetworkId);
- assertEquals(savedNetworks.size() + 1, mWifiManager.getConfiguredNetworks().size());
+ // Multi-type configurations might be converted to more than 1 configuration.
+ assertThat(savedNetworks.size() < mWifiManager.getConfiguredNetworks().size()).isTrue();
// Need an effectively-final holder because we need to modify inner Intent in callback.
class IntentHolder {
