From ceabcf9303285fd1f95413e4aace4c3d75fa945d Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Fri, 12 Mar 2021 17:24:08 +0100 Subject: [PATCH] Mute tests to avoid primitive type annotation Relates to #KT-45417 GitOrigin-RevId: d5739e158db8d2138b77ec613d9e48e15f89c310 --- .../asJava/classes/AbstractUltraLightClassLoadingTest.kt | 5 ++--- .../jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt | 1 + .../asJava/ultraLightClasses/jvmWildcardAnnotations.kt | 1 + .../tests/testData/quickfix/addAnnotationTarget/basic1.kt | 4 ++-- .../tests/testData/quickfix/addAnnotationTarget/basic4.kt | 4 ++-- .../quickfix/addAnnotationTarget/hasAnnotationTarget1.kt | 4 ++-- .../quickfix/addAnnotationTarget/hasAnnotationTarget2.kt | 4 ++-- .../org/jetbrains/kotlin/test/InTextDirectivesUtils.java | 7 +++++++ 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt index fb050f385a86..10eb57bd2eb8 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassLoadingTest.kt @@ -7,8 +7,6 @@ package org.jetbrains.kotlin.asJava.classes import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.asJava.LightClassGenerationSupport -import org.jetbrains.kotlin.asJava.PsiClassRenderer -import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass import org.jetbrains.kotlin.idea.perf.UltraLightChecker import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkByJavaFile import org.jetbrains.kotlin.idea.perf.UltraLightChecker.checkDescriptorsLeak @@ -17,7 +15,6 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File abstract class AbstractUltraLightClassLoadingTest : KotlinLightCodeInsightFixtureTestCase() { @@ -25,6 +22,8 @@ abstract class AbstractUltraLightClassLoadingTest : KotlinLightCodeInsightFixtur open fun doTest(testDataPath: String) { val sourceText = File(testDataPath).readText() + InTextDirectivesUtils.checkIfMuted(sourceText); + withCustomCompilerOptions(sourceText, project, module) { val file = myFixture.addFileToProject(testDataPath, sourceText) as KtFile diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt index 98a2fc787f57..bdf6625e83b5 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt @@ -63,6 +63,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q @Throws(Exception::class) protected fun doTest(beforeFileName: String) { val beforeFileText = FileUtil.loadFile(File(beforeFileName)) + InTextDirectivesUtils.checkIfMuted(beforeFileText); withCustomCompilerOptions(beforeFileText, project, module) { val inspections = parseInspectionsToEnable(beforeFileName, beforeFileText).toTypedArray() try { diff --git a/plugins/kotlin/idea/tests/testData/compiler/asJava/ultraLightClasses/jvmWildcardAnnotations.kt b/plugins/kotlin/idea/tests/testData/compiler/asJava/ultraLightClasses/jvmWildcardAnnotations.kt index 5185c2dba221..4a3388efee20 100644 --- a/plugins/kotlin/idea/tests/testData/compiler/asJava/ultraLightClasses/jvmWildcardAnnotations.kt +++ b/plugins/kotlin/idea/tests/testData/compiler/asJava/ultraLightClasses/jvmWildcardAnnotations.kt @@ -1,3 +1,4 @@ +// MUTED: "Muted till 1.4.32" class Inv class Out class OutPair diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic1.kt b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic1.kt index ccabe77870f6..26746b78a839 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic1.kt @@ -1,8 +1,8 @@ +// MUTED: "Muted till 1.4.32" // "Add annotation target" "true" annotation class Foo class Test { - // TODO: [VD] temporary broken due to https://youtrack.jetbrains.com/issue/KT-45417 - fun foo(): @Foo Int = 1 + fun foo(): @Foo Int = 1 } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic4.kt b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic4.kt index 90b8ebeef8ab..a9131587166f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic4.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/basic4.kt @@ -1,10 +1,10 @@ +// MUTED: "Muted till 1.4.32" // "Add annotation target" "true" annotation class Foo @Foo class Test { - // TODO: [VD] temporary broken due to https://youtrack.jetbrains.com/issue/KT-45417 @Foo - fun foo(): @Foo Int = 1 + fun foo(): @Foo Int = 1 } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget1.kt b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget1.kt index bc9512d7490b..80e6168bdeea 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget1.kt @@ -1,9 +1,9 @@ +// MUTED: "Muted till 1.4.32" // "Add annotation target" "true" @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) annotation class Foo class Test { - // TODO: [VD] temporary broken due to https://youtrack.jetbrains.com/issue/KT-45417 - fun foo(): @Foo Int = 1 + fun foo(): @Foo Int = 1 } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget2.kt index 1c3c90f4ecea..e7ee3d8528c0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addAnnotationTarget/hasAnnotationTarget2.kt @@ -1,3 +1,4 @@ +// MUTED: "Muted till 1.4.32" // "Add annotation target" "true" @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) @@ -6,6 +7,5 @@ annotation class Foo @Foo class Test { @Foo - // TODO: [VD] temporary broken due to https://youtrack.jetbrains.com/issue/KT-45417 - fun foo(): @Foo Int = 1 + fun foo(): @Foo Int = 1 } \ No newline at end of file diff --git a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/test/InTextDirectivesUtils.java index d0e0ffe07fd4..e6ee3eb28efc 100644 --- a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/test/InTextDirectivesUtils.java +++ b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/test/InTextDirectivesUtils.java @@ -26,6 +26,7 @@ public final class InTextDirectivesUtils { private static final String DIRECTIVES_FILE_NAME = "directives.txt"; public static final String IGNORE_BACKEND_DIRECTIVE_PREFIX = "// IGNORE_BACKEND: "; + public static final String MUTED_DIRECTIVE_PREFIX = "// MUTED: "; private InTextDirectivesUtils() { } @@ -247,4 +248,10 @@ public final class InTextDirectivesUtils { public static boolean isIgnoredTarget(TargetBackend targetBackend, File file) { return isIgnoredTarget(targetBackend, file, IGNORE_BACKEND_DIRECTIVE_PREFIX); } + + public static void checkIfMuted(String fileText) { + List muted = findListWithPrefixes(fileText, MUTED_DIRECTIVE_PREFIX); + if (muted.isEmpty()) return; + throw new RuntimeException("muted:" + muted); + } }