diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-09 02:20:54 +0000 |
---|---|---|
committer | Remi NGUYEN VAN <reminv@google.com> | 2020-03-09 06:59:02 +0000 |
commit | 046a14ee618731ad5ef8c6b6c79bf0d84ab00fa6 (patch) | |
tree | a015b79953347fe7a309bc98be1f64062cd2805a | |
parent | 2eb7b002201fa116291f69da3dc16d47c234efc4 (diff) |
Add an annotation for ignoring tests by dev SDK
Contrary to androidx.test.filters.SdkSuppress, this annotation
considers the SDK to be higher than the Build.VERSION.SDK_INT reported
by the device when the device is not using a release SDK. For example,
an aosp/master build based on SDK 29 is considered to have a development
SDK that is strictly higher than 29.
Test: atest CtsNetTestCasesLatestSdk:android.net.CaptivePortalTest using
the change on a Q build and an AOSP build.
Bug: 150918852
Merged-In: Ibaea05565bd8a362e829cdd1e5420aa2881b0889
(cherry picked from commit f30540f24e1713fe2d29f2e313b7522b4e7de089)
Change-Id: I57f95d4673031a1ff58218bf4c79bb26b7eaa16d
-rw-r--r-- | tests/lib/src/com/android/testutils/DevSdkIgnoreRule.kt | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/tests/lib/src/com/android/testutils/DevSdkIgnoreRule.kt b/tests/lib/src/com/android/testutils/DevSdkIgnoreRule.kt new file mode 100644 index 0000000..fd7deb6 --- /dev/null +++ b/tests/lib/src/com/android/testutils/DevSdkIgnoreRule.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.testutils + +import android.os.Build +import org.junit.Assume.assumeTrue +import org.junit.rules.TestRule +import org.junit.runner.Description +import org.junit.runners.model.Statement + +/** + * A test rule to ignore tests based on the development SDK level. + * + * If the device is not using a release SDK, the development SDK is considered to be higher than + * [Build.VERSION.SDK_INT]. + */ +class DevSdkIgnoreRule : TestRule { + override fun apply(base: Statement, description: Description): Statement { + return IgnoreBySdkStatement(base, description) + } + + /** + * Ignore the test for any development SDK that is strictly after [value]. + * + * If the device is not using a release SDK, the development SDK is considered to be higher + * than [Build.VERSION.SDK_INT]. + */ + annotation class IgnoreAfter(val value: Int) + + /** + * Ignore the test for any development SDK that lower than or equal to [value]. + * + * If the device is not using a release SDK, the development SDK is considered to be higher + * than [Build.VERSION.SDK_INT]. + */ + annotation class IgnoreUpTo(val value: Int) + + private class IgnoreBySdkStatement( + private val base: Statement, + private val description: Description + ) : Statement() { + override fun evaluate() { + val ignoreAfter = description.getAnnotation(IgnoreAfter::class.java) + val ignoreUpTo = description.getAnnotation(IgnoreUpTo::class.java) + + // In-development API n+1 will have SDK_INT == n and CODENAME != REL. + // Stable API n has SDK_INT == n and CODENAME == REL. + val release = "REL" == Build.VERSION.CODENAME + val sdkInt = Build.VERSION.SDK_INT + val devApiLevel = sdkInt + if (release) 0 else 1 + val message = "Skipping test for ${if (!release) "non-" else ""}release SDK $sdkInt" + assumeTrue(message, ignoreAfter == null || devApiLevel <= ignoreAfter.value) + assumeTrue(message, ignoreUpTo == null || devApiLevel > ignoreUpTo.value) + base.evaluate() + } + } +}
\ No newline at end of file |