diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-16 21:04:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-16 21:04:42 +0000 |
| commit | 2cdbd0860a83e252ea3b0da27cf4d5d0e86d50d7 (patch) | |
| tree | 5f87b2d2ec26843995faefbfb3547c212c2b9851 /tests | |
| parent | 656f7b75dcb6c972378235683d5653d8fd086c89 (diff) | |
| parent | ac4037a47512e6a8508a06225ee47a7939c84605 (diff) | |
Merge "Stop persist numAssociation" into rvc-dev
Diffstat (limited to 'tests')
3 files changed, 1 insertions, 7 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java index d04076aa7..80dfd7ae5 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java @@ -95,7 +95,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest { + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<int name=\"MeteredOverride\" value=\"2\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<string name=\"CreatorName\">%s</string>\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" @@ -151,7 +150,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest { + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<int name=\"MeteredOverride\" value=\"0\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<string name=\"CreatorName\">%s</string>\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" @@ -228,7 +226,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest { + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<int name=\"MeteredOverride\" value=\"0\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<string name=\"CreatorName\">%s</string>\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" @@ -291,7 +288,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest { + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<int name=\"MeteredOverride\" value=\"0\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<string name=\"CreatorName\">%s</string>\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" @@ -528,7 +524,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest { + "<boolean name=\"NoInternetAccessExpected\" value=\"false\" />\n" + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<null name=\"CreatorName\" />\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java index 834165471..671076bf5 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java @@ -107,7 +107,6 @@ public class WifiConfigStoreTest extends WifiBaseTest { + "<boolean name=\"MeteredHint\" value=\"false\" />\n" + "<int name=\"MeteredOverride\" value=\"0\" />\n" + "<boolean name=\"UseExternalScores\" value=\"false\" />\n" - + "<int name=\"NumAssociation\" value=\"0\" />\n" + "<int name=\"CreatorUid\" value=\"%d\" />\n" + "<string name=\"CreatorName\">%s</string>\n" + "<int name=\"LastUpdateUid\" value=\"-1\" />\n" diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java index e41bb5901..b991104f3 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java @@ -635,7 +635,7 @@ public class WifiConfigurationTestUtil { assertEquals(expected.meteredHint, actual.meteredHint); assertEquals(expected.meteredOverride, actual.meteredOverride); assertEquals(expected.useExternalScores, actual.useExternalScores); - assertEquals(expected.numAssociation, actual.numAssociation); + assertEquals(0, actual.numAssociation); assertEquals(expected.creatorUid, actual.creatorUid); assertEquals(expected.creatorName, actual.creatorName); assertEquals(expected.lastUpdateUid, actual.lastUpdateUid); |