From 6afc73aef6a05a0f9114cd19138848b30c34dff1 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 18 Mar 2020 16:23:28 -0700 Subject: [PATCH] WifiMigrationTest: Add test for WifiMigration.loadFromSettings This assumes that OEM's were using the same AOSP @Settings.Global values to persist the data (which is probably true on all devices). Bug: 150236894 Test: atest android.net.wifi.cts.WifiMigrationTest Change-Id: I7e80730c81e6ed4773cf187e4eb1018528edb158 --- .../net/wifi/cts/WifiMigrationTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 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 ea59f00a22..7d94ad3ff8 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiMigrationTest.java @@ -16,16 +16,9 @@ package android.net.wifi.cts; -import static org.junit.Assert.assertNotNull; - -import android.net.wifi.SoftApConfiguration; -import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiMigration; import android.test.AndroidTestCase; -import java.util.Arrays; -import java.util.List; - public class WifiMigrationTest extends AndroidTestCase { private static final String TEST_SSID_UNQUOTED = "testSsid1"; @@ -49,7 +42,7 @@ public class WifiMigrationTest extends AndroidTestCase { } /** - * Tests {@link android.net.wifi.WifiMigration.ConfigStoreMigrationData} class. + * Tests {@link android.net.wifi.WifiMigration.SettingsMigrationData.Builder} class. */ public void testWifiMigrationSettingsDataBuilder() throws Exception { if (!WifiFeature.isWifiSupported(getContext())) { @@ -76,4 +69,15 @@ public class WifiMigrationTest extends AndroidTestCase { assertTrue(migrationData.isVerboseLoggingEnabled()); assertEquals(TEST_SSID_UNQUOTED, migrationData.getP2pDeviceName()); } + + /** + * Tests {@link android.net.wifi.WifiMigration.SettingsMigrationData} class. + */ + public void testWifiMigrationSettings() throws Exception { + try { + // ensure that this does not crash. + WifiMigration.loadFromSettings(getContext()); + } catch (Exception ignore) { + } + } }