summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2020-02-19 09:41:41 -0800
committerRoshan Pius <rpius@google.com>2020-02-19 09:49:41 -0800
commitd2ecb999e4db2f86e4fccbadfd0128f61ac75c43 (patch)
tree220a8f777213d0ebf3ff5519fa711ca6ca94f0e6 /tests
parente533890ccc347526e4f95686a1e40fb402dbdebe (diff)
WifiApConfigStore: Use the new env method to get location of legacy file
Bug: 148660313 Test: atest com.android.server.wifi Change-Id: I8d228de9a6e146a3e07913e84ddcd10b80e0a05e
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
index 9c10cdf3d..63290db38 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
@@ -135,16 +135,16 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
/**
* Helper method to create and verify actions for the ApConfigStore used in the following tests.
*/
- private WifiApConfigStore createWifiApConfigStore(String legacyFilePath) {
+ private WifiApConfigStore createWifiApConfigStore(File legacyFile) {
WifiApConfigStore store;
- if (legacyFilePath == null) {
+ if (legacyFile == null) {
store = new WifiApConfigStore(
mContext, mWifiInjector, mHandler, mBackupManagerProxy,
mWifiConfigStore, mWifiConfigManager, mActiveModeWarden);
} else {
store = new WifiApConfigStore(
mContext, mWifiInjector, mHandler, mBackupManagerProxy,
- mWifiConfigStore, mWifiConfigManager, mActiveModeWarden, legacyFilePath);
+ mWifiConfigStore, mWifiConfigManager, mActiveModeWarden, legacyFile);
}
verify(mWifiConfigStore).registerStoreData(any());
@@ -325,7 +325,7 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
assertWifiConfigurationEqualSoftApConfiguration(backupConfig, expectedConfig);
writeLegacyApConfigFile(backupConfig);
- WifiApConfigStore store = createWifiApConfigStore(mLegacyApConfigFile.getPath());
+ WifiApConfigStore store = createWifiApConfigStore(mLegacyApConfigFile);
verify(mWifiConfigManager).saveToStore(true);
verify(mBackupManagerProxy).notifyDataChanged();
verifyApConfig(expectedConfig, store.getApConfiguration());