diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-17 12:04:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-17 12:04:35 +0000 |
| commit | ee2a5da1ec790dcabb990fc976b8484ac4a4b97f (patch) | |
| tree | d497b9e1845b9d77817add414577d962e66d065b | |
| parent | f888f54b0b4ecd8a5e0ccc1888bad4385a8ca7a9 (diff) | |
| parent | b4a0f681f44ce0e9cba3824795f6e6aa9bf256a9 (diff) | |
| download | platform_packages_modules_SdkExtensions-ee2a5da1ec790dcabb990fc976b8484ac4a4b97f.tar.gz platform_packages_modules_SdkExtensions-ee2a5da1ec790dcabb990fc976b8484ac4a4b97f.tar.bz2 platform_packages_modules_SdkExtensions-ee2a5da1ec790dcabb990fc976b8484ac4a4b97f.zip | |
Merge "Use DeviceSdkLevel.isAtLeastS() in ClasspathsTest." am: 2ebdcd70e9 am: b4a0f681f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1737096
Change-Id: Ia2b9d128b040a3b9946a1be1efe634b8efa78f5b
| -rw-r--r-- | tests/cts/Classpaths/Android.bp | 2 | ||||
| -rw-r--r-- | tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/cts/Classpaths/Android.bp b/tests/cts/Classpaths/Android.bp index 60d31ef..235279a 100644 --- a/tests/cts/Classpaths/Android.bp +++ b/tests/cts/Classpaths/Android.bp @@ -28,7 +28,7 @@ java_test_host { ], static_libs: [ "compat-classpaths-testing", - "compatibility-host-util", + "modules-utils-build-testing", ], 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 03cf632..c0782e2 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 @@ -30,15 +30,12 @@ import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assume.assumeTrue; -import android.compat.testing.Classpaths; - -import com.android.compatibility.common.util.ApiLevelUtil; +import com.android.modules.utils.build.testing.DeviceSdkLevel; import com.android.tradefed.device.ITestDevice; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; import com.google.common.collect.ImmutableList; -import com.google.common.collect.UnmodifiableListIterator; import com.google.common.truth.Fact; import com.google.common.truth.FailureMetadata; import com.google.common.truth.IterableSubject; @@ -72,8 +69,8 @@ public class ClasspathsTest extends BaseHostJUnit4Test { @Before public void before() throws Exception { ITestDevice device = getDevice(); - assumeTrue( - ApiLevelUtil.isAfter(device, 30) || ApiLevelUtil.getCodename(device).equals("S")); + DeviceSdkLevel deviceSdkLevel = new DeviceSdkLevel(device); + assumeTrue(deviceSdkLevel.isDeviceAtLeastS()); } @Test |