Add test size annotation to car tests
Bug:26873938
Change-Id: Ie0d0cb1ea41d77756ac6f88d27d2487245c7957d
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java b/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
index 5fe56fe..482374e 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
@@ -22,8 +22,10 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Parcel;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+@SmallTest
public class AppBlockingPackageInfoTest extends AndroidTestCase {
private static final String TAG = AppBlockingPackageInfoTest.class.getSimpleName();
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarAppBlockingPolicyTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarAppBlockingPolicyTest.java
index 633a93c..7d069c8 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarAppBlockingPolicyTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarAppBlockingPolicyTest.java
@@ -17,14 +17,12 @@
import android.car.content.pm.AppBlockingPackageInfo;
import android.car.content.pm.CarAppBlockingPolicy;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Parcel;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
+@SmallTest
public class CarAppBlockingPolicyTest extends AndroidTestCase {
private static final String TAG = AppBlockingPackageInfoTest.class.getSimpleName();
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarAppContextManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarAppContextManagerTest.java
index 6f73e47..6692558 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarAppContextManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarAppContextManagerTest.java
@@ -17,11 +17,13 @@
import android.car.Car;
import android.car.CarAppContextManager;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarAppContextManagerTest extends CarApiTestBase {
private static final String TAG = CarAppContextManager.class.getSimpleName();
private CarAppContextManager mManager;
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarHvacManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarHvacManagerTest.java
index 8681716..0d4e78d 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarHvacManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarHvacManagerTest.java
@@ -15,16 +15,18 @@
*/
package com.android.car.apitest;
-import java.util.List;
-
import android.car.Car;
import android.car.VehicleZoneUtil;
import android.car.hardware.hvac.CarHvacManager;
import android.car.hardware.hvac.CarHvacManager.CarHvacBaseProperty;
import android.car.hardware.hvac.CarHvacManager.CarHvacFloatProperty;
import android.car.hardware.hvac.CarHvacManager.CarHvacIntProperty;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
+import java.util.List;
+
+@MediumTest
public class CarHvacManagerTest extends CarApiTestBase {
private static final String TAG = CarHvacManagerTest.class.getSimpleName();
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
index a30136d..918423e 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
@@ -21,6 +21,7 @@
import android.car.navigation.CarNavigationInstrumentCluster;
import android.car.navigation.CarNavigationManager;
import android.car.navigation.CarNavigationManager.CarNavigationListener;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.concurrent.CountDownLatch;
@@ -29,6 +30,7 @@
/**
* Unit tests for {@link CarNavigationManager}
*/
+@MediumTest
public class CarNavigationManagerTest extends CarApiTestBase {
private static final String TAG = CarNavigationManagerTest.class.getSimpleName();
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarPackageManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarPackageManagerTest.java
index bffb526..b3f34eb 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarPackageManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarPackageManagerTest.java
@@ -23,10 +23,12 @@
import android.car.Car;
import android.car.content.pm.CarPackageManager;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarPackageManagerTest extends AndroidTestCase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarSensorManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarSensorManagerTest.java
index 6175fc4..c7adfc1 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarSensorManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarSensorManagerTest.java
@@ -24,11 +24,12 @@
import android.car.hardware.CarSensorEvent;
import android.car.hardware.CarSensorManager;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-
+@MediumTest
public class CarSensorManagerTest extends AndroidTestCase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarTest.java
index a82a4fd..4ffdfba 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarTest.java
@@ -16,18 +16,19 @@
package com.android.car.apitest;
+import android.car.Car;
+import android.car.hardware.CarSensorManager;
import android.content.ComponentName;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.Looper;
-import android.car.Car;
-import android.car.hardware.CarSensorManager;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-
+@SmallTest
public class CarTest extends AndroidTestCase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/VehicleDoorTest.java b/tests/android_car_api_test/src/com/android/car/apitest/VehicleDoorTest.java
index bb46797..b144f18 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/VehicleDoorTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/VehicleDoorTest.java
@@ -17,9 +17,11 @@
import android.car.VehicleDoor;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
+@SmallTest
public class VehicleDoorTest extends AndroidTestCase {
public void testMatchWithVehicleHal() {
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/VehicleSeatTest.java b/tests/android_car_api_test/src/com/android/car/apitest/VehicleSeatTest.java
index 28d626a..2390f4c 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/VehicleSeatTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/VehicleSeatTest.java
@@ -17,9 +17,11 @@
import android.car.VehicleSeat;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
+@SmallTest
public class VehicleSeatTest extends AndroidTestCase {
public void testMatchWithVehicleHal() {
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/VehicleWindowTest.java b/tests/android_car_api_test/src/com/android/car/apitest/VehicleWindowTest.java
index ea9ab3d..b77165c 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/VehicleWindowTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/VehicleWindowTest.java
@@ -17,9 +17,11 @@
import android.car.VehicleWindow;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
+@SmallTest
public class VehicleWindowTest extends AndroidTestCase {
public void testMatchWithVehicleHal() {
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneTest.java b/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneTest.java
index 85e7621..5dfd128 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneTest.java
@@ -17,9 +17,12 @@
import android.car.VehicleZone;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
+@SmallTest
public class VehicleZoneTest extends AndroidTestCase {
public void testMatchWithVehicleHal() {
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneUtilTest.java b/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneUtilTest.java
index 8149c55..a0a3d5a 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneUtilTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/VehicleZoneUtilTest.java
@@ -17,7 +17,9 @@
import android.car.VehicleZoneUtil;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+@SmallTest
public class VehicleZoneUtilTest extends AndroidTestCase {
public void testZoneToIndex() {
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarActivityTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarActivityTest.java
index 3cd54cc..0fc8dc6 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarActivityTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarActivityTest.java
@@ -18,7 +18,9 @@
import android.support.car.Car;
import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+@MediumTest
public class CarActivityTest extends ActivityInstrumentationTestCase2<TestCarProxyActivity> {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppContextManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppContextManagerTest.java
index 11d6737..14aaa93 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppContextManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppContextManagerTest.java
@@ -17,11 +17,13 @@
import android.support.car.Car;
import android.support.car.CarAppContextManager;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarAppContextManagerTest extends CarApiTestBase {
private static final String TAG = CarAppContextManager.class.getSimpleName();
private CarAppContextManager mManager;
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java
index 3349763..4792758 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java
@@ -18,11 +18,13 @@
import android.support.car.Car;
import android.support.car.CarConnectionListener;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarConnectionListenerTest extends CarApiTestBase {
private static final String TAG = CarConnectionListenerTest.class.getSimpleName();
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
index 14d5045..939e5bd 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
@@ -17,16 +17,17 @@
package com.android.support.car.apitest;
import android.content.ComponentName;
-import android.os.IBinder;
import android.os.Looper;
import android.support.car.Car;
import android.support.car.ServiceConnectionListener;
import android.support.car.content.pm.CarPackageManager;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarPackageManagerTest extends AndroidTestCase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
index 97ef005..6d7ef0e 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
@@ -17,17 +17,17 @@
package com.android.support.car.apitest;
import android.content.ComponentName;
-import android.os.IBinder;
import android.os.Looper;
import android.support.car.Car;
-import android.support.car.hardware.CarSensorManager;
import android.support.car.ServiceConnectionListener;
+import android.support.car.hardware.CarSensorManager;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-
+@MediumTest
public class CarTest extends AndroidTestCase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 3000;
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/ExtendableParcelableTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/ExtendableParcelableTest.java
index d6a3264..88c677d 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/ExtendableParcelableTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/ExtendableParcelableTest.java
@@ -19,10 +19,12 @@
import android.support.car.annotation.VersionDef;
import android.support.car.os.ExtendableParcelable;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
import java.util.Arrays;
+@SmallTest
public class ExtendableParcelableTest extends AndroidTestCase {
private static final String TAG = ExtendableParcelableTest.class.getSimpleName();
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/TestCarActivity.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/TestCarActivity.java
index 4df6750..da19b72 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/TestCarActivity.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/TestCarActivity.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.Bundle;
import android.support.car.Car;
-import android.support.car.CarNotConnectedException;
-import android.support.car.CarNotSupportedException;
import android.support.car.app.CarActivity;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
+@MediumTest
public class TestCarActivity extends CarActivity {
private static final String TAG = TestCarActivity.class.getSimpleName();
diff --git a/tests/carservice_test/src/android/media/tests/AudioPolicyTest.java b/tests/carservice_test/src/android/media/tests/AudioPolicyTest.java
index d8c39b6..3fc51f1 100644
--- a/tests/carservice_test/src/android/media/tests/AudioPolicyTest.java
+++ b/tests/carservice_test/src/android/media/tests/AudioPolicyTest.java
@@ -28,13 +28,14 @@
import android.os.Handler;
import android.os.Looper;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.ArrayList;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-
+@MediumTest
public class AudioPolicyTest extends AndroidTestCase {
private static final String TAG = AudioPolicyTest.class.getSimpleName();
private static final long WAIT_TIMEOUT_MS = 1000;
diff --git a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java b/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
index 3e05dd9..72e97e0 100644
--- a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
+++ b/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
@@ -16,6 +16,7 @@
package com.android.car.test;
import android.car.test.VehicleHalEmulator.VehicleHalPropertyHandler;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
import com.android.car.vehiclenetwork.VehicleNetworkConsts.VehicleAudioContextFlag;
@@ -32,6 +33,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@SmallTest
public class AudioRoutingPolicyTest extends MockedCarTestBase {
private static final long TIMEOUT_MS = 3000;
diff --git a/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java b/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java
index d3085f9..180b3ef 100644
--- a/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java
+++ b/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java
@@ -22,6 +22,7 @@
import android.os.SystemClock;
import android.support.car.Car;
import android.support.car.media.CarAudioManager;
+import android.test.suitebuilder.annotation.MediumTest;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
import com.android.car.vehiclenetwork.VehicleNetworkConsts.VehicleAudioContextFlag;
@@ -42,6 +43,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarAudioFocusTest extends MockedCarTestBase {
private static final long TIMEOUT_MS = 3000;
diff --git a/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java b/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java
index 497e6c6..d6ff12b 100644
--- a/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java
@@ -16,6 +16,7 @@
package com.android.car.test;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import android.car.Car;
@@ -40,6 +41,7 @@
import java.util.concurrent.TimeUnit;
import java.util.HashMap;
+@MediumTest
public class CarHvacManagerTest extends MockedCarTestBase {
private static final String TAG = CarHvacManagerTest.class.getSimpleName();
diff --git a/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java b/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java
index e0dc3d9..364d0a6 100644
--- a/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java
+++ b/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java
@@ -21,6 +21,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import android.view.Display;
@@ -43,6 +44,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class CarPowerManagementTest extends MockedCarTestBase {
private static final long TIMEOUT_MS = 3000;
diff --git a/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java b/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java
index 4dcd3ce..36a8cfc 100644
--- a/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java
@@ -22,6 +22,7 @@
import android.car.hardware.radio.CarRadioManager.CarRadioEventListener;
import android.car.hardware.radio.CarRadioPreset;
import android.hardware.radio.RadioManager;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import com.android.car.vehiclenetwork.VehicleNetworkConsts;
@@ -36,6 +37,7 @@
import java.util.concurrent.TimeUnit;
import java.util.HashMap;
+@MediumTest
public class CarRadioManagerTest extends MockedCarTestBase {
private static final String TAG = CarRadioManagerTest.class.getSimpleName();
diff --git a/tests/carservice_test/src/com/android/car/test/GarageModeTest.java b/tests/carservice_test/src/com/android/car/test/GarageModeTest.java
index 8380ec2..8168dba 100644
--- a/tests/carservice_test/src/com/android/car/test/GarageModeTest.java
+++ b/tests/carservice_test/src/com/android/car/test/GarageModeTest.java
@@ -17,11 +17,13 @@
import android.content.Context;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import com.android.car.CarPowerManagementService;
import com.android.car.DeviceIdleControllerWrapper;
import com.android.car.GarageModeService;
+@MediumTest
public class GarageModeTest extends AndroidTestCase {
public void testMaintenanceActive() throws Exception {
diff --git a/tests/carservice_test/src/com/android/support/car/test/AppContextTest.java b/tests/carservice_test/src/com/android/support/car/test/AppContextTest.java
index 8f95bf9..edef567 100644
--- a/tests/carservice_test/src/com/android/support/car/test/AppContextTest.java
+++ b/tests/carservice_test/src/com/android/support/car/test/AppContextTest.java
@@ -20,6 +20,7 @@
import android.media.AudioManager;
import android.support.car.Car;
import android.support.car.CarAppContextManager;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import com.android.car.test.MockedCarTestBase;
@@ -35,6 +36,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class AppContextTest extends MockedCarTestBase {
private static final String TAG = AppContextTest.class.getSimpleName();
private static final long DEFAULT_WAIT_TIMEOUT_MS = 1000;
diff --git a/tests/carservice_test/src/com/android/support/car/test/CarConnectionListenerInMockingTest.java b/tests/carservice_test/src/com/android/support/car/test/CarConnectionListenerInMockingTest.java
index 7ad546a..6c18f93 100644
--- a/tests/carservice_test/src/com/android/support/car/test/CarConnectionListenerInMockingTest.java
+++ b/tests/carservice_test/src/com/android/support/car/test/CarConnectionListenerInMockingTest.java
@@ -22,6 +22,7 @@
import android.support.car.Car;
import android.support.car.CarConnectionListener;
import android.support.car.ServiceConnectionListener;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import java.util.LinkedList;
@@ -30,6 +31,7 @@
import com.android.car.test.MockedCarTestBase;
+@MediumTest
public class CarConnectionListenerInMockingTest extends MockedCarTestBase {
private static final long DEFAULT_WAIT_TIMEOUT_MS = 1000;
diff --git a/tests/carservice_test/src/com/android/support/car/test/CarPackageManagerTest.java b/tests/carservice_test/src/com/android/support/car/test/CarPackageManagerTest.java
index 1abc49e..ecec1f1 100644
--- a/tests/carservice_test/src/com/android/support/car/test/CarPackageManagerTest.java
+++ b/tests/carservice_test/src/com/android/support/car/test/CarPackageManagerTest.java
@@ -21,11 +21,13 @@
import android.car.content.pm.CarAppBlockingPolicy;
import android.car.content.pm.CarPackageManager;
import android.content.pm.PackageManager;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
import com.android.car.test.MockedCarTestBase;
import com.android.car.test.TestAppBlockingPolicyService;
+@SmallTest
public class CarPackageManagerTest extends MockedCarTestBase {
private static final String TAG = CarPackageManagerTest.class.getSimpleName();
diff --git a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
index 78b0ece..7059f7d 100644
--- a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
+++ b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
@@ -17,6 +17,7 @@
import android.os.HandlerThread;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
import com.android.car.vehiclenetwork.VehicleNetwork;
@@ -41,6 +42,7 @@
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+@MediumTest
public class VehicleNetworkMockedTest extends AndroidTestCase {
private static final String TAG = VehicleNetworkMockedTest.class.getSimpleName();
diff --git a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkTest.java b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkTest.java
index 5febc7e..6788bd5 100644
--- a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkTest.java
+++ b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkTest.java
@@ -18,6 +18,7 @@
import android.os.HandlerThread;
import android.os.SystemClock;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import android.util.ArraySet;
import android.util.Log;
@@ -35,6 +36,7 @@
import java.util.LinkedList;
+@MediumTest
public class VehicleNetworkTest extends AndroidTestCase {
private static final String TAG = VehicleNetworkTest.class.getSimpleName();
private static final long TIMEOUT_MS = 2000;