Update ApiTest annotations for const values in android.car
Internal clean up task: Add relevant annotations to tests.
Test: atest FuelTypeTest PortLocationTypeTest VehicleAreaMirrorTest VehicleDoorTest VehicleGearTest VehicleIgnitionTest
Bug: 261897312
Change-Id: I69aa61b7a96021f83bcd48c702de10fd69e9bd1d
diff --git a/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java b/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
index 8fd9e10..3b58bf7 100644
--- a/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/FuelTypeTest.java
@@ -17,23 +17,24 @@
package android.car.apitest;
import android.car.FuelType;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
import static com.google.common.truth.Truth.assertThat;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
@SmallTest
public final class FuelTypeTest extends CarLessApiTestBase {
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
@Test
+ @ApiTest(apis = {"android.car.FuelType#UNKNOWN", "android.car.FuelType#UNLEADED",
+ "android.car.FuelType#LEADED", "android.car.FuelType#DIESEL_1",
+ "android.car.FuelType#DIESEL_2", "android.car.FuelType#BIODIESEL",
+ "android.car.FuelType#E85", "android.car.FuelType#LPG", "android.car.FuelType#CNG",
+ "android.car.FuelType#LNG", "android.car.FuelType#ELECTRIC",
+ "android.car.FuelType#HYDROGEN", "android.car.FuelType#OTHER"})
public void testMatchWithVehicleHal() {
assertThat(FuelType.UNKNOWN)
.isEqualTo(android.hardware.automotive.vehicle.FuelType.FUEL_TYPE_UNKNOWN);
diff --git a/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java b/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
index 4b9596d..0549814 100644
--- a/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/PortLocationTypeTest.java
@@ -17,23 +17,22 @@
package android.car.apitest;
import android.car.PortLocationType;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
import static com.google.common.truth.Truth.assertThat;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
@SmallTest
public final class PortLocationTypeTest extends CarLessApiTestBase {
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
@Test
+ @ApiTest(apis = {"android.car.PortLocationType#UNKNOWN",
+ "android.car.PortLocationType#FRONT_LEFT", "android.car.PortLocationType#FRONT_RIGHT",
+ "android.car.PortLocationType#REAR_RIGHT", "android.car.PortLocationType#REAR_LEFT",
+ "android.car.PortLocationType#FRONT", "android.car.PortLocationType#REAR"})
public void testMatchWithVehicleHal() {
assertThat(PortLocationType.UNKNOWN)
.isEqualTo(android.hardware.automotive.vehicle.PortLocationType.UNKNOWN);
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
index 22bec98..1f7949a 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleAreaMirrorTest.java
@@ -16,23 +16,21 @@
package android.car.apitest;
import android.car.VehicleAreaMirror;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
import static com.google.common.truth.Truth.assertThat;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
@SmallTest
public final class VehicleAreaMirrorTest extends CarLessApiTestBase {
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
@Test
+ @ApiTest(apis = {"android.car.VehicleAreaMirror#MIRROR_DRIVER_CENTER",
+ "android.car.VehicleAreaMirror#MIRROR_DRIVER_LEFT",
+ "android.car.VehicleAreaMirror#MIRROR_DRIVER_RIGHT"})
public void testMatchWithVehicleHal() {
assertThat(VehicleAreaMirror.MIRROR_DRIVER_CENTER).isEqualTo(
android.hardware.automotive.vehicle.VehicleAreaMirror.DRIVER_CENTER);
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
index ed7ac3d..a96438d 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleDoorTest.java
@@ -16,23 +16,25 @@
package android.car.apitest;
import android.car.VehicleAreaDoor;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
import static com.google.common.truth.Truth.assertThat;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
@SmallTest
public final class VehicleDoorTest extends CarLessApiTestBase {
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
@Test
+ @ApiTest(apis = {"android.car.VehicleAreaDoor#DOOR_HOOD",
+ "android.car.VehicleAreaDoor#DOOR_REAR", "android.car.VehicleAreaDoor#DOOR_ROW_1_LEFT",
+ "android.car.VehicleAreaDoor#DOOR_ROW_1_RIGHT",
+ "android.car.VehicleAreaDoor#DOOR_ROW_2_LEFT",
+ "android.car.VehicleAreaDoor#DOOR_ROW_2_RIGHT",
+ "android.car.VehicleAreaDoor#DOOR_ROW_3_LEFT",
+ "android.car.VehicleAreaDoor#DOOR_ROW_3_RIGHT"})
public void testMatchWithVehicleHal() {
assertThat(VehicleAreaDoor.DOOR_HOOD)
.isEqualTo(android.hardware.automotive.vehicle.VehicleAreaDoor.HOOD);
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
index e6a402a..5a0ba75 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleGearTest.java
@@ -16,23 +16,25 @@
package android.car.apitest;
import android.car.VehicleGear;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
import static com.google.common.truth.Truth.assertThat;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
@SmallTest
public final class VehicleGearTest extends CarLessApiTestBase {
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
@Test
+ @ApiTest(apis = {"android.car.VehicleGear#GEAR_UNKNOWN", "android.car.VehicleGear#GEAR_NEUTRAL",
+ "android.car.VehicleGear#GEAR_REVERSE", "android.car.VehicleGear#GEAR_DRIVE",
+ "android.car.VehicleGear#GEAR_FIRST", "android.car.VehicleGear#GEAR_SECOND",
+ "android.car.VehicleGear#GEAR_THIRD", "android.car.VehicleGear#GEAR_FOURTH",
+ "android.car.VehicleGear#GEAR_FIFTH", "android.car.VehicleGear#GEAR_SIXTH",
+ "android.car.VehicleGear#GEAR_SEVENTH", "android.car.VehicleGear#GEAR_EIGHTH",
+ "android.car.VehicleGear#GEAR_NINTH"})
public void testMatchWithVehicleHal() {
assertThat(VehicleGear.GEAR_UNKNOWN)
.isEqualTo(android.hardware.automotive.vehicle.VehicleGear.GEAR_UNKNOWN);
@@ -78,6 +80,7 @@
}
@Test
+ @ApiTest(apis = {"android.car.VehicleGear#toString"})
public void testToString() {
assertThat(VehicleGear.toString(VehicleGear.GEAR_UNKNOWN)).isEqualTo("GEAR_UNKNOWN");
diff --git a/tests/android_car_api_test/src/android/car/apitest/VehicleIgnitionStateTest.java b/tests/android_car_api_test/src/android/car/apitest/VehicleIgnitionStateTest.java
index 1b7c8f8..24c1705 100644
--- a/tests/android_car_api_test/src/android/car/apitest/VehicleIgnitionStateTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/VehicleIgnitionStateTest.java
@@ -18,9 +18,10 @@
import static com.google.common.truth.Truth.assertThat;
-import android.car.test.ApiCheckerRule.Builder;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.compatibility.common.util.ApiTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -34,12 +35,6 @@
private final int mJavaConstantValue;
private final int mHalConstantValue;
- // TODO(b/242350638): add missing annotations, remove (on child bug of 242350638)
- @Override
- protected void configApiCheckerRule(Builder builder) {
- builder.disableAnnotationsCheck();
- }
-
public VehicleIgnitionStateTest(int javaConstantValue, int halConstantValue) {
mJavaConstantValue = javaConstantValue;
mHalConstantValue = halConstantValue;
@@ -64,6 +59,10 @@
}
@Test
+ @ApiTest(apis = {"android.car.VehicleIgnitionState#UNDEFINED",
+ "android.car.VehicleIgnitionState#LOCK", "android.car.VehicleIgnitionState#OFF",
+ "android.car.VehicleIgnitionState#ACC", "android.car.VehicleIgnitionState#ON",
+ "android.car.VehicleIgnitionState#START"})
public void testMatchWithVehicleHal() {
assertThat(mJavaConstantValue).isEqualTo(mHalConstantValue);
}
