From 77e806af78aeb40d3123c23d80bd531c3c771c30 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 3 Dec 2018 22:19:48 +0900 Subject: [PATCH] Remove Lint tests for annotation argument API check. Looks like newer Lint API checker ignores type usage in annotations, so these tests are no more needed. GitOrigin-RevId: 299c40728c935fabdf1dd75521db296355f741cc --- .../lintQuickfix/requiresApi/annotation.kt | 12 ------------ .../lintQuickfix/requiresApi/annotation.kt.173 | 12 ------------ .../lintQuickfix/requiresApi/annotation.kt.as31 | 12 ------------ .../requiresApi/annotation.kt.expected | 15 --------------- .../requiresApi/annotation.kt.expected.173 | 15 --------------- .../requiresApi/annotation.kt.expected.as31 | 15 --------------- .../android/lintQuickfix/targetApi/annotation.kt | 11 ----------- .../lintQuickfix/targetApi/annotation.kt.173 | 11 ----------- .../lintQuickfix/targetApi/annotation.kt.as31 | 11 ----------- .../lintQuickfix/targetApi/annotation.kt.expected | 14 -------------- .../targetApi/annotation.kt.expected.173 | 14 -------------- .../targetApi/annotation.kt.expected.as31 | 14 -------------- 12 files changed, 156 deletions(-) delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.173 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.as31 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.173 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.as31 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.173 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.as31 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.173 delete mode 100644 plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.as31 diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt deleted file mode 100644 index 19b6ba7d86ab..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt +++ /dev/null @@ -1,12 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.173 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.173 deleted file mode 100644 index dbf09a01c097..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.173 +++ /dev/null @@ -1,12 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.as31 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.as31 deleted file mode 100644 index 19b6ba7d86ab..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.as31 +++ /dev/null @@ -1,12 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected deleted file mode 100644 index dbc848be75d0..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected +++ /dev/null @@ -1,15 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import android.os.Build -import android.support.annotation.RequiresApi -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.173 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.173 deleted file mode 100644 index 2db4b45bc3fb..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.173 +++ /dev/null @@ -1,15 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import android.os.Build -import android.support.annotation.RequiresApi -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.as31 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.as31 deleted file mode 100644 index dbc848be75d0..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.as31 +++ /dev/null @@ -1,15 +0,0 @@ -// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection -// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java - -import android.graphics.drawable.VectorDrawable -import android.os.Build -import android.support.annotation.RequiresApi -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt deleted file mode 100644 index e9431202f81a..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt +++ /dev/null @@ -1,11 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.173 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.173 deleted file mode 100644 index f9f055359d70..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.173 +++ /dev/null @@ -1,11 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.as31 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.as31 deleted file mode 100644 index e9431202f81a..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.as31 +++ /dev/null @@ -1,11 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection - -import android.graphics.drawable.VectorDrawable -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected deleted file mode 100644 index 0a51e1215004..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected +++ /dev/null @@ -1,14 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection - -import android.annotation.TargetApi -import android.graphics.drawable.VectorDrawable -import android.os.Build -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@TargetApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.173 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.173 deleted file mode 100644 index 738d2a571d1b..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.173 +++ /dev/null @@ -1,14 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection - -import android.annotation.TargetApi -import android.graphics.drawable.VectorDrawable -import android.os.Build -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@TargetApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.as31 b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.as31 deleted file mode 100644 index 0a51e1215004..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected.as31 +++ /dev/null @@ -1,14 +0,0 @@ -// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation -// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection - -import android.annotation.TargetApi -import android.graphics.drawable.VectorDrawable -import android.os.Build -import kotlin.reflect.KClass - -annotation class SomeAnnotationWithClass(val cls: KClass<*>) - -@TargetApi(Build.VERSION_CODES.LOLLIPOP) -@SomeAnnotationWithClass(VectorDrawable::class) -class VectorDrawableProvider { -} \ No newline at end of file