azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPP wizard tests: enable Groovy extension, don't wait for daemon death

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-10-17 16:31:24 +03:00
parent 02e6fb348d
commit 94d87bfb67
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
+6 -3
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.externalSystem.settings.ExternalProjectSettings
import com.intellij.openapi.externalSystem.settings.ExternalSystemSettingsListenerAdapter import com.intellij.openapi.externalSystem.settings.ExternalSystemSettingsListenerAdapter
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
import com.intellij.openapi.fileTypes.FileTypeManager
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.ProjectJdkTable
@@ -52,6 +53,7 @@ import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
import org.jetbrains.plugins.gradle.settings.GradleProjectSettings import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
import org.jetbrains.plugins.gradle.settings.GradleSettings import org.jetbrains.plugins.gradle.settings.GradleSettings
import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleConstants
`import org.jetbrains.plugins.groovy.GroovyFileType
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.util.* import java.util.*
@@ -83,6 +85,7 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
metadataInside: Boolean = false, metadataInside: Boolean = false,
performImport: Boolean = true performImport: Boolean = true
) { ) {
// TODO: check whether it's necessary to have templates in sources
// Temporary workaround for duplicated bundled template // Temporary workaround for duplicated bundled template
class PrintingFactory : Logger.Factory { class PrintingFactory : Logger.Factory {
override fun getLoggerInstance(category: String): Logger { override fun getLoggerInstance(category: String): Logger {
@@ -233,12 +236,10 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
val settings = GradleExecutionSettings(null, null, DistributionType.DEFAULT_WRAPPED, false) val settings = GradleExecutionSettings(null, null, DistributionType.DEFAULT_WRAPPED, false)
println("Running project tests: ${testClassNames.toList()}") println("Running project tests: ${testClassNames.toList()}")
GradleExecutionHelper().execute(project.basePath!!, settings) { GradleExecutionHelper().execute(project.basePath!!, settings) {
// TODO: --no-daemon should be here, unfortunately it does not work for TestLauncher
val testLauncher = it.newTestLauncher() val testLauncher = it.newTestLauncher()
testLauncher.withJvmTestClasses(*testClassNames).run() testLauncher.withJvmTestClasses(*testClassNames).run()
} }
println("Waiting for daemon death...")
Thread.sleep(30000L)
println("Trying to clean everything...")
} }
override fun setUp() { override fun setUp() {
@@ -250,6 +251,8 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase<Abs
println("ProjectWizardTestCase.configureJdk:") println("ProjectWizardTestCase.configureJdk:")
println(Arrays.asList(*ProjectJdkTable.getInstance().allJdks)) println(Arrays.asList(*ProjectJdkTable.getInstance().allJdks))
FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle")
} }
} }