diff options
176 files changed, 191 insertions, 305 deletions
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index 0a6d1c750..cd9b354e4 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 := \ - androidx.test.rules hamcrest-library \ + android-support-test \ mockito-target-extended-minus-junit4 \ frameworks-base-testutils \ services \ diff --git a/tests/wifitests/README.md b/tests/wifitests/README.md index 02ee000d0..6fcf2e1d9 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/androidx.test.runner.AndroidJUnitRunner' +adb shell am instrument -w 'com.android.server.wifi.test/android.support.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 7d4c22551..6929929a7 100644 --- a/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java @@ -28,10 +28,9 @@ 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 74ad17f53..34d273ac8 100644 --- a/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/BinderUtilTest.java @@ -20,8 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import android.os.Binder; - -import androidx.test.filters.SmallTest; +import android.support.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 add8f14e0..7cc1d61b3 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 androidx.test.filters.SmallTest; +import android.support.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 6e731e626..0c1260846 100644 --- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java +++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java @@ -29,6 +29,7 @@ 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; @@ -36,8 +37,6 @@ 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 34995a780..9af9e7ae7 100644 --- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java @@ -48,8 +48,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 8e6339ddd..7184ef1aa 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -78,14 +78,13 @@ 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 97141c496..f5d10d7eb 100644 --- a/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ConfigurationMapTest.java @@ -28,10 +28,9 @@ 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 3d9f54ade..cf6684cda 100644 --- a/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java +++ b/tests/wifitests/src/com/android/server/wifi/CustomTestRunner.java @@ -17,10 +17,9 @@ 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 01c67e90e..2af8b557c 100644 --- a/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/DeletedEphemeralSsidsStoreDataTest.java @@ -19,10 +19,9 @@ 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 dca2bc168..e5391f16b 100644 --- a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java @@ -55,10 +55,9 @@ 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 453187c49..9121fe728 100644 --- a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java @@ -33,8 +33,7 @@ import android.hidl.manager.V1_0.IServiceNotification; import android.net.wifi.WifiConfiguration; import android.os.IHwBinder; import android.os.RemoteException; - -import androidx.test.filters.SmallTest; +import android.support.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 c87f2b3f9..ca3b8d842 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 androidx.test.filters.SmallTest; +import android.support.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 0180d6a04..75c83e439 100644 --- a/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LastMileLoggerTest.java @@ -25,8 +25,7 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.os.FileUtils; - -import androidx.test.filters.SmallTest; +import android.support.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 e0d2b5fdd..8c8219593 100644 --- a/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LocalOnlyHotspotRequestInfoTest.java @@ -28,8 +28,7 @@ import android.os.Messenger; import android.os.Process; import android.os.RemoteException; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 e75404e76..9e80af8d3 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 androidx.test.filters.SmallTest; +import android.support.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 4bdba9a28..868e3aef6 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java @@ -26,10 +26,9 @@ 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 bbcf2ced3..8767d7331 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionEvaluatorTest.java @@ -26,11 +26,10 @@ 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 682d87ab6..e676be01d 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkSuggestionStoreDataTest.java @@ -20,10 +20,9 @@ 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 e165dcf55..68af82461 100644 --- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java @@ -48,8 +48,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.test.TestLooper; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 e179142fc..6796b8155 100644 --- a/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java @@ -22,8 +22,7 @@ import android.net.wifi.RttManager; import android.net.wifi.RttManager.ParcelableRttParams; import android.net.wifi.RttManager.RttParams; import android.os.Parcel; - -import androidx.test.filters.SmallTest; +import android.support.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 aec4ca686..2bf1f3ee4 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 androidx.test.filters.SmallTest; +import android.support.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 e8d082001..47b872020 100644 --- a/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SarManagerTest.java @@ -35,11 +35,10 @@ 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 a8f10d869..5f014e764 100644 --- a/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SavedNetworkEvaluatorTest.java @@ -27,10 +27,9 @@ 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 c20be33e0..ddb98df6a 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanOnlyModeManagerTest.java @@ -37,8 +37,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 a19640ff6..beb1bab7e 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java @@ -36,8 +36,7 @@ import android.os.Handler; import android.os.UserHandle; import android.os.WorkSource; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 e165f77fe..0135efb05 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScanResultMatchInfoTest.java @@ -21,8 +21,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; import android.net.wifi.WifiConfiguration; - -import androidx.test.filters.SmallTest; +import android.support.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 8dd3057b7..4ddddb312 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScoredNetworkEvaluatorTest.java @@ -35,10 +35,9 @@ 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 e73294589..56dca114a 100644 --- a/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ScoringParamsTest.java @@ -32,8 +32,7 @@ import android.database.ContentObserver; import android.net.wifi.WifiInfo; import android.os.Handler; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 bcef92ca9..9b50517f8 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 androidx.test.filters.SmallTest; +import android.support.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 7c516801d..b0ed93c22 100644 --- a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java @@ -46,8 +46,7 @@ import android.net.wifi.WifiScanner; import android.os.UserHandle; import android.os.test.TestLooper; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 ac6ae21a2..86ebb875f 100644 --- a/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java @@ -24,10 +24,9 @@ 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 1e9ad06e7..d73b88d87 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -64,11 +64,10 @@ 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 05bb5ec48..e6095fde4 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java @@ -41,10 +41,9 @@ 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 d0713cc0f..42e350246 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java @@ -29,8 +29,7 @@ import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import com.android.internal.app.IBatteryStats; @@ -38,7 +37,6 @@ 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 5fa0188bc..fa91be1a3 100644 --- a/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java @@ -23,8 +23,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiInfo; - -import androidx.test.filters.SmallTest; +import android.support.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 c814aef1a..cfb0e1c80 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java @@ -23,10 +23,9 @@ 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 d1cb2ee0c..8ec149910 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java @@ -33,8 +33,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; import android.os.test.TestLooper; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 5a7707e58..f7c23aef9 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java @@ -22,10 +22,9 @@ 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; @@ -36,6 +35,8 @@ 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 f71abc207..8bd38e156 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 androidx.test.filters.SmallTest; +import android.support.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 605a08ff2..1bc92e67a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java @@ -37,8 +37,7 @@ import android.content.IntentFilter; import android.os.Handler; import android.os.test.TestLooper; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 d9cb90866..86f5d6621 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java @@ -35,8 +35,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.KeyMgmt; import android.os.Build; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 9501143c8..1c238f9de 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java @@ -22,8 +22,7 @@ import static org.mockito.Mockito.*; import android.net.IpConfiguration; import android.net.wifi.WifiConfiguration; import android.os.Process; - -import androidx.test.filters.SmallTest; +import android.support.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/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 9ae2c9371..fca235998 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -42,12 +42,11 @@ 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 c07159105..ae4a396f6 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java @@ -22,11 +22,10 @@ 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 4f7e53441..508cc2630 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java @@ -25,8 +25,7 @@ import android.content.pm.PackageManager; import android.net.MacAddress; import android.net.wifi.WifiConfiguration; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 11dff8565..ae4b320df 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationUtilTest.java @@ -27,10 +27,9 @@ 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 4eed0f754..d59bed7ba 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityHelperTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; import android.app.test.MockAnswerUtil.AnswerWithArguments; - -import androidx.test.filters.SmallTest; +import android.support.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 f8ca9e82b..2519f448a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -48,10 +48,9 @@ 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 d6b17bb0e..f07a256a4 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java @@ -39,10 +39,9 @@ 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 1cc0926ad..95554bc63 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 androidx.test.filters.SmallTest; +import android.support.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 8aa01044d..cc1b50b4c 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java @@ -27,8 +27,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 3268c8c84..ed1b59675 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java @@ -36,8 +36,7 @@ import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.content.Context; - -import androidx.test.filters.SmallTest; +import android.support.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 392466412..0991b8599 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java @@ -19,8 +19,7 @@ package com.android.server.wifi; import static org.mockito.Mockito.*; import android.content.Context; - -import androidx.test.filters.SmallTest; +import android.support.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 b35ab6665..e9351258f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java @@ -24,10 +24,9 @@ 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 ecb72c08b..51f28af63 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 androidx.test.filters.SmallTest; +import android.support.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 3e31f578f..3cd9aafa8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLockManagerTest.java @@ -26,8 +26,7 @@ import android.net.wifi.WifiManager; import android.os.Binder; import android.os.IBinder; import android.os.WorkSource; - -import androidx.test.filters.SmallTest; +import android.support.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 581158538..228a64a1e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -38,12 +38,11 @@ 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 5439b0ea5..d29047c30 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMonitorTest.java @@ -33,8 +33,7 @@ import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 5298ba4c8..1c560a146 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMulticastLockManagerTest.java @@ -21,8 +21,7 @@ import static org.mockito.Mockito.*; import android.os.IBinder; import android.os.RemoteException; - -import androidx.test.filters.SmallTest; +import android.support.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 be607a89a..b8c2e68e5 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java @@ -45,8 +45,7 @@ import android.os.Handler; import android.os.INetworkManagementService; import android.os.RemoteException; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 6d607bef3..659628f21 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -27,8 +27,7 @@ import android.net.MacAddress; import android.net.wifi.WifiConfiguration; import android.os.Handler; import android.os.INetworkManagementService; - -import androidx.test.filters.SmallTest; +import android.support.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 acc5d30ae..fe29fef56 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTest.java @@ -31,10 +31,9 @@ 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 5519cf045..ab50deec6 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java @@ -31,10 +31,9 @@ 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 752f961bd..027eba259 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiPowerMetricsTest.java @@ -20,8 +20,7 @@ import static org.mockito.Mockito.*; import android.os.RemoteException; import android.os.connectivity.WifiBatteryStats; - -import androidx.test.filters.SmallTest; +import android.support.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 2eaacd64a..7ef4e899a 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 androidx.test.filters.SmallTest; +import android.support.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 0dc510097..e8ffa52ca 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreCardTest.java @@ -22,10 +22,9 @@ 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 453d81e69..2eaae3137 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java @@ -35,8 +35,7 @@ import android.content.res.Resources; import android.net.NetworkAgent; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; - -import androidx.test.filters.SmallTest; +import android.support.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 49202f354..c5dbb511a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -94,8 +94,7 @@ import android.os.Process; import android.os.RemoteException; import android.os.UserManager; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 682ba5b32..8486938f2 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 androidx.test.filters.SmallTest; - -import com.android.internal.app.IBatteryStats; +import android.support.test.filters.SmallTest; 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 acd6777f6..bc98fbd78 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 androidx.test.filters.SmallTest; +import android.support.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 ef49d2f4f..c1b39044f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiTrafficPollerTest.java @@ -26,8 +26,7 @@ import android.net.wifi.WifiManager; import android.os.IBinder; import android.os.RemoteException; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 8e41fc52d..dd8cfe062 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -88,11 +88,10 @@ 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 de5f38051..e1abc08d2 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java @@ -22,13 +22,14 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import androidx.test.filters.SmallTest; +import android.support.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 aeacd4fcf..7433beca8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java @@ -36,8 +36,7 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiScanner; import android.os.IBinder; import android.os.RemoteException; - -import androidx.test.filters.SmallTest; +import android.support.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 3d011da23..072b65ede 100644 --- a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java @@ -25,8 +25,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; - -import androidx.test.filters.SmallTest; +import android.support.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 c2a57261a..1b17219ed 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java @@ -70,8 +70,7 @@ import android.os.Messenger; import android.os.PowerManager; import android.os.Process; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 f7a0ed7fa..6157481d4 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareMetricsTest.java @@ -26,12 +26,11 @@ 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 a42e3932a..2f961a051 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeApiTest.java @@ -39,10 +39,9 @@ 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 e0dcd77a9..d4c10899d 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java @@ -30,8 +30,7 @@ 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 androidx.test.filters.SmallTest; +import android.support.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 8fd38cc5c..dbcb0a7ff 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java @@ -45,11 +45,10 @@ 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 e0ec5321c..c77d76283 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java @@ -68,11 +68,10 @@ 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 addb9b5b5..e96a9ce62 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 androidx.test.filters.SmallTest; +import android.support.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 7225c2abf..101fe16f6 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ANQPMatcherTest.java @@ -21,8 +21,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.EAPConstants; - -import androidx.test.filters.SmallTest; +import android.support.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 74a884d7b..aeeffc0a0 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 androidx.test.filters.SmallTest; +import android.support.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 b252f817e..b957bdd02 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 androidx.test.filters.SmallTest; +import android.support.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 3084e064a..e697df2d8 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 androidx.test.filters.SmallTest; +import android.support.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 1671507bf..3681e6790 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/DomainMatcherTest.java @@ -20,10 +20,9 @@ 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 c3004f537..f184f128e 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/LegacyPasspointConfigParserTest.java @@ -19,8 +19,7 @@ package com.android.server.wifi.hotspot2; import static org.junit.Assert.*; import android.os.FileUtils; - -import androidx.test.filters.SmallTest; +import android.support.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 5fb0cc0a4..f94c43976 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java @@ -44,8 +44,7 @@ import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.os.Handler; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 c238d0417..eb08000e4 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuServerConnectionTest.java @@ -30,10 +30,9 @@ 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 c76e2c878..6c2ab7bd5 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigSharedStoreDataTest.java @@ -19,10 +19,9 @@ 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 bf814c45e..7ab29c972 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointConfigUserStoreDataTest.java @@ -24,10 +24,9 @@ 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 d958f5a8c..b70738436 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 androidx.test.filters.SmallTest; +import android.support.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 aa510060f..8e48cef06 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java @@ -67,11 +67,10 @@ 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 dc7e9bb3b..b6c7d8bcb 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java @@ -33,11 +33,10 @@ 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 14815beb3..82f737cf8 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkScoreTest.java @@ -21,8 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.net.wifi.ScanResult; - -import androidx.test.filters.SmallTest; +import android.support.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 f9c686eec..82b0b96f8 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java @@ -29,10 +29,9 @@ 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 5900da878..2883e0756 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java @@ -56,10 +56,9 @@ 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 928a49168..46b2bb137 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointXmlUtilsTest.java @@ -24,10 +24,9 @@ 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 e6ecb330e..ee0ac896f 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/ServiceProviderVerifierTest.java @@ -28,10 +28,9 @@ 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 2de746e57..6fb12d0f2 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/SystemInfoTest.java @@ -22,10 +22,9 @@ 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 016e32261..806360ba7 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,8 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import android.net.wifi.WifiSsid; - -import androidx.test.filters.SmallTest; +import android.support.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 3b47ab4f0..11dbd90f4 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 androidx.test.filters.SmallTest; +import android.support.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 e293a4a9f..6ba02f029 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 androidx.test.filters.SmallTest; +import android.support.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 62a2b7f7c..962a6f9bf 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 androidx.test.filters.SmallTest; +import android.support.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 dffb5a563..106c7ea49 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 androidx.test.filters.SmallTest; +import android.support.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 a1a9aba4a..1369c15d9 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 androidx.test.filters.SmallTest; +import android.support.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 de89ff980..0aa18b749 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,8 +19,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; import android.net.wifi.WifiSsid; - -import androidx.test.filters.SmallTest; +import android.support.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 c90282509..c37a0b956 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 androidx.test.filters.SmallTest; +import android.support.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 e495b8417..dcee1f05f 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 androidx.test.filters.SmallTest; +import android.support.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 9c2862708..aae49d892 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 androidx.test.filters.SmallTest; +import android.support.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 df99fbd52..08bd0c0fe 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 androidx.test.filters.SmallTest; +import android.support.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 aa342d4af..27d8b1a02 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 androidx.test.filters.SmallTest; +import android.support.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 553f0ee83..82cb1f155 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 androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import org.junit.Test; @@ -28,6 +28,7 @@ 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 d57c9531b..311f8a0e0 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 @@ -18,7 +18,7 @@ package com.android.server.wifi.hotspot2.anqp; import static org.junit.Assert.assertEquals; -import androidx.test.filters.SmallTest; +import android.support.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 fc0942a7e..5a55ffe2e 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 androidx.test.filters.SmallTest; +import android.support.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 3032210eb..1395ed672 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 androidx.test.filters.SmallTest; +import android.support.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 dad7c2bc4..0d044f6ed 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,10 +19,9 @@ 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 4add83769..8ef2bd340 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 androidx.test.filters.SmallTest; +import android.support.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 006ebac36..9cad5774e 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 androidx.test.filters.SmallTest; +import android.support.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 160029b63..994502de0 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 androidx.test.filters.SmallTest; +import android.support.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 8ddd9a8f1..c5dbc3210 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,8 +19,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; import android.net.wifi.EAPConstants; - -import androidx.test.filters.SmallTest; +import android.support.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 1c112dfaa..d704100f2 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 androidx.test.filters.SmallTest; +import android.support.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 d7087d94d..8e2531c1a 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,8 +19,7 @@ package com.android.server.wifi.hotspot2.anqp.eap; import static org.junit.Assert.assertEquals; import android.net.wifi.EAPConstants; - -import androidx.test.filters.SmallTest; +import android.support.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 3a4b6ed3a..5a43bb84f 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 androidx.test.filters.SmallTest; +import android.support.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 491077e3b..1535333d9 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 androidx.test.filters.SmallTest; +import android.support.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 bb08ee5ac..ff3d86ff5 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,10 +25,9 @@ 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 d0a538ed5..065159587 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,8 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.os.Build; - -import androidx.test.filters.SmallTest; +import android.support.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 2c28ed22c..983976331 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 androidx.test.filters.SmallTest; +import android.support.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 933a20602..dcddb5380 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 androidx.test.filters.SmallTest; +import android.support.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 3d5dae847..c975be236 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,8 +24,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import android.net.Network; - -import androidx.test.filters.SmallTest; +import android.support.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 6975765d8..0f189242f 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,8 +22,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import android.net.Network; - -import androidx.test.filters.SmallTest; +import android.support.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 2f1afd7dd..179ac68a6 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,10 +26,9 @@ 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 0b48a73ef..d5b827d8f 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 androidx.test.filters.SmallTest; +import android.support.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 8270cad9d..c4fb3fd71 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,8 +25,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.os.Looper; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import org.junit.Before; import org.junit.Test; @@ -38,7 +37,6 @@ import java.net.URL; import fi.iki.elonen.NanoHTTPD; /** - * * Unit tests for {@link RedirectListener}. */ @SmallTest 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 2445caba5..3bb63a157 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 androidx.test.filters.SmallTest; +import android.support.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 4169868f1..5e6ed070c 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 androidx.test.filters.SmallTest; +import android.support.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 9098c2297..edda5273e 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 androidx.test.filters.SmallTest; +import android.support.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 2fe5e752f..88925cb8c 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 androidx.test.filters.SmallTest; +import android.support.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 cc56b06ef..e4f2a1521 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 androidx.test.filters.SmallTest; +import android.support.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 52d4615ad..bf1d4f653 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 androidx.test.filters.SmallTest; +import android.support.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 7be79ec02..3f4b44ac6 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java @@ -32,8 +32,7 @@ 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 androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import com.android.server.wifi.util.NativeUtil; @@ -47,6 +46,7 @@ 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 8194b9362..14a6fe9bd 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java @@ -47,10 +47,9 @@ 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 68aceb37e..157250669 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pMonitorTest.java @@ -24,8 +24,7 @@ import static org.mockito.Mockito.verify; import android.os.Handler; import android.os.Message; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 a319539c5..edf12e9fa 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttMetricsTest.java @@ -25,10 +25,9 @@ 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 be43c7af7..59ef71666 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java @@ -42,8 +42,7 @@ 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 androidx.test.filters.SmallTest; +import android.support.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 11e80f06f..968280550 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java @@ -69,10 +69,9 @@ 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 f5e777e20..bae391e40 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java @@ -28,10 +28,9 @@ 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 58c938875..5972dacb4 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java @@ -31,8 +31,7 @@ import android.net.wifi.WifiScanner.ScanData; import android.net.wifi.WifiSsid; import android.os.SystemClock; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 74674b966..4ea3e4459 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java @@ -27,8 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.net.wifi.WifiScanner; - -import androidx.test.filters.SmallTest; +import android.support.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 6348de036..fc6e41778 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 androidx.test.filters.SmallTest; +import android.support.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 bc70f65b8..e13f3bbfe 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java @@ -28,8 +28,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.wifi.WifiScanner; - -import androidx.test.filters.SmallTest; +import android.support.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 e08829f8f..ad321aef8 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/ScanScheduleUtilFilterTest.java @@ -30,8 +30,7 @@ import static org.junit.Assert.assertTrue; import android.net.wifi.WifiScanner; import android.net.wifi.WifiScanner.ScanData; import android.net.wifi.WifiScanner.ScanSettings; - -import androidx.test.filters.SmallTest; +import android.support.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 a987e22df..1db237bc5 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -27,7 +27,8 @@ import static com.android.server.wifi.ScanTestUtil.channelsToSpec; import static com.android.server.wifi.ScanTestUtil.computeSingleScanNativeSettings; import static com.android.server.wifi.ScanTestUtil.createRequest; import static com.android.server.wifi.ScanTestUtil.createSingleScanNativeSettingsForChannels; -import static com.android.server.wifi.scanner.WifiScanningServiceImpl.WifiSingleScanStateMachine.CACHED_SCAN_RESULTS_MAX_AGE_IN_MILLIS; +import static com.android.server.wifi.scanner.WifiScanningServiceImpl.WifiSingleScanStateMachine + .CACHED_SCAN_RESULTS_MAX_AGE_IN_MILLIS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -63,10 +64,9 @@ 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 2646cffb2..390683f09 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java @@ -27,8 +27,7 @@ import android.content.Context; import android.net.wifi.WifiScanner; import android.os.SystemClock; import android.os.test.TestLooper; - -import androidx.test.filters.SmallTest; +import android.support.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 e55173293..c9fc1c2bb 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java @@ -25,8 +25,7 @@ import static org.mockito.Mockito.*; import android.app.AlarmManager; import android.app.PendingIntent; import android.net.wifi.WifiScanner; - -import androidx.test.filters.SmallTest; +import android.support.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 ee43c001a..c6cd064a1 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ApConfigUtilTest.java @@ -22,8 +22,7 @@ import static org.mockito.Mockito.when; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; - -import androidx.test.filters.SmallTest; +import android.support.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 c905f27fd..c161c1ff0 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 androidx.test.filters.SmallTest; +import android.support.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 5c397c70c..7116d323f 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ByteArrayRingBufferTest.java @@ -21,10 +21,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import androidx.test.filters.SmallTest; +import android.support.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 9fc23034a..5a61d0bf8 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 androidx.test.filters.SmallTest; +import android.support.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 b7a6cefb9..d921bf33d 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.ScanResult.InformationElement; - -import androidx.test.filters.SmallTest; +import android.support.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 54d6e0c3e..63e751a8e 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 androidx.test.filters.SmallTest; +import android.support.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 3d971ab66..6f38a131e 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 androidx.test.filters.SmallTest; +import android.support.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 58d4b9e39..b218b3e2a 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/MetricsUtilsTest.java @@ -18,10 +18,9 @@ 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 79dcccfcc..bd8d4aa22 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 androidx.test.filters.SmallTest; +import android.support.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 45adffd1d..e8267953b 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/ScanResultUtilTest.java @@ -22,8 +22,7 @@ import android.net.wifi.ScanResult; import android.net.wifi.ScanResult.InformationElement; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiSsid; - -import androidx.test.filters.SmallTest; +import android.support.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 7308f1227..404236d69 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 androidx.test.filters.SmallTest; +import android.support.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 6af644d5d..6d9eee6ec 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/TelephonyUtilTest.java @@ -22,13 +22,12 @@ 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 fbf147180..848fbff38 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java @@ -15,17 +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 androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import com.android.server.wifi.FakeWifiLog; +import static org.mockito.Matchers.contains; +import static org.mockito.Mockito.verify; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; 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 4e3db142b..447a5eb39 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/WifiPermissionsUtilTest.java @@ -37,8 +37,7 @@ import android.os.Build; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; - -import androidx.test.filters.SmallTest; +import android.support.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 9db8e823b..6bdf9383a 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java @@ -23,11 +23,10 @@ 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 6020794d3..98b9ffc8a 100644 --- a/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java +++ b/tests/wifitests/src/com/android/server/wifi/wificond/NativeScanResultTest.java @@ -21,8 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.os.Parcel; - -import androidx.test.filters.SmallTest; +import android.support.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 d47fff822..abc266513 100644 --- a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java @@ -20,8 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import android.os.Parcel; - -import androidx.test.filters.SmallTest; +import android.support.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 fc430c734..a54b53f26 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 androidx.test.filters.SmallTest; +import android.support.test.filters.SmallTest; import org.junit.Test; |