From 74ab41b1cdfde999332a7ff79bec531dfb211208 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 16 Mar 2020 14:07:35 -0700 Subject: [PATCH] WifiMigrationTest: Remove all usage of WifiMigration.loadFromStore In preparation of moving away from this API surface to a different mechanism. Bug: 149418926 Test: atest android.net.wifi.cts Change-Id: I5805d9dc27a248b633d514356f603f63af799429 --- .../net/wifi/cts/WifiMigrationTest.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java index 6e19a21217..ea59f00a22 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java @@ -48,41 +48,6 @@ public class WifiMigrationTest extends AndroidTestCase { super.tearDown(); } - /** - * Tests {@link android.net.wifi.WifiMigration.ConfigStoreMigrationData} class. - */ - public void testWifiMigrationConfigStoreDataBuilder() throws Exception { - if (!WifiFeature.isWifiSupported(getContext())) { - // skip the test if WiFi is not supported - return; - } - WifiConfiguration savedNetwork1 = new WifiConfiguration(); - savedNetwork1.SSID = "\"test1\""; - WifiConfiguration savedNetwork2 = new WifiConfiguration(); - savedNetwork1.SSID = "\"test2\""; - List savedNetworks = Arrays.asList(savedNetwork1, savedNetwork2); - - SoftApConfiguration softApConfiguration = new SoftApConfiguration.Builder() - .setSsid("\"test3\"") - .build(); - - WifiMigration.ConfigStoreMigrationData migrationData = - new WifiMigration.ConfigStoreMigrationData.Builder() - .setUserSavedNetworkConfigurations(savedNetworks) - .setUserSoftApConfiguration(softApConfiguration) - .build(); - - assertNotNull(migrationData); - assertEquals(savedNetworks.size(), - migrationData.getUserSavedNetworkConfigurations().size()); - assertEquals(savedNetwork1.SSID, - migrationData.getUserSavedNetworkConfigurations().get(0).SSID); - assertEquals(savedNetwork2.SSID, - migrationData.getUserSavedNetworkConfigurations().get(1).SSID); - assertEquals(softApConfiguration.getSsid(), - migrationData.getUserSoftApConfiguration().getSsid()); - } - /** * Tests {@link android.net.wifi.WifiMigration.ConfigStoreMigrationData} class. */