diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java index ee74da3021e..d626b0443ec 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java @@ -20,6 +20,8 @@ import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import org.jetbrains.kotlin.test.KotlinTestUtils; +import static org.jetbrains.kotlin.test.MuteWithDatabaseKt.isIgnoredInDatabaseWithLog; + /** * Please use KotlinLightCodeInsightFixtureTestCase as the base class for all new tests. */ @@ -36,4 +38,9 @@ public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase { super.tearDown(); VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); } + + @Override + protected boolean shouldRunTest() { + return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this); + } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt index 7eb02ffa737..d5412ba2ca6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.idea.framework.KotlinSdkType import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.nio.file.Path @@ -134,6 +135,10 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { UsefulTestCase.assertDoesntExist(File(JS_CONFIGURATOR.getDefaultPathToJarFile(project))) } + override fun shouldRunTest(): Boolean { + return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this) + } + companion object { private val BASE_PATH = "idea/testData/configuration/" private val TEMP_DIR_MACRO_KEY = "TEMP_TEST_DIR" diff --git a/tests/mute.csv b/tests/mute.csv index fbcee860ac9..2765c30aab8 100644 --- a/tests/mute.csv +++ b/tests/mute.csv @@ -31,12 +31,16 @@ org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.S org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919 +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinTest.testJava9WithModuleInfo, Error: "Require directive for kotlin.stdlib is expected" +org.jetbrains.kotlin.idea.configuration.GradleConfigureProjectByChangingFileTestGenerated.Gradle.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testNoCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testThreeCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testTwoDumps, Stable on windows +org.jetbrains.kotlin.idea.maven.configuration.MavenConfigureProjectByChangingFileTestGenerated.Jvm.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveFromJsModuleToJvmModule_MoveFromJsModuleToJvmModule, KT-34106 org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveFromJvmModuleToJsModule_MoveFromJvmModuleToJsModule, KT-34106 org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveJdkDependentToJsModule_MoveJdkDependentToJsModule, KT-34106 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.AnonymousClass.testKt_13146 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.Issues.testKt_807 -org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567 \ No newline at end of file +org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567 +org.jetbrains.kotlin.idea.run.RunConfigurationTest.testWithModuleForJdk9, Always red \ No newline at end of file diff --git a/tests/mute.csv.191 b/tests/mute.csv.191 index ae7226a51dc..177237ceede 100644 --- a/tests/mute.csv.191 +++ b/tests/mute.csv.191 @@ -16,12 +16,16 @@ org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigur org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureGradleKtsKotlinDevVersion[1: with Gradle-5.6.4], absent test data org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureKotlinDevVersion[1: with Gradle-5.6.4], absent test data org.jetbrains.kotlin.idea.codeInsight.gradle.GradleConfiguratorTest.testConfigureKotlinWithPluginsBlock[1: with Gradle-5.6.4], absent test data +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinTest.testJava9WithModuleInfo, Error: "Require directive for kotlin.stdlib is expected" +org.jetbrains.kotlin.idea.configuration.GradleConfigureProjectByChangingFileTestGenerated.Gradle.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testNoCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testThreeCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testTwoDumps, Stable on windows +org.jetbrains.kotlin.idea.maven.configuration.MavenConfigureProjectByChangingFileTestGenerated.Jvm.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveFromJsModuleToJvmModule_MoveFromJsModuleToJvmModule, KT-34106 org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveFromJvmModuleToJsModule_MoveFromJvmModuleToJsModule, KT-34106 org.jetbrains.kotlin.idea.refactoring.move.MultiModuleMoveTestGenerated.testMoveJdkDependentToJsModule_MoveJdkDependentToJsModule, KT-34106 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.AnonymousClass.testKt_13146 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.Issues.testKt_807 -org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567 \ No newline at end of file +org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567 +org.jetbrains.kotlin.idea.run.RunConfigurationTest.testWithModuleForJdk9, Always red \ No newline at end of file diff --git a/tests/mute.csv.193 b/tests/mute.csv.193 index 7ed289162e0..5493dc9d101 100644 --- a/tests/mute.csv.193 +++ b/tests/mute.csv.193 @@ -46,6 +46,8 @@ org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.S org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919 org.jetbrains.kotlin.idea.completion.test.KotlinSourceInJavaCompletionTestGenerated.testMultiFileFacadeMembers, KT-34689 +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinTest.testJava9WithModuleInfo, Error: "Require directive for kotlin.stdlib is expected" +org.jetbrains.kotlin.idea.configuration.GradleConfigureProjectByChangingFileTestGenerated.Gradle.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testNoCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testThreeCoroutines, Stable on windows org.jetbrains.kotlin.idea.debugger.test.CoroutineDumpTestGenerated.testTwoDumps, Stable on windows @@ -127,6 +129,7 @@ org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveB org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testIf, KT-34408 org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testNotSingleLineStatement, KT-34408 org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testWhenEntry, KT-34408 +org.jetbrains.kotlin.idea.maven.configuration.MavenConfigureProjectByChangingFileTestGenerated.Jvm.testWithJava9ModuleInfo, Probably test data should be updated org.jetbrains.kotlin.idea.navigation.KotlinGotoImplementationMultiModuleTestGenerated.testExpectClassSuperclassFun, Flaky failure org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib1.testUseJavaFromLib, KT-34542, FAIL org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib2.testUseJavaSAMFromLib, KT-34542, FAIL @@ -158,4 +161,5 @@ org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Hi org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.AnonymousClass.testKt_13146 org.jetbrains.kotlin.j2k.JavaToKotlinConverterSingleFileTestGenerated.Issues.testKt_807 org.jetbrains.kotlin.util.KotlinVersionsTest.testVersionsAreConsistent, KT-35567 -org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed \ No newline at end of file +org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed +org.jetbrains.kotlin.idea.run.RunConfigurationTest.testWithModuleForJdk9, Always red \ No newline at end of file