commit 44c9f0f12db2562add7653075f99ece7e4fc1ca3
author Yu Shan <shanyu@google.com> Sat Aug 13 01:35:28 2022 +0000
committer Yu Shan <shanyu@google.com> Wed Aug 17 01:03:06 2022 +0000
tree 01d7f1b1077c82d8348217e378ee76a482851dec
parent 933edf97996ad06e0d04df287bb96dedc0c65b1f

Add version annotation to CarPerfMgrTest.

Test: android.car.cts.CarPerformanceManagerTest
Bug: 241845406
Change-Id: I2482c4abd6febcd63458146036680bcac4b19092

tests/tests/car/src/android/car/cts/CarPerformanceManagerTest.java

diff --git a/tests/tests/car/src/android/car/cts/CarPerformanceManagerTest.java b/tests/tests/car/src/android/car/cts/CarPerformanceManagerTest.java
index 7240014..b57a4c0 100644
--- a/tests/tests/car/src/android/car/cts/CarPerformanceManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarPerformanceManagerTest.java
@@ -20,8 +20,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assume.assumeTrue;
-
 import android.app.UiAutomation;
 import android.car.Car;
 import android.car.os.CarPerformanceManager;
@@ -31,6 +29,8 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.android.compatibility.common.util.ApiTest;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,15 +43,8 @@
     private CarPerformanceManager mCarPerformanceManager;
     private ThreadPolicyWithPriority mOriginalPolicyWithPriority;
 
-    private boolean isApiAndPlatformSupported() {
-        return Car.isApiAndPlatformVersionAtLeast(
-                /* requiredApiVersionMajor= */ 33, /* requiredApiVersionMinor= */ 1,
-                /* minPlatformSdkInt= */ 33) && Car.PLATFORM_VERSION_MINOR_INT >= 1;
-    }
-
     private void setThreadPriorityGotThreadPriorityVerify(ThreadPolicyWithPriority p)
             throws Exception {
-        assumeTrue("Thread management is not supported", isApiAndPlatformSupported());
         mCarPerformanceManager.setThreadPriority(p);
 
         ThreadPolicyWithPriority gotP = mCarPerformanceManager.getThreadPriority();
@@ -70,9 +63,8 @@
                 Car.CAR_PERFORMANCE_SERVICE);
         assertThat(mCarPerformanceManager).isNotNull();
 
-        if (isApiAndPlatformSupported()) {
-            mOriginalPolicyWithPriority = mCarPerformanceManager.getThreadPriority();
-        }
+        // TODO(b/242210521): Refactored CarPerformanceManagerTest to use ApiCheckerRule.
+        mOriginalPolicyWithPriority = mCarPerformanceManager.getThreadPriority();
     }
 
     @After
@@ -85,12 +77,20 @@
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityDefault() throws Exception {
         setThreadPriorityGotThreadPriorityVerify(new ThreadPolicyWithPriority(
                 ThreadPolicyWithPriority.SCHED_DEFAULT, /* priority= */ 0));
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityFIFOMinPriority() throws Exception {
         setThreadPriorityGotThreadPriorityVerify(new ThreadPolicyWithPriority(
                 ThreadPolicyWithPriority.SCHED_FIFO,
@@ -98,6 +98,10 @@
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityFIFOMaxPriority() throws Exception {
         setThreadPriorityGotThreadPriorityVerify(new ThreadPolicyWithPriority(
                 ThreadPolicyWithPriority.SCHED_FIFO,
@@ -105,6 +109,10 @@
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityRRMinPriority() throws Exception {
         setThreadPriorityGotThreadPriorityVerify(new ThreadPolicyWithPriority(
                 ThreadPolicyWithPriority.SCHED_RR,
@@ -112,6 +120,10 @@
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityRRMaxPriority() throws Exception {
         setThreadPriorityGotThreadPriorityVerify(new ThreadPolicyWithPriority(
                 ThreadPolicyWithPriority.SCHED_RR,
@@ -119,8 +131,11 @@
     }
 
     @Test
+    @ApiTest(apis = {
+            "android.car.hardware.os.CarPerformanceManager#setThreadPriority(ThreadPolicyWithPriority)",
+            "android.car.hardware.os.CarPerformanceManager#getThreadPriority"})
+    @TestApiRequirements(minPlatformVersion = TestApiRequirements.TestPlatformVersion.TIRAMISU_1)
     public void testSetThreadPriorityDefaultKeepNiceValue() throws Exception {
-        assumeTrue("Thread management is not supported", isApiAndPlatformSupported());
         int expectedNiceValue = 10;
 
         // Resume the test scheduling policy to default policy.