Limit running ClasspathsTest to S+ devices. am: 3e180e3dbe am: 733bdc2247
Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1702706
Change-Id: Iaabf78a5d6be43af59343493a934ff511c51ec1b
diff --git a/tests/cts/Classpaths/Android.bp b/tests/cts/Classpaths/Android.bp
index 39f05f0..e572c08 100644
--- a/tests/cts/Classpaths/Android.bp
+++ b/tests/cts/Classpaths/Android.bp
@@ -28,6 +28,7 @@
],
static_libs: [
"compat-classpaths-testing",
+ "compatibility-host-util",
],
test_suites: [
"cts",
diff --git a/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java b/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
index 4c4447c..6130936 100644
--- a/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
+++ b/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
@@ -26,8 +26,12 @@
import static com.google.common.truth.Fact.simpleFact;
import static com.google.common.truth.Truth.assertAbout;
+import static org.junit.Assume.assumeTrue;
+
import android.compat.testing.Classpaths;
+import com.android.compatibility.common.util.ApiLevelUtil;
+import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
@@ -37,6 +41,7 @@
import com.google.common.truth.IterableSubject;
import com.google.common.truth.Ordered;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,6 +66,13 @@
"/apex/com.android.sdkext/javalib/framework-sdkextensions.jar";
private static final String SERVICES_JAR = "/system/framework/services.jar";
+ @Before
+ public void before() throws Exception {
+ ITestDevice device = getDevice();
+ assumeTrue(
+ ApiLevelUtil.isAfter(device, 30) || ApiLevelUtil.getCodename(device).equals("S"));
+ }
+
@Test
public void testBootclasspath() throws Exception {
ImmutableList<String> jars = Classpaths.getJarsOnClasspath(getDevice(), BOOTCLASSPATH);