From 1622c547650c29604c0ad95aa13fddce24bca7d6 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Thu, 9 Dec 2021 20:02:20 +0700 Subject: [PATCH] [kotlin] tests: GradleMppRunConfigurationProducersTest: remove extra classes Each test uses one project, so gradle caches it GitOrigin-RevId: 85c1cc60d8e7f9301e58252dccb7846576cfd1fd --- ...adleMppJvmRunConfigurationProducersTest.kt | 116 ++++----- ...leMppNoJvmRunConfigurationProducersTest.kt | 227 ++++++++---------- 2 files changed, 155 insertions(+), 188 deletions(-) diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt index 8bd3fb92e169..848ec9a9137c 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppJvmRunConfigurationProducersTest.kt @@ -21,83 +21,70 @@ import org.junit.Test /** * See paired [GradleMppNoJvmRunConfigurationProducersTest] */ -abstract class GradleMppJvmRunConfigurationProducersTest : GradleTestRunConfigurationProducerTestCase() { - - protected lateinit var projectData: ProjectData - +class GradleMppJvmRunConfigurationProducersTest : GradleTestRunConfigurationProducerTestCase() { + private lateinit var projectData: ProjectData override fun setUp() { super.setUp() projectData = generateAndImportMppProject() } - class AllTestsInJvmClass : GradleMppJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJvmClass() { - assertConfigurationFromContext( - """:cleanJvmTest :jvmTest --tests "org.jetbrains.JvmTests"""", - runReadActionAndWait { - val psiClass = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element - psiClass - } - ) - } + @Test + fun allTestsInJvmClass() { + assertConfigurationFromContext( + """:cleanJvmTest :jvmTest --tests "org.jetbrains.JvmTests"""", + runReadActionAndWait { + val psiClass = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element + psiClass + } + ) } - class TestForJvmMethod : GradleMppJvmRunConfigurationProducersTest() { - @Test - fun testForJvmMethod() { - assertConfigurationFromContext( - """:cleanJvmTest :jvmTest --tests "org.jetbrains.JvmTests.jvmTest"""", - runReadActionAndWait { - val psiMethod = projectData["project.jvmTest"]["org.jetbrains.JvmTests"]["jvmTest"].element - psiMethod - } - ) - } - + @Test + fun testForJvmMethod() { + assertConfigurationFromContext( + """:cleanJvmTest :jvmTest --tests "org.jetbrains.JvmTests.jvmTest"""", + runReadActionAndWait { + val psiMethod = projectData["project.jvmTest"]["org.jetbrains.JvmTests"]["jvmTest"].element + psiMethod + } + ) } - class AllTestsInJvmPackage : GradleMppJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJvmPackage() { - assertConfigurationFromContext( - """:cleanJvmTest :jvmTest --tests "org.jetbrains.*"""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory - jetBrainsDir - } - ) - } + @Test + fun allTestsInJvmPackage() { + assertConfigurationFromContext( + """:cleanJvmTest :jvmTest --tests "org.jetbrains.*"""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory + jetBrainsDir + } + ) } - class AllTestsInJvmDirectory : GradleMppJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJvmDirectory() { - assertConfigurationFromContext( - """:cleanJvmTest :jvmTest""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! - kotlinDir - } - ) - } + @Test + fun allTestsInJvmDirectory() { + assertConfigurationFromContext( + """:cleanJvmTest :jvmTest""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! + kotlinDir + } + ) } - class AllTestsInJvmModule : GradleMppJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJvmModule() { - assertConfigurationFromContext( - """:cleanJvmTest :jvmTest""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory - val moduleDirectory = kotlinDir?.parentDirectory - moduleDirectory!! - } - ) - } + @Test + fun allTestsInJvmModule() { + assertConfigurationFromContext( + """:cleanJvmTest :jvmTest""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jvmTest"]["org.jetbrains.JvmTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory + val moduleDirectory = kotlinDir?.parentDirectory + moduleDirectory!! + } + ) } override fun extractClassData(file: VirtualFile) = runReadActionAndWait { @@ -130,7 +117,8 @@ abstract class GradleMppJvmRunConfigurationProducersTest : GradleTestRunConfigur createProjectSubFile("build.gradle", buildscript { withPlugin("org.jetbrains.kotlin.multiplatform", TestedKotlinGradlePluginVersions.ALL_PUBLIC.last().toString()) withPrefix { - code(""" + code( + """ repositories { ${listRepositories(false, gradleVersion.version)} } diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt index 2e17b35065d6..91a0a199b726 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMppNoJvmRunConfigurationProducersTest.kt @@ -26,9 +26,8 @@ import org.junit.Test * If a project has no jvm target (as here) and other-ones producers mistakenly delegate to gradle plugin tests are not available. */ -abstract class GradleMppNoJvmRunConfigurationProducersTest : GradleTestRunConfigurationProducerTestCase() { - - protected lateinit var projectData: ProjectData +class GradleMppNoJvmRunConfigurationProducersTest : GradleTestRunConfigurationProducerTestCase() { + private lateinit var projectData: ProjectData override fun setUp() { super.setUp() @@ -37,152 +36,131 @@ abstract class GradleMppNoJvmRunConfigurationProducersTest : GradleTestRunConfig //// ALL IN CLASS ///// - class AllTestsInJsClass9 : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJsClass() { - assertConfigurationFromContext( - """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.JsTests"""", - runReadActionAndWait { - val psiClass = projectData["project.jsTest"]["org.jetbrains.JsTests"].element - psiClass - } - ) - } + @Test + fun allTestsInJsClass() { + assertConfigurationFromContext( + """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.JsTests"""", + runReadActionAndWait { + val psiClass = projectData["project.jsTest"]["org.jetbrains.JsTests"].element + psiClass + } + ) } - class AllTestsInNativeClass : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInNativeClass() { - assertConfigurationFromContext( - """:cleanNativeTest :nativeTest --tests "org.jetbrains.NativeTests"""", - runReadActionAndWait { - val psiClass = projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element - psiClass - } - ) - } + @Test + fun allTestsInNativeClass() { + assertConfigurationFromContext( + """:cleanNativeTest :nativeTest --tests "org.jetbrains.NativeTests"""", + runReadActionAndWait { + val psiClass = projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element + psiClass + } + ) } //// METHOD ///// - class TestForJsMethod : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun testForJsMethod() { - assertConfigurationFromContext( - """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.JsTests.jsTest"""", - runReadActionAndWait { - val psiMethod = projectData["project.jsTest"]["org.jetbrains.JsTests"]["jsTest"].element - psiMethod - } - ) - } + @Test + fun testForJsMethod() { + assertConfigurationFromContext( + """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.JsTests.jsTest"""", + runReadActionAndWait { + val psiMethod = projectData["project.jsTest"]["org.jetbrains.JsTests"]["jsTest"].element + psiMethod + } + ) } - class TestForNativeMethod : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun testForNativeMethod() { - assertConfigurationFromContext( - """:cleanNativeTest :nativeTest --tests "org.jetbrains.NativeTests.nativeTest"""", - runReadActionAndWait { - val psiMethod = projectData["project.nativeTest"]["org.jetbrains.NativeTests"]["nativeTest"].element - psiMethod - } - ) - } - + @Test + fun testForNativeMethod() { + assertConfigurationFromContext( + """:cleanNativeTest :nativeTest --tests "org.jetbrains.NativeTests.nativeTest"""", + runReadActionAndWait { + val psiMethod = projectData["project.nativeTest"]["org.jetbrains.NativeTests"]["nativeTest"].element + psiMethod + } + ) } //// ALL IN PACKAGE ///// - class AllTestsInJsPackage : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJsPackage() { - assertConfigurationFromContext( - """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.*"""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory - jetBrainsDir - } - ) - } + @Test + fun allTestsInJsPackage() { + assertConfigurationFromContext( + """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest --tests "org.jetbrains.*"""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory + jetBrainsDir + } + ) } - class AllTestsInNativePackage : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInNativePackage() { - assertConfigurationFromContext( - """:cleanNativeTest :nativeTest --tests "org.jetbrains.*"""", - runReadActionAndWait { - val jetBrainsDir = - projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory - jetBrainsDir - } - ) - } + @Test + fun allTestsInNativePackage() { + assertConfigurationFromContext( + """:cleanNativeTest :nativeTest --tests "org.jetbrains.*"""", + runReadActionAndWait { + val jetBrainsDir = + projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory + jetBrainsDir + } + ) } //// ALL IN DIRECTORY ///// - class AllTestsInJsDirectory : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJsDirectory() { - assertConfigurationFromContext( - """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! - kotlinDir - } - ) - } + @Test + fun allTestsInJsDirectory() { + assertConfigurationFromContext( + """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! + kotlinDir + } + ) } - class AllTestsInNativeDirectory : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInNativeDirectory() { - assertConfigurationFromContext( - """:cleanNativeTest :nativeTest""", - runReadActionAndWait { - val jetBrainsDir = - projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! - kotlinDir - } - ) - } + @Test + fun allTestsInNativeDirectory() { + assertConfigurationFromContext( + """:cleanNativeTest :nativeTest""", + runReadActionAndWait { + val jetBrainsDir = + projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory!! + kotlinDir + } + ) } //// ALL IN MODULE ///// - class AllTestsInJsModule : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInJsModule() { - assertConfigurationFromContext( - """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest""", - runReadActionAndWait { - val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory - val moduleDirectory = kotlinDir?.parentDirectory - moduleDirectory!! - } - ) - } + @Test + fun allTestsInJsModule() { + assertConfigurationFromContext( + """:cleanJsLegacyBrowserTest :jsLegacyBrowserTest""", + runReadActionAndWait { + val jetBrainsDir = projectData["project.jsTest"]["org.jetbrains.JsTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory + val moduleDirectory = kotlinDir?.parentDirectory + moduleDirectory!! + } + ) } - class AllTestsInNativeModule : GradleMppNoJvmRunConfigurationProducersTest() { - @Test - fun allTestsInNativeModule() { - assertConfigurationFromContext( - """:cleanNativeTest :nativeTest""", - runReadActionAndWait { - val jetBrainsDir = - projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory - val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory - val moduleDirectory = kotlinDir?.parentDirectory - moduleDirectory!! - } - ) - } + @Test + fun allTestsInNativeModule() { + assertConfigurationFromContext( + """:cleanNativeTest :nativeTest""", + runReadActionAndWait { + val jetBrainsDir = + projectData["project.nativeTest"]["org.jetbrains.NativeTests"].element.containingFile.containingDirectory + val kotlinDir = jetBrainsDir.parentDirectory?.parentDirectory + val moduleDirectory = kotlinDir?.parentDirectory + moduleDirectory!! + } + ) } override fun extractClassData(file: VirtualFile) = runReadActionAndWait { @@ -229,7 +207,8 @@ abstract class GradleMppNoJvmRunConfigurationProducersTest : GradleTestRunConfig createProjectSubFile("build.gradle", buildscript { withPlugin("org.jetbrains.kotlin.multiplatform", TestedKotlinGradlePluginVersions.ALL_PUBLIC.last().toString()) withPrefix { - code(""" + code( + """ repositories { ${listRepositories(false, gradleVersion.version)} }