Add missing SmallTest annotations in opt/net/wifi

Bug: 73290083
Test: Unit tests
Change-Id: Id09ce5ea984da892274c7f63d126dffb63ad5a7c

37 files changed, 82 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java
index 26d892855..734eefa64 100644
--- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkNotifierTest.java
@@ -48,6 +48,7 @@ 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.util.ArraySet;
 
 
@@ -66,6 +67,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link CarrierNetworkNotifier}.
  */
+@SmallTest
 public class CarrierNetworkNotifierTest {
 
     private static final String TEST_SSID_1 = "Test SSID 1";
diff --git a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
index f18c52d39..823a28d13 100644
--- a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
@@ -54,6 +54,7 @@ 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 com.android.server.wifi.HalDeviceManager.InterfaceDestroyedListener;
@@ -80,6 +81,7 @@ import java.util.Set;
 /**
  * Unit test harness for HalDeviceManagerTest.
  */
+@SmallTest
 public class HalDeviceManagerTest {
     private HalDeviceManager mDut;
     @Mock IServiceManager mServiceManagerMock;
diff --git a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java
index 773635968..23a61e6cb 100644
--- a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java
@@ -31,6 +31,7 @@ import android.hidl.manager.V1_0.IServiceNotification;
 import android.net.wifi.WifiConfiguration;
 import android.os.IHwBinder;
 import android.os.RemoteException;
+import android.support.test.filters.SmallTest;
 
 import com.android.internal.R;
 import com.android.server.wifi.util.NativeUtil;
@@ -45,6 +46,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit tests for HostapdHal
  */
+@SmallTest
 public class HostapdHalTest {
     private static final String IFACE_NAME = "mock-wlan0";
     private static final String NETWORK_SSID = "test-ssid";
diff --git a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
index a0da34161..e86860bda 100644
--- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
@@ -48,6 +48,7 @@ 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.util.ArraySet;
 
 import com.android.server.wifi.nano.WifiMetricsProto.ConnectToNetworkNotificationAndActionCount;
@@ -65,6 +66,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link OpenNetworkNotifier}.
  */
+@SmallTest
 public class OpenNetworkNotifierTest {
 
     private static final String TEST_SSID_1 = "Test SSID 1";
diff --git a/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java b/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java
index 7a800a3de..6796b8155 100644
--- a/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/RttManagerTest.java
@@ -22,12 +22,14 @@ import android.net.wifi.RttManager;
 import android.net.wifi.RttManager.ParcelableRttParams;
 import android.net.wifi.RttManager.RttParams;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
 
 import org.junit.Test;
 
 /**
  * Unit test for {@link RttManager}
  */
+@SmallTest
 public class RttManagerTest {
 
     // Verify ParcelableRttParams are the same after writing and reading from parcel.
diff --git a/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java
index 606b825ee..8a9d9bc80 100644
--- a/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SsidSetStoreDataTest.java
@@ -25,6 +25,7 @@ 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 com.android.internal.util.FastXmlSerializer;
@@ -47,6 +48,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link com.android.server.wifi.SsidSetStoreData}.
  */
+@SmallTest
 public class SsidSetStoreDataTest {
     private static final String TEST_NOTIFIER_NAME = "TestNetwork";
     private static final String TEST_SSID1 = "SSID 1";
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
index c28f8708e..3cf1c9ef9 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
@@ -46,6 +46,7 @@ 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;
 
@@ -74,6 +75,7 @@ import java.util.Random;
 /**
  * Unit tests for SupplicantStaIfaceHal
  */
+@SmallTest
 public class SupplicantStaIfaceHalTest {
     private static final String TAG = "SupplicantStaIfaceHalTest";
     private static final Map<Integer, String> NETWORK_ID_TO_SSID = new HashMap<Integer, String>() {{
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
index 8c8cd1331..a52cca87f 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
@@ -38,6 +38,7 @@ 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 com.android.internal.R;
@@ -56,6 +57,7 @@ import java.util.Random;
 /**
  * Unit tests for SupplicantStaNetworkHal
  */
+@SmallTest
 public class SupplicantStaNetworkHalTest {
     private static final String IFACE_NAME = "wlan0";
     private static final Map<String, String> NETWORK_EXTRAS_VALUES = new HashMap<>();
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java
index a780da287..42e350246 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStateTrackerTest.java
@@ -29,6 +29,7 @@ import android.net.wifi.WifiSsid;
 import android.os.Handler;
 import android.os.Message;
 import android.os.test.TestLooper;
+import android.support.test.filters.SmallTest;
 
 import com.android.internal.app.IBatteryStats;
 
@@ -39,6 +40,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit tests for {@link android.net.wifi.SupplicantStateTracker}.
  */
+@SmallTest
 public class SupplicantStateTrackerTest {
 
     private static final String TAG = "SupplicantStateTrackerTest";
diff --git a/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java b/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
index f4fa2b8b0..fa91be1a3 100644
--- a/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.wifi.WifiInfo;
+import android.support.test.filters.SmallTest;
 
 import com.android.internal.R;
 
@@ -35,6 +36,7 @@ import org.mockito.Spy;
 /**
  * Unit tests for {@link com.android.server.wifi.VelocityBasedConnectedScore}.
  */
+@SmallTest
 public class VelocityBasedConnectedScoreTest {
 
 
diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java
index e59175c93..33f1b42fe 100644
--- a/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WakeupConfigStoreDataTest.java
@@ -22,6 +22,7 @@ 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 com.android.internal.util.FastXmlSerializer;
@@ -45,6 +46,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link WakeupConfigStoreData}.
  */
+@SmallTest
 public class WakeupConfigStoreDataTest {
 
     @Mock private WakeupConfigStoreData.DataSource<Boolean> mActiveDataSource;
diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java
index a1b8b3ba7..3734ba786 100644
--- a/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WakeupControllerTest.java
@@ -33,6 +33,7 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiScanner;
 import android.os.test.TestLooper;
 import android.provider.Settings;
+import android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.util.ScanResultUtil;
 
@@ -55,6 +56,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link WakeupController}.
  */
+@SmallTest
 public class WakeupControllerTest {
 
     private static final String SAVED_SSID = "test scan ssid";
diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java
index d9750189f..f7c23aef9 100644
--- a/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WakeupEvaluatorTest.java
@@ -22,6 +22,7 @@ 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 com.android.server.wifi.util.ScanResultUtil;
@@ -39,6 +40,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link WakeupEvaluator}.
  */
+@SmallTest
 public class WakeupEvaluatorTest {
 
     private static final String SAVED_SSID_1 = "saved ssid 1";
diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java
index f3126c7a9..43605f484 100644
--- a/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WakeupLockTest.java
@@ -21,6 +21,8 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -34,6 +36,7 @@ import java.util.List;
 /**
  * Unit tests for {@link WakeupLock}.
  */
+@SmallTest
 public class WakeupLockTest {
 
     private static final String SSID_1 = "ssid1";
diff --git a/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java b/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
index 0fe0e413f..1bc92e67a 100644
--- a/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
@@ -37,6 +37,7 @@ import android.content.IntentFilter;
 import android.os.Handler;
 import android.os.test.TestLooper;
 import android.provider.Settings;
+import android.support.test.filters.SmallTest;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,6 +48,7 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 /** Unit tests for {@link com.android.server.wifi.WakeupOnboarding} */
+@SmallTest
 public class WakeupOnboardingTest {
 
     @Mock private Context mContext;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
index cdc6c2abf..cc1b50b4c 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDataStallTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.provider.Settings;
+import android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.nano.WifiMetricsProto.WifiIsUnusableEvent;
 
@@ -38,6 +39,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit tests for {@link com.android.server.wifi.WifiDataStall}.
  */
+@SmallTest
 public class WifiDataStallTest {
 
     @Mock Context mContext;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java
index 638b637c6..51f28af63 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiLinkLayerStatsTest.java
@@ -19,6 +19,8 @@ package com.android.server.wifi;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -27,6 +29,7 @@ import java.util.Random;
 /**
  * Unit tests for {@link com.android.server.wifi.WifiLinkLayerStats}.
  */
+@SmallTest
 public class WifiLinkLayerStatsTest {
 
     ExtendedWifiInfo mWifiInfo;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index 3a678bbef..2eaae3137 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -35,6 +35,7 @@ import android.content.res.Resources;
 import android.net.NetworkAgent;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
+import android.support.test.filters.SmallTest;
 
 import com.android.internal.R;
 
@@ -49,6 +50,7 @@ import java.io.PrintWriter;
 /**
  * Unit tests for {@link com.android.server.wifi.WifiScoreReport}.
  */
+@SmallTest
 public class WifiScoreReportTest {
 
 
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java
index cf40f47be..bc98fbd78 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiTestUtil.java
@@ -16,12 +16,15 @@
 
 package com.android.server.wifi;
 
+import android.support.test.filters.SmallTest;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 /**
  * Generial Utilities for Wifi tests
  */
+@SmallTest
 public class WifiTestUtil {
 
     /**
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
index 42c0ce253..c0a9cf252 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
@@ -94,6 +94,7 @@ import android.net.wifi.WifiWakeReasonAndCounts;
 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;
 
@@ -119,6 +120,7 @@ import java.util.Set;
 /**
  * Unit tests for {@link com.android.server.wifi.WifiVendorHal}.
  */
+@SmallTest
 public class WifiVendorHalTest {
 
     private static final String TEST_IFACE_NAME = "wlan0";
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java
index 9d55f9dc7..e1abc08d2 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiWakeMetricsTest.java
@@ -22,12 +22,15 @@ import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+
 import com.android.server.wifi.nano.WifiMetricsProto.WifiWakeStats;
 
 import org.junit.Before;
 import org.junit.Test;
 
 
+@SmallTest
 public class WifiWakeMetricsTest {
 
     private WifiWakeMetrics mWifiWakeMetrics;
diff --git a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
index 74bfdeba5..072b65ede 100644
--- a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.provider.Settings;
+import android.support.test.filters.SmallTest;
 
 import com.android.internal.notification.SystemNotificationChannels;
 
@@ -38,6 +39,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit tests for {@link com.android.server.wifi.WrongPasswordNotifier}.
  */
+@SmallTest
 public class WrongPasswordNotifierTest {
     private static final String TEST_SSID = "Test SSID";
 
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 cafbe48e2..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,6 +26,7 @@ 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;
@@ -49,6 +50,7 @@ import java.util.Map;
 /**
  * Unit test harness for WifiAwareMetrics
  */
+@SmallTest
 public class WifiAwareMetricsTest {
     @Mock Clock mClock;
     @Mock private Context mMockContext;
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 7ae67e8f4..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,6 +39,7 @@ 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 org.junit.Before;
@@ -54,6 +55,7 @@ import java.io.PrintWriter;
 /**
  * Unit test harness for WifiAwareNativeApi
  */
+@SmallTest
 public class WifiAwareNativeApiTest {
     @Mock WifiAwareNativeManager mWifiAwareNativeManagerMock;
     @Mock IWifiNanIface mIWifiNanIfaceMock;
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 42824501f..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,6 +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 android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.HalDeviceManager;
 
@@ -45,6 +46,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit test harness for WifiAwareNativeManager.
  */
+@SmallTest
 public class WifiAwareNativeManagerTest {
     private WifiAwareNativeManager mDut;
     @Mock private WifiAwareStateManager mWifiAwareStateManagerMock;
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 8b853a470..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,6 +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 android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.util.NativeUtil;
 
@@ -49,6 +50,7 @@ import java.util.List;
 /**
  * Unit tests for SupplicantP2pIfaceCallback
  */
+@SmallTest
 public class SupplicantP2pIfaceCallbackTest {
     private static final String TAG = "SupplicantP2pIfaceCallbackTest";
 
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 cda1aae83..2cfad27e4 100644
--- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java
@@ -47,6 +47,7 @@ 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 com.android.server.wifi.util.NativeUtil;
@@ -68,6 +69,7 @@ import java.util.Map;
 /**
  * Unit tests for SupplicantP2pIfaceHal
  */
+@SmallTest
 public class SupplicantP2pIfaceHalTest {
     private static final String TAG = "SupplicantP2pIfaceHalTest";
     private SupplicantP2pIfaceHal mDut;
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 0ed7bd202..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,6 +25,7 @@ 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 com.android.server.wifi.Clock;
@@ -45,6 +46,7 @@ import java.util.List;
 /**
  * Unit test harness for RttMetrics
  */
+@SmallTest
 public class RttMetricsTest {
     private RttMetrics mDut;
 
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 7bbe6bb79..751a6a4ee 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
@@ -42,6 +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 android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.HalDeviceManager;
 
@@ -63,6 +64,7 @@ import java.util.List;
 /**
  * Unit test harness for the RttNative class.
  */
+@SmallTest
 public class RttNativeTest {
     private RttNative mDut;
     private WifiStatus mStatusSuccess;
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 e1f35239f..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,6 +69,7 @@ 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 com.android.server.wifi.Clock;
@@ -94,6 +95,7 @@ import java.util.Set;
 /**
  * Unit test harness for the RttServiceImpl class.
  */
+@SmallTest
 public class RttServiceImplTest {
 
     private static final long BACKGROUND_PROCESS_EXEC_GAP_MS = 10 * 60 * 1000;  // 10 minutes.
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 be884623a..cd015c3f3 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
@@ -31,6 +31,7 @@ import android.net.wifi.WifiScanner.ScanData;
 import android.net.wifi.WifiSsid;
 import android.os.SystemClock;
 import android.os.test.TestLooper;
+import android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.Clock;
 import com.android.server.wifi.MockResources;
@@ -57,6 +58,7 @@ import java.util.Set;
  * Base unit tests that should pass for all implementations of
  * {@link com.android.server.wifi.scanner.WifiScannerImpl}.
  */
+@SmallTest
 public abstract class BaseWifiScannerImplTest {
     protected static final String IFACE_NAME = "a_test_interface_name";
     @Mock Context mContext;
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 af7ad04db..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,12 +16,15 @@
 
 package com.android.server.wifi.util;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 /**
  * Unit tests for {@link com.android.server.wifi.util.BitMask}.
  */
+@SmallTest
 public class BitMaskTest {
     /**
      * Test that checkoff.testAndClear works as advertised
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 5e06e7035..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,6 +19,8 @@ package com.android.server.wifi.util;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Test;
 
 import java.util.Random;
@@ -26,6 +28,7 @@ import java.util.Random;
 /**
  * Unit tests for {@link com.android.server.wifi.util.KalmanFilter}.
  */
+@SmallTest
 public class KalmanFilterTest {
     /**
      * Test that constructor works
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 f347f3d75..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,6 +20,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.fail;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -29,6 +31,7 @@ import java.util.Random;
 /**
  * Unit tests for {@link com.android.server.wifi.util.Matrix}.
  */
+@SmallTest
 public class MatrixTest {
     /**
      * Test that both forms of constructor work
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 d12112c06..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,6 +18,7 @@ package com.android.server.wifi.util;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 
+import android.support.test.filters.SmallTest;
 import android.util.SparseIntArray;
 
 import org.junit.Before;
@@ -29,6 +30,7 @@ import org.mockito.MockitoAnnotations;
 /**
  * Unit test harness for MetricsUtils.
  */
+@SmallTest
 public class MetricsUtilsTest {
     @Rule
     public ErrorCollector collector = new ErrorCollector();
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 05b719cd2..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,6 +18,8 @@ package com.android.server.wifi.util;
 
 import static org.junit.Assert.*;
 
+import android.support.test.filters.SmallTest;
+
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -26,6 +28,7 @@ import java.util.Arrays;
 /**
  * Unit tests for {@link com.android.server.wifi.util.NativeUtil}.
  */
+@SmallTest
 public class NativeUtilTest {
     /**
      * Test that parsing a typical colon-delimited MAC address works.
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 220e6d78e..848fbff38 100644
--- a/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/util/WifiHandlerTest.java
@@ -18,6 +18,7 @@ package com.android.server.wifi.util;
 import android.os.Looper;
 import android.os.Message;
 import android.os.test.TestLooper;
+import android.support.test.filters.SmallTest;
 
 import com.android.server.wifi.FakeWifiLog;
 
@@ -33,6 +34,7 @@ import org.mockito.Spy;
 
 /** Unit tests for {@link WifiHandler}. */
 @RunWith(JUnit4.class)
+@SmallTest
 public class WifiHandlerTest {
     private static final String TAG = "WifiHandlerTest";
     private WifiHandler mCodeUnderTest;