diff options
author | Brett Chabot <brettchabot@google.com> | 2018-12-19 16:13:18 -0800 |
---|---|---|
committer | Brett Chabot <brettchabot@google.com> | 2018-12-19 16:23:47 -0800 |
commit | dd0c2ae39db9a19444363706c0d4478253b18e01 (patch) | |
tree | 672bf74c31015d59d133373874a3f3797f189f2d /tests/wifitests | |
parent | 3bbabd6569d15a2ff6a6feea755f13ed42ee5d2c (diff) | |
download | android_frameworks_opt_net_wifi-dd0c2ae39db9a19444363706c0d4478253b18e01.tar.gz android_frameworks_opt_net_wifi-dd0c2ae39db9a19444363706c0d4478253b18e01.tar.bz2 android_frameworks_opt_net_wifi-dd0c2ae39db9a19444363706c0d4478253b18e01.zip |
Take 2 of Migrate frameworks/opt/net/wifi to androidx.test
See go/jetpack-test-android-migration
Test: atest FrameworksWifiTests
Bug: None
Change-Id: I76a3394fe1e4f5b268ed2716291b33d1db8f9f85
Diffstat (limited to 'tests/wifitests')
177 files changed, 305 insertions, 190 deletions
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index cd9b354e4..0a6d1c750 100644 --- a/tests/wifitests/Android.mk +++ b/tests/wifitests/Android.mk @@ -54,7 +54,7 @@ LOCAL_JACK_FLAGS := --multi-dex native # TODO figure out if this is the correct thing to do, this seems to not be right # since neither is declared a static java library. LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx.test.rules hamcrest-library \ mockito-target-extended-minus-junit4 \ frameworks-base-testutils \ services \ diff --git a/tests/wifitests/README.md b/tests/wifitests/README.md index 6fcf2e1d9..02ee000d0 100644 --- a/tests/wifitests/README.md +++ b/tests/wifitests/README.md @@ -27,7 +27,7 @@ runtests.sh -e class com.android.server.wifi.WifiServiceImplTest If you manually build and push the test APK to the device you can run tests using ``` -adb shell am instrument -w 'com.android.server.wifi.test/android.support.test.runner.AndroidJUnitRunner' +adb shell am instrument -w 'com.android.server.wifi.test/androidx.test.runner.AndroidJUnitRunner' ``` ## Adding Tests diff --git a/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java b/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java index 6929929a7..7d4c22551 100644 --- a/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java @@ -28,9 +28,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.BatteryStats; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.internal.app.IBatteryStats; import org.junit.After; diff --git a/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java b/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java index 34d273ac8..74ad17f53 100644 --- a/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java @@ -20,7 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import android.os.Binder; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/ByteBufferReaderTest.java b/tests/wifitests/src/com/android/server/wifi/ByteBufferReaderTest.java index 7cc1d61b3..add8f14e0 100644 --- a/tests/wifitests/src/com/android/server/wifi/ByteBufferReaderTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ByteBufferReaderTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java index 0c1260846..6e731e626 100644 --- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java +++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java @@ -29,7 +29,6 @@ import android.net.wifi.EAPConstants; import android.net.wifi.WifiEnterpriseConfig; import android.os.PersistableBundle; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.telephony.CarrierConfigManager; import android.telephony.ImsiEncryptionInfo; import android.telephony.SubscriptionInfo; @@ -37,6 +36,8 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Base64; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java index 9af9e7ae7..34995a780 100644 --- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java @@ -48,7 +48,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 1f29f6e2c..72b17f2b0 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -78,13 +78,14 @@ import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; import android.security.KeyStore; -import android.support.test.filters.SmallTest; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.internal.app.IBatteryStats; import com.android.internal.util.AsyncChannel; import com.android.internal.util.IState; diff --git a/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java b/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java index f5d10d7eb..97141c496 100644 --- a/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java @@ -28,9 +28,10 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.filters.SmallTest; import android.util.SparseArray; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java b/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java index cf6684cda..3d9f54ade 100644 --- a/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java +++ b/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java @@ -17,9 +17,10 @@ package com.android.server.wifi; import android.os.Bundle; -import android.support.test.runner.AndroidJUnitRunner; import android.util.Log; +import androidx.test.runner.AndroidJUnitRunner; + public class CustomTestRunner extends AndroidJUnitRunner { @Override public void onCreate(Bundle arguments) { diff --git a/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java index 2af8b557c..01c67e90e 100644 --- a/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java @@ -19,9 +19,10 @@ package com.android.server.wifi; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java index e5391f16b..dca2bc168 100644 --- a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java @@ -55,9 +55,10 @@ import android.hidl.manager.V1_0.IServiceNotification; import android.os.Handler; import android.os.IHwBinder; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.HalDeviceManager.InterfaceDestroyedListener; import org.hamcrest.core.IsNull; diff --git a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java index 9121fe728..453187c49 100644 --- a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java @@ -33,7 +33,8 @@ import android.hidl.manager.V1_0.IServiceNotification; import android.net.wifi.WifiConfiguration; import android.os.IHwBinder; import android.os.RemoteException; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.server.wifi.util.NativeUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/IMSIParameterTest.java b/tests/wifitests/src/com/android/server/wifi/IMSIParameterTest.java index ca3b8d842..c87f2b3f9 100644 --- a/tests/wifitests/src/com/android/server/wifi/IMSIParameterTest.java +++ b/tests/wifitests/src/com/android/server/wifi/IMSIParameterTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java b/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java index 75c83e439..0180d6a04 100644 --- a/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java @@ -25,7 +25,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.FileUtils; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import libcore.io.IoUtils; diff --git a/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java b/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java index 8c8219593..e0d2b5fdd 100644 --- a/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java @@ -28,7 +28,8 @@ import android.os.Messenger; import android.os.Process; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/LogcatLogTest.java b/tests/wifitests/src/com/android/server/wifi/LogcatLogTest.java index 9e80af8d3..e75404e76 100644 --- a/tests/wifitests/src/com/android/server/wifi/LogcatLogTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LogcatLogTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java index 868e3aef6..4bdba9a28 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java @@ -26,9 +26,10 @@ import android.content.pm.PackageManager; import android.net.MacAddress; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.util.XmlUtilTest; diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java index 8767d7331..bbcf2ced3 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java @@ -26,10 +26,11 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiNetworkSuggestion; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; import android.util.LocalLog; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java index e676be01d..682d87ab6 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java @@ -20,9 +20,10 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; import android.net.wifi.WifiNetworkSuggestion; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.WifiNetworkSuggestionsManager.PerAppInfo; diff --git a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java index 68af82461..e165dcf55 100644 --- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java @@ -48,7 +48,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount; diff --git a/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java b/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java index 6796b8155..e179142fc 100644 --- a/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java @@ -22,7 +22,8 @@ import android.net.wifi.RttManager; import android.net.wifi.RttManager.ParcelableRttParams; import android.net.wifi.RttManager.RttParams; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/SarInfoTest.java b/tests/wifitests/src/com/android/server/wifi/SarInfoTest.java index 2bf1f3ee4..aec4ca686 100644 --- a/tests/wifitests/src/com/android/server/wifi/SarInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SarInfoTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java index 47b872020..e8d082001 100644 --- a/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java @@ -35,10 +35,11 @@ import android.hardware.SystemSensorManager; import android.net.wifi.WifiManager; import android.os.Build; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import org.junit.After; diff --git a/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java index 5f014e764..a8f10d869 100644 --- a/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java @@ -27,9 +27,10 @@ import android.content.res.Resources; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.os.SystemClock; -import android.support.test.filters.SmallTest; import android.util.LocalLog; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener; import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs; diff --git a/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java index ddb98df6a..c20be33e0 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java @@ -37,7 +37,8 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java b/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java index beb1bab7e..a19640ff6 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java @@ -36,7 +36,8 @@ import android.os.Handler; import android.os.UserHandle; import android.os.WorkSource; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java b/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java index 0135efb05..e165f77fe 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; import android.net.wifi.WifiConfiguration; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java index 4ddddb312..8dd3057b7 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java @@ -35,9 +35,10 @@ import android.net.wifi.WifiNetworkScoreCache; import android.os.Looper; import android.os.SystemClock; import android.provider.Settings; -import android.support.test.filters.SmallTest; import android.util.LocalLog; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener; import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java b/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java index 56dca114a..e73294589 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java @@ -32,7 +32,8 @@ import android.database.ContentObserver; import android.net.wifi.WifiInfo; import android.os.Handler; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; diff --git a/tests/wifitests/src/com/android/server/wifi/SelfRecoveryTest.java b/tests/wifitests/src/com/android/server/wifi/SelfRecoveryTest.java index 9b50517f8..bcef92ca9 100644 --- a/tests/wifitests/src/com/android/server/wifi/SelfRecoveryTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SelfRecoveryTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.*; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java index b0ed93c22..7c516801d 100644 --- a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java @@ -46,7 +46,8 @@ import android.net.wifi.WifiScanner; import android.os.UserHandle; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.internal.util.WakeupMessage; diff --git a/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java index 86ebb875f..ac6ae21a2 100644 --- a/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java @@ -24,9 +24,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java index d73b88d87..1e9ad06e7 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -64,10 +64,11 @@ import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.os.IHwBinder; import android.os.RemoteException; -import android.support.test.filters.SmallTest; import android.text.TextUtils; import android.util.SparseArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.hotspot2.AnqpEvent; import com.android.server.wifi.hotspot2.IconEvent; import com.android.server.wifi.hotspot2.WnmData; diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java index e6095fde4..05bb5ec48 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java @@ -41,9 +41,10 @@ import android.hardware.wifi.supplicant.V1_0.SupplicantStatusCode; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; import android.os.RemoteException; -import android.support.test.filters.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.server.wifi.util.NativeUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java index 42e350246..d0713cc0f 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java @@ -29,7 +29,8 @@ import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.app.IBatteryStats; @@ -37,6 +38,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; + /** * Unit tests for {@link android.net.wifi.SupplicantStateTracker}. */ diff --git a/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java b/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java index fa91be1a3..5fa0188bc 100644 --- a/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java @@ -23,7 +23,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiInfo; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java index cfb0e1c80..c814aef1a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java @@ -23,9 +23,10 @@ import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.google.android.collect.Sets; diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java index 8ec149910..d1cb2ee0c 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java @@ -33,7 +33,8 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.util.ScanResultUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java index f7c23aef9..5a7707e58 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java @@ -22,9 +22,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.wifi.ScanResult; -import android.support.test.filters.SmallTest; import android.util.ArraySet; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.util.ScanResultUtil; import com.google.android.collect.Sets; @@ -35,8 +36,6 @@ import org.junit.Test; import java.util.Collections; import java.util.Set; - - /** * Unit tests for {@link WakeupEvaluator}. */ diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java index 8bd38e156..f71abc207 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java index 1bc92e67a..605a08ff2 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java @@ -37,7 +37,8 @@ import android.content.IntentFilter; import android.os.Handler; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java index 86f5d6621..d9cb90866 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java @@ -35,7 +35,8 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.KeyMgmt; import android.os.Build; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java index 1c238f9de..9501143c8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java @@ -22,7 +22,8 @@ import static org.mockito.Mockito.*; import android.net.IpConfiguration; import android.net.wifi.WifiConfiguration; import android.os.Process; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.net.IpConfigStore; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java index 7a8f5647b..fcbbde5c2 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java @@ -23,7 +23,8 @@ import static org.mockito.Mockito.*; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 9739dcc70..3745232e9 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -42,11 +42,12 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.server.wifi.WifiConfigStoreLegacy.WifiConfigStoreDataLegacy; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java index ae4a396f6..c07159105 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java @@ -22,10 +22,11 @@ import static org.mockito.Mockito.*; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.net.IpConfiguration; import android.net.wifi.WifiConfiguration; -import android.support.test.filters.SmallTest; import android.text.TextUtils; import android.util.SparseArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiConfigStoreLegacy.IpConfigStoreWrapper; import com.android.server.wifi.hotspot2.LegacyPasspointConfig; import com.android.server.wifi.hotspot2.LegacyPasspointConfigParser; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java index 508cc2630..4f7e53441 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java @@ -25,7 +25,8 @@ import android.content.pm.PackageManager; import android.net.MacAddress; import android.net.wifi.WifiConfiguration; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.util.ArrayUtils; import com.android.server.wifi.WifiConfigStore.StoreData; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java index ae4b320df..11dff8565 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java @@ -27,9 +27,10 @@ import android.net.wifi.WifiNetworkSpecifier; import android.net.wifi.WifiScanner; import android.os.PatternMatcher; import android.os.UserHandle; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Test; import java.security.cert.X509Certificate; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java index d59bed7ba..4eed0f754 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java @@ -22,7 +22,8 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; import android.app.test.MockAnswerUtil.AnswerWithArguments; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java index 830e03e23..b225ffb90 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -49,9 +49,10 @@ import android.os.Process; import android.os.SystemClock; import android.os.WorkSource; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.LocalLog; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import org.junit.After; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java index f07a256a4..d6b17bb0e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java @@ -39,9 +39,10 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.internal.util.IState; import com.android.internal.util.StateMachine; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCountryCodeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCountryCodeTest.java index 95554bc63..1cc0926ad 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiCountryCodeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiCountryCodeTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java index cc1b50b4c..8aa01044d 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java @@ -27,7 +27,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.nano.WifiMetricsProto.WifiIsUnusableEvent; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java index ed1b59675..3268c8c84 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java @@ -36,7 +36,8 @@ import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.content.Context; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.server.am.ActivityManagerService; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java index 0991b8599..392466412 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi; import static org.mockito.Mockito.*; import android.content.Context; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java index e9351258f..b35ab6665 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java @@ -24,9 +24,10 @@ import static org.mockito.MockitoAnnotations.*; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiSsid; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java index 51f28af63..ecb72c08b 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java index 3cd9aafa8..3e31f578f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java @@ -26,7 +26,8 @@ import android.net.wifi.WifiManager; import android.os.Binder; import android.os.IBinder; import android.os.WorkSource; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.app.IBatteryStats; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index 228a64a1e..581158538 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -38,11 +38,12 @@ import android.net.wifi.hotspot2.pps.Credential; import android.os.Handler; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; import android.util.Base64; import android.util.Pair; import android.util.SparseIntArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.aware.WifiAwareMetrics; import com.android.server.wifi.hotspot2.NetworkDetail; import com.android.server.wifi.hotspot2.PasspointManager; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java index d29047c30..5439b0ea5 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java @@ -33,7 +33,8 @@ import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.hotspot2.AnqpEvent; import com.android.server.wifi.hotspot2.IconEvent; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java index 1c560a146..5298ba4c8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java @@ -21,7 +21,8 @@ import static org.mockito.Mockito.*; import android.os.IBinder; import android.os.RemoteException; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.app.IBatteryStats; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java index b8c2e68e5..be607a89a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java @@ -45,7 +45,8 @@ import android.os.Handler; import android.os.INetworkManagementService; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.net.BaseNetworkObserver; import com.android.server.wifi.HalDeviceManager.InterfaceDestroyedListener; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java index e4d525944..3305ea6e3 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -28,7 +28,8 @@ import android.net.MacAddress; import android.net.wifi.WifiConfiguration; import android.os.Handler; import android.os.INetworkManagementService; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java index fe29fef56..acc5d30ae 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java @@ -31,9 +31,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.net.wifi.WifiInfo; import android.os.SystemClock; -import android.support.test.filters.SmallTest; import android.util.LocalLog; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.server.wifi.WifiNetworkSelector.NetworkEvaluator.OnConnectableListener; import com.android.server.wifi.WifiNetworkSelectorTestUtil.ScanDetailsAndWifiConfigs; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java index ab50deec6..5519cf045 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java @@ -31,9 +31,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.net.wifi.WifiNetworkScoreCache; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.util.ScanResultUtil; import java.util.ArrayList; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java index 027eba259..752f961bd 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java @@ -20,7 +20,8 @@ import static org.mockito.Mockito.*; import android.os.RemoteException; import android.os.connectivity.WifiBatteryStats; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.app.IBatteryStats; import com.android.server.wifi.nano.WifiMetricsProto.WifiRadioUsage; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java index 7ef4e899a..2eaacd64a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardProtoTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java index e8ffa52ca..0dc510097 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java @@ -22,9 +22,10 @@ import static org.mockito.Mockito.*; import android.net.MacAddress; import android.net.wifi.WifiInfo; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; import android.util.Base64; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiScoreCardProto.AccessPoint; import com.android.server.wifi.WifiScoreCardProto.Event; import com.android.server.wifi.WifiScoreCardProto.Network; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java index 2eaae3137..453d81e69 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java @@ -35,7 +35,8 @@ import android.content.res.Resources; import android.net.NetworkAgent; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java index 17a94cac4..8aa056ffc 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -95,7 +95,8 @@ import android.os.Process; import android.os.RemoteException; import android.os.UserManager; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.os.PowerProfile; import com.android.internal.telephony.TelephonyIntents; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java index 8486938f2..682ba5b32 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java @@ -16,14 +16,14 @@ package com.android.server.wifi; -import com.android.internal.app.IBatteryStats; - import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; + +import com.android.internal.app.IBatteryStats; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java index bc98fbd78..acd6777f6 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java @@ -16,7 +16,7 @@ package com.android.server.wifi; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java index c1b39044f..ef49d2f4f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java @@ -26,7 +26,8 @@ import android.net.wifi.WifiManager; import android.os.IBinder; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.util.ExternalCallbackTracker; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java index fb73864f2..db1c61a40 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -88,10 +88,11 @@ import android.net.wifi.WifiSsid; import android.os.Looper; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.system.OsConstants; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.HalDeviceManager.InterfaceDestroyedListener; import com.android.server.wifi.WifiLinkLayerStats.ChannelStats; import com.android.server.wifi.util.NativeUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java index e1abc08d2..de5f38051 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java @@ -22,14 +22,13 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.nano.WifiMetricsProto.WifiWakeStats; import org.junit.Before; import org.junit.Test; - @SmallTest public class WifiWakeMetricsTest { diff --git a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java index 7433beca8..aeacd4fcf 100644 --- a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java @@ -36,7 +36,8 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiScanner; import android.os.IBinder; import android.os.RemoteException; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.util.NativeUtil; import com.android.server.wifi.wificond.ChannelSettings; diff --git a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java index 072b65ede..3d011da23 100644 --- a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java @@ -25,7 +25,8 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.notification.SystemNotificationChannels; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java index 3be806242..5f811899f 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java @@ -73,7 +73,8 @@ import android.os.Messenger; import android.os.PowerManager; import android.os.Process; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.util.AsyncChannel; import com.android.server.wifi.util.WifiPermissionsUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java index 6157481d4..f7a0ed7fa 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java @@ -26,11 +26,12 @@ import android.app.AppOpsManager; import android.content.Context; import android.hardware.wifi.V1_0.NanStatusType; import android.net.wifi.aware.WifiAwareNetworkSpecifier; -import android.support.test.filters.SmallTest; import android.util.Log; import android.util.SparseArray; import android.util.SparseIntArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.Clock; import com.android.server.wifi.nano.WifiMetricsProto; import com.android.server.wifi.util.MetricsUtils; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java index 2f961a051..a42e3932a 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java @@ -39,9 +39,10 @@ import android.net.wifi.aware.ConfigRequest; import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; import android.os.RemoteException; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java index d4c10899d..e0dcd77a9 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java @@ -30,7 +30,8 @@ import android.hardware.wifi.V1_0.IfaceType; import android.hardware.wifi.V1_0.WifiStatus; import android.hardware.wifi.V1_0.WifiStatusCode; import android.os.Handler; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.HalDeviceManager; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java index dbcb0a7ff..8fd38cc5c 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java @@ -45,10 +45,11 @@ import android.os.HandlerThread; import android.os.IBinder; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.SparseArray; import android.util.SparseIntArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.FrameworkFacade; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java index c77d76283..e0ec5321c 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java @@ -68,10 +68,11 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Log; import android.util.SparseArray; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPDataTest.java index e96a9ce62..addb9b5b5 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPDataTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.hotspot2.anqp.ANQPElement; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java index 101fe16f6..7225c2abf 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.EAPConstants; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.IMSIParameter; import com.android.server.wifi.hotspot2.anqp.CellularNetwork; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPNetworkKeyTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPNetworkKeyTest.java index aeeffc0a0..74a884d7b 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPNetworkKeyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPNetworkKeyTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPRequestManagerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPRequestManagerTest.java index b957bdd02..b252f817e 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPRequestManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPRequestManagerTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.hotspot2.anqp.Constants; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java index e697df2d8..3084e064a 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/AnqpCacheTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.hotspot2.ANQPData; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java index 3681e6790..1671507bf 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java @@ -20,9 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Test; import java.util.Arrays; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java index f184f128e..c3004f537 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi.hotspot2; import static org.junit.Assert.*; import android.os.FileUtils; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java index f94c43976..5fb0cc0a4 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java @@ -44,7 +44,8 @@ import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.TestUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java index eb08000e4..c238d0417 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java @@ -30,9 +30,10 @@ import static org.mockito.Mockito.when; import android.net.Network; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.dx.mockito.inline.extended.ExtendedMockito; import com.android.org.conscrypt.TrustManagerImpl; import com.android.server.wifi.hotspot2.soap.HttpsServiceConnection; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java index 6c2ab7bd5..c76e2c878 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java @@ -19,9 +19,10 @@ package com.android.server.wifi.hotspot2; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.WifiConfigStore; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java index 7ab29c972..bf814c45e 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java @@ -24,9 +24,10 @@ import android.net.wifi.hotspot2.pps.Credential; import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.SIMAccessor; import com.android.server.wifi.WifiConfigStore; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java index b70738436..d958f5a8c 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointEventHandlerTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiNative; import com.android.server.wifi.hotspot2.anqp.Constants; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java index d2f623009..cf51b1e53 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java @@ -67,10 +67,11 @@ import android.net.wifi.hotspot2.pps.HomeSp; import android.os.Looper; import android.os.UserHandle; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Base64; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.Clock; import com.android.server.wifi.FakeKeys; import com.android.server.wifi.IMSIParameter; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java index b6c7d8bcb..dc7e9bb3b 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java @@ -33,10 +33,11 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.pps.HomeSp; -import android.support.test.filters.SmallTest; import android.util.LocalLog; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.NetworkUpdateResult; import com.android.server.wifi.ScanDetail; import com.android.server.wifi.WifiConfigManager; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java index 82f737cf8..14815beb3 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java @@ -21,7 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.net.wifi.ScanResult; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.ScanDetail; import com.android.server.wifi.hotspot2.anqp.ANQPElement; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java index 82b0b96f8..f9c686eec 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java @@ -29,9 +29,10 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.pps.Credential; import android.net.wifi.hotspot2.pps.HomeSp; -import android.support.test.filters.SmallTest; import android.util.Base64; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.FakeKeys; import com.android.server.wifi.IMSIParameter; import com.android.server.wifi.SIMAccessor; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java index c677cac29..dae3374fe 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java @@ -56,9 +56,10 @@ import android.os.Build; import android.os.Handler; import android.os.RemoteException; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; +import androidx.test.filters.SmallTest; + import com.android.dx.mockito.inline.extended.ExtendedMockito; import com.android.org.conscrypt.TrustManagerImpl; import com.android.server.wifi.WifiNative; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java index 46b2bb137..928a49168 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java @@ -24,9 +24,10 @@ import android.net.wifi.hotspot2.pps.Credential; import android.net.wifi.hotspot2.pps.HomeSp; import android.net.wifi.hotspot2.pps.Policy; import android.net.wifi.hotspot2.pps.UpdateParameter; -import android.support.test.filters.SmallTest; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java index ee0ac896f..e6ecb330e 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java @@ -28,9 +28,10 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.org.bouncycastle.asn1.ASN1EncodableVector; import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; import com.android.org.bouncycastle.asn1.DEROctetString; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java index 6fb12d0f2..2de746e57 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java @@ -22,9 +22,10 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import android.content.Context; -import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiNative; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ANQPParserTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ANQPParserTest.java index 806360ba7..016e32261 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ANQPParserTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ANQPParserTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/CellularNetworkTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/CellularNetworkTest.java index 11dbd90f4..3b47ab4f0 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/CellularNetworkTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/CellularNetworkTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/DomainNameElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/DomainNameElementTest.java index 6ba02f029..e293a4a9f 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/DomainNameElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/DomainNameElementTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSConnectionCapabilityElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSConnectionCapabilityElementTest.java index 962a6f9bf..62a2b7f7c 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSConnectionCapabilityElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSConnectionCapabilityElementTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSFriendlyNameElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSFriendlyNameElementTest.java index 106c7ea49..dffb5a563 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSFriendlyNameElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSFriendlyNameElementTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSIconFileElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSIconFileElementTest.java index 1369c15d9..a1a9aba4a 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSIconFileElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSIconFileElementTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSOsuProvidersElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSOsuProvidersElementTest.java index 0aa18b749..de89ff980 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSOsuProvidersElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSOsuProvidersElementTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSWanMetricsElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSWanMetricsElementTest.java index c37a0b956..c90282509 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSWanMetricsElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/HSWanMetricsElementTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java index dcee1f05f..e495b8417 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/I18NameTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IPAddressTypeAvailabilityElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IPAddressTypeAvailabilityElementTest.java index aae49d892..9c2862708 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IPAddressTypeAvailabilityElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IPAddressTypeAvailabilityElementTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IconInfoTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IconInfoTest.java index 08bd0c0fe..df99fbd52 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IconInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/IconInfoTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmDataTest.java index 27d8b1a02..aa342d4af 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmDataTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmElementTest.java index 82cb1f155..553f0ee83 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/NAIRealmElementTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; @@ -28,7 +28,6 @@ import java.nio.ByteOrder; import java.util.ArrayList; import java.util.List; - /** * Unit tests for {@link com.android.server.wifi.hotspot2.anqp.NAIRealmElement}. */ diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/OsuProviderInfoTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/OsuProviderInfoTest.java index 18ad717d7..2855db9d7 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/OsuProviderInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/OsuProviderInfoTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ProtocolPortTupleTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ProtocolPortTupleTest.java index 5a55ffe2e..fc0942a7e 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ProtocolPortTupleTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ProtocolPortTupleTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RawByteElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RawByteElementTest.java index 1395ed672..3032210eb 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RawByteElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RawByteElementTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RoamingConsortiumElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RoamingConsortiumElementTest.java index 0d044f6ed..dad7c2bc4 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RoamingConsortiumElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/RoamingConsortiumElementTest.java @@ -19,9 +19,10 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import org.junit.Test; import java.io.ByteArrayOutputStream; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ThreeGPPNetworkElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ThreeGPPNetworkElementTest.java index 8ef2bd340..4add83769 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ThreeGPPNetworkElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/ThreeGPPNetworkElementTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java index 9cad5774e..006ebac36 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/VenueNameElementTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/CredentialTypeTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/CredentialTypeTest.java index 994502de0..160029b63 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/CredentialTypeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/CredentialTypeTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/EAPMethodTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/EAPMethodTest.java index c5dbc3210..8ddd9a8f1 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/EAPMethodTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/EAPMethodTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; import android.net.wifi.EAPConstants; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/ExpandedEAPMethodTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/ExpandedEAPMethodTest.java index d704100f2..1c112dfaa 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/ExpandedEAPMethodTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/ExpandedEAPMethodTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/InnerAuthEAPTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/InnerAuthEAPTest.java index 8e2531c1a..d7087d94d 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/InnerAuthEAPTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/InnerAuthEAPTest.java @@ -19,7 +19,8 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; import android.net.wifi.EAPConstants; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/NonEAPInnerAuthTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/NonEAPInnerAuthTest.java index 5a43bb84f..3a4b6ed3a 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/NonEAPInnerAuthTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/NonEAPInnerAuthTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/VendorSpecificAuthTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/VendorSpecificAuthTest.java index 1535333d9..491077e3b 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/VendorSpecificAuthTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/anqp/eap/VendorSpecificAuthTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevDetailMoTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevDetailMoTest.java index ff3d86ff5..bb08ee5ac 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevDetailMoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevDetailMoTest.java @@ -25,9 +25,10 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.content.Context; import android.os.Build; -import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.hotspot2.SystemInfo; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevInfoMoTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevInfoMoTest.java index 065159587..d0a538ed5 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevInfoMoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/DevInfoMoTest.java @@ -21,7 +21,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.os.Build; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.hotspot2.SystemInfo; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/MoSerializerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/MoSerializerTest.java index 983976331..2c28ed22c 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/MoSerializerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/omadm/MoSerializerTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/ExchangeCompleteMessageTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/ExchangeCompleteMessageTest.java index dcddb5380..933a20602 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/ExchangeCompleteMessageTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/ExchangeCompleteMessageTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.soap; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.ksoap2.serialization.SoapObject; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsServiceConnectionTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsServiceConnectionTest.java index c975be236..3d5dae847 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsServiceConnectionTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsServiceConnectionTest.java @@ -24,7 +24,8 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import android.net.Network; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsTransportTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsTransportTest.java index 0f189242f..6975765d8 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsTransportTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/HttpsTransportTest.java @@ -22,7 +22,8 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import android.net.Network; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataMessageTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataMessageTest.java index 179ac68a6..2f1afd7dd 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataMessageTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataMessageTest.java @@ -26,9 +26,10 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.content.Context; import android.os.Build; -import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.hotspot2.SystemInfo; import com.android.server.wifi.hotspot2.omadm.DevDetailMo; import com.android.server.wifi.hotspot2.omadm.DevInfoMo; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataResponseTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataResponseTest.java index d5b827d8f..0b48a73ef 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataResponseTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/PostDevDataResponseTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.hotspot2.soap.command.SppCommand; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/RedirectListenerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/RedirectListenerTest.java index c4fb3fd71..95b652064 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/RedirectListenerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/RedirectListenerTest.java @@ -25,7 +25,8 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.os.Looper; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SoapParserTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SoapParserTest.java index 3bb63a157..2445caba5 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SoapParserTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SoapParserTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SppResponseMessageTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SppResponseMessageTest.java index 5e6ed070c..4169868f1 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SppResponseMessageTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/SppResponseMessageTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/UpdateResponseMessageTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/UpdateResponseMessageTest.java index edda5273e..9098c2297 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/UpdateResponseMessageTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/UpdateResponseMessageTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.hotspot2.soap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; import org.ksoap2.SoapEnvelope; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/BrowserUriTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/BrowserUriTest.java index 88925cb8c..2fe5e752f 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/BrowserUriTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/BrowserUriTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/PpsMoDataTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/PpsMoDataTest.java index e4f2a1521..cc56b06ef 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/PpsMoDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/PpsMoDataTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/SppCommandTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/SppCommandTest.java index bf1d4f653..52d4615ad 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/SppCommandTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/soap/command/SppCommandTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.MockitoAnnotations.initMocks; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java index 3f4b44ac6..7be79ec02 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java @@ -32,7 +32,8 @@ import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pProvDiscEvent; import android.net.wifi.p2p.nsd.WifiP2pServiceResponse; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.util.NativeUtil; @@ -46,7 +47,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; - /** * Unit tests for SupplicantP2pIfaceCallback */ diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java index 14a6fe9bd..8194b9362 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java @@ -47,9 +47,10 @@ import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.nsd.WifiP2pServiceInfo; import android.os.IHwBinder; import android.os.RemoteException; -import android.support.test.filters.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.util.NativeUtil; import org.junit.Assert.*; diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java index 157250669..68aceb37e 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java @@ -24,7 +24,8 @@ import static org.mockito.Mockito.verify; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiInjector; diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java index edf12e9fa..a319539c5 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java @@ -25,9 +25,10 @@ import android.net.MacAddress; import android.net.wifi.rtt.RangingRequest; import android.net.wifi.rtt.ResponderConfig; import android.os.WorkSource; -import android.support.test.filters.SmallTest; import android.util.Log; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.Clock; import com.android.server.wifi.nano.WifiMetricsProto; diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java index 59ef71666..be43c7af7 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java @@ -42,7 +42,8 @@ import android.hardware.wifi.V1_0.WifiStatus; import android.hardware.wifi.V1_0.WifiStatusCode; import android.net.MacAddress; import android.net.wifi.rtt.RangingRequest; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.HalDeviceManager; diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java index 968280550..11e80f06f 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java @@ -69,9 +69,10 @@ import android.os.UserHandle; import android.os.WorkSource; import android.os.test.TestLooper; import android.provider.Settings; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.Clock; import com.android.server.wifi.FrameworkFacade; import com.android.server.wifi.nano.WifiMetricsProto; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java index bae391e40..f5e777e20 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java @@ -28,9 +28,10 @@ import static org.mockito.Mockito.validateMockitoUsage; import android.net.wifi.WifiScanner; import android.net.wifi.WifiScanner.ScanSettings; -import android.support.test.filters.SmallTest; import android.util.ArraySet; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiNative; import com.android.server.wifi.WifiNative.BucketSettings; import com.android.server.wifi.scanner.KnownBandsChannelHelper.KnownBandsChannelCollection; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java index 5972dacb4..58c938875 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java @@ -31,7 +31,8 @@ import android.net.wifi.WifiScanner.ScanData; import android.net.wifi.WifiSsid; import android.os.SystemClock; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.Clock; import com.android.server.wifi.MockResources; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java index 4ea3e4459..74674b966 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java @@ -27,7 +27,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.net.wifi.WifiScanner; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiNative; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java index fc6e41778..6348de036 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.scanner; import static com.android.server.wifi.ScanTestUtil.setupMockChannels; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Before; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java index e13f3bbfe..bc70f65b8 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java @@ -28,7 +28,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.wifi.WifiScanner; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiNative; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java index ad321aef8..e08829f8f 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java @@ -30,7 +30,8 @@ import static org.junit.Assert.assertTrue; import android.net.wifi.WifiScanner; import android.net.wifi.WifiScanner.ScanData; import android.net.wifi.WifiScanner.ScanSettings; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java index 1db237bc5..c55ad4d7c 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -64,9 +64,10 @@ import android.os.Message; import android.os.RemoteException; import android.os.WorkSource; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.internal.app.IBatteryStats; import com.android.internal.util.AsyncChannel; import com.android.internal.util.Protocol; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java index 390683f09..2646cffb2 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java @@ -27,7 +27,8 @@ import android.content.Context; import android.net.wifi.WifiScanner; import android.os.SystemClock; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.server.wifi.Clock; diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java index c9fc1c2bb..e55173293 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java @@ -25,7 +25,8 @@ import static org.mockito.Mockito.*; import android.app.AlarmManager; import android.app.PendingIntent; import android.net.wifi.WifiScanner; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.ScanResults; import com.android.server.wifi.WifiMonitor; diff --git a/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java index c6cd064a1..ee43c001a 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java @@ -22,7 +22,8 @@ import static org.mockito.Mockito.when; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.internal.util.ArrayUtils; import com.android.server.wifi.WifiNative; diff --git a/tests/wifitests/src/com/android/server/wifi/util/BitMaskTest.java b/tests/wifitests/src/com/android/server/wifi/util/BitMaskTest.java index c161c1ff0..c905f27fd 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/BitMaskTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/BitMaskTest.java @@ -16,7 +16,7 @@ package com.android.server.wifi.util; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Assert; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java b/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java index 7116d323f..5c397c70c 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; - /** * Unit tests for {@link com.android.server.wifi.util.ByteArrayRingBuffer}. */ diff --git a/tests/wifitests/src/com/android/server/wifi/util/FrameParserTest.java b/tests/wifitests/src/com/android/server/wifi/util/FrameParserTest.java index 5a61d0bf8..9fc23034a 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/FrameParserTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/FrameParserTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.util; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import com.android.server.wifi.WifiLoggerHal; diff --git a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java index d921bf33d..b7a6cefb9 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java @@ -22,7 +22,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.ScanResult.InformationElement; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.hotspot2.NetworkDetail; diff --git a/tests/wifitests/src/com/android/server/wifi/util/KalmanFilterTest.java b/tests/wifitests/src/com/android/server/wifi/util/KalmanFilterTest.java index 63e751a8e..54d6e0c3e 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/KalmanFilterTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/KalmanFilterTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.util; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/MatrixTest.java b/tests/wifitests/src/com/android/server/wifi/util/MatrixTest.java index 6f38a131e..3d971ab66 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/MatrixTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/MatrixTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.fail; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java b/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java index b218b3e2a..58d4b9e39 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java @@ -18,9 +18,10 @@ package com.android.server.wifi.util; import static org.hamcrest.core.IsEqual.equalTo; -import android.support.test.filters.SmallTest; import android.util.SparseIntArray; +import androidx.test.filters.SmallTest; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/NativeUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/NativeUtilTest.java index bd8d4aa22..79dcccfcc 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/NativeUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/NativeUtilTest.java @@ -18,7 +18,7 @@ package com.android.server.wifi.util; import static org.junit.Assert.*; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java index e8267953b..45adffd1d 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java @@ -22,7 +22,8 @@ import android.net.wifi.ScanResult; import android.net.wifi.ScanResult.InformationElement; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiSsid; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.ScanDetail; diff --git a/tests/wifitests/src/com/android/server/wifi/util/StringUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/StringUtilTest.java index 404236d69..7308f1227 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/StringUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/StringUtilTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java index 6d9eee6ec..6af644d5d 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java @@ -22,12 +22,13 @@ import static org.mockito.Mockito.*; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; -import android.support.test.filters.SmallTest; import android.telephony.ImsiEncryptionInfo; import android.telephony.TelephonyManager; import android.util.Base64; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.server.wifi.WifiConfigurationTestUtil; import com.android.server.wifi.util.TelephonyUtil.SimAuthRequestData; import com.android.server.wifi.util.TelephonyUtil.SimAuthResponseData; diff --git a/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java b/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java index 848fbff38..fbf147180 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java @@ -15,15 +15,16 @@ */ package com.android.server.wifi.util; +import static org.mockito.Matchers.contains; +import static org.mockito.Mockito.verify; + import android.os.Looper; import android.os.Message; import android.os.test.TestLooper; -import android.support.test.filters.SmallTest; -import com.android.server.wifi.FakeWifiLog; +import androidx.test.filters.SmallTest; -import static org.mockito.Matchers.contains; -import static org.mockito.Mockito.verify; +import com.android.server.wifi.FakeWifiLog; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java index 447a5eb39..4e3db142b 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java @@ -37,7 +37,8 @@ import android.os.Build; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.server.wifi.BinderUtil; import com.android.server.wifi.FakeWifiLog; diff --git a/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java index 6bdf9383a..9db8e823b 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java @@ -23,10 +23,11 @@ import android.net.IpConfiguration; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.net.wifi.WifiEnterpriseConfig; -import android.support.test.filters.SmallTest; import android.util.Pair; import android.util.Xml; +import androidx.test.filters.SmallTest; + import com.android.internal.util.FastXmlSerializer; import com.android.server.wifi.WifiConfigurationTestUtil; import com.android.server.wifi.util.XmlUtil.IpConfigurationXmlUtil; diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java index 98b9ffc8a..6020794d3 100644 --- a/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java +++ b/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java index abc266513..d47fff822 100644 --- a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java @@ -20,7 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java index a54b53f26..fc430c734 100644 --- a/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/wificond/SingleScanSettingsTest.java @@ -16,13 +16,13 @@ package com.android.server.wifi.wificond; -import android.net.wifi.IWifiScannerImpl; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import android.net.wifi.IWifiScannerImpl; import android.os.Parcel; -import android.support.test.filters.SmallTest; + +import androidx.test.filters.SmallTest; import org.junit.Test; |