From 9643d5d28e3e9077568c16f129f45c80df80dbdc Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 14 Nov 2019 21:06:54 +0300 Subject: [PATCH] Added import-resolve integration tests --- .../GradleMultiplatformHighlightingTest.kt | 144 +++++++++--------- .../gradle/ImportAndCheckHighlighting.kt | 39 +++++ .../multiplatformLibrary/build.gradle | 59 +++++++ .../multiplatformLibrary/gradle.properties | 1 + .../multiplatformLibrary/settings.gradle | 3 + .../src/commonMain/kotlin/sample/Sample.kt | 11 ++ .../commonTest/kotlin/sample/SampleTests.kt | 11 ++ .../src/jsMain/kotlin/sample/SampleJs.kt | 9 ++ .../src/jvmMain/kotlin/sample/SampleJvm.kt | 9 ++ .../jvmTest/kotlin/sample/SampleTestsJVM.kt | 11 ++ .../build.gradle | 59 +++++++ .../gradle.properties | 1 + .../settings.gradle | 3 + .../src/commonMain/kotlin/sample/Sample.kt | 4 + .../src/jsMain/kotlin/sample/SampleJs.kt | 5 + .../src/jvmMain/kotlin/sample/SampleJvm.kt | 6 + 16 files changed, 306 insertions(+), 69 deletions(-) create mode 100644 idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt create mode 100644 idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt index 148bb29f242..ab652b55d9b 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt @@ -40,79 +40,85 @@ class GradleMultiplatformHighlightingTest : GradleImportingTestCase() { val files = importProjectFromTestData() val project = myTestFixture.project - checkFiles(files, project) { editor -> - daemonAnalyzerTestCase.checkHighlighting(project, editor) + checkFiles(files, project, GradleDaemonAnalyzerTestCase(testLineMarkers = true, checkWarnings = true, checkInfos = false)) { file -> + file.extension == "kt" } } - private val daemonAnalyzerTestCase = object : DaemonAnalyzerTestCase() { - override fun doTestLineMarkers() = true - - fun checkHighlighting(project: Project, editor: Editor) { - myProject = project - runInEdtAndWait { - checkHighlighting(editor, /* checkWarnings = */ true, /* checkInfos = */ false) - } - } - } - - private fun checkFiles(files: List, project: Project, check: (Editor) -> Unit) { - var atLeastOneFile = false - val kotlinFiles = files.filter { it.extension == "kt" } - val content = mutableMapOf() - kotlinFiles.forEach { file -> - val (_, textWithTags) = configureEditorByExistingFile(file, project) - atLeastOneFile = true - content[file] = textWithTags - } - Assert.assertTrue(atLeastOneFile) - kotlinFiles.forEach { file -> - val (editor, _) = configureEditorByExistingFile(file, project, content[file]) - check(editor) - } - } - - private fun configureEditorByExistingFile( - virtualFile: VirtualFile, - project: Project, - contentToSet: String? = null - ): Pair { - var result: Pair? = null - runInEdtAndWait { - val editor = createEditor(virtualFile, project) - val document = editor.document - val editorInfo = EditorInfo(document.text) - val textWithTags = editorInfo.newFileText - ApplicationManager.getApplication().runWriteAction { - val newText = contentToSet ?: textWithTags.withoutTags() - if (document.text != newText) { - document.setText(newText) - } - - editorInfo.applyToEditor(editor) - } - PsiDocumentManager.getInstance(project).commitAllDocuments() - result = editor to textWithTags - } - return result!! - } - - private fun String.withoutTags(): String { - val regex = "".toRegex() - return regex.replace(this, "") - } - - private fun createEditor(file: VirtualFile, project: Project): Editor { - val instance = FileEditorManager.getInstance(this.myProject) - PsiDocumentManager.getInstance(project).commitAllDocuments() - val editor = instance.openTextEditor(OpenFileDescriptor(this.myProject, file, 0), false) - (editor as EditorImpl).setCaretActive() - PsiDocumentManager.getInstance(project).commitAllDocuments() - DaemonCodeAnalyzer.getInstance(project).restart() - return editor - } - override fun testDataDirName(): String { return "newMultiplatformHighlighting" } +} + +class GradleDaemonAnalyzerTestCase(val testLineMarkers: Boolean, val checkWarnings: Boolean, val checkInfos: Boolean) : + DaemonAnalyzerTestCase() { + override fun doTestLineMarkers() = testLineMarkers + + fun checkHighlighting(project: Project, editor: Editor) { + myProject = project + runInEdtAndWait { + checkHighlighting(editor, checkWarnings, checkInfos) + } + } +} + +internal fun checkFiles( + files: List, + project: Project, + analyzer: GradleDaemonAnalyzerTestCase, + fileFilter: (VirtualFile) -> Boolean +) { + var atLeastOneFile = false + val kotlinFiles = files.filter(fileFilter) + val content = mutableMapOf() + kotlinFiles.forEach { file -> + val (_, textWithTags) = configureEditorByExistingFile(file, project) + atLeastOneFile = true + content[file] = textWithTags + } + Assert.assertTrue(atLeastOneFile) + kotlinFiles.forEach { file -> + val (editor, _) = configureEditorByExistingFile(file, project, content[file]) + analyzer.checkHighlighting(project, editor) + } +} + +internal fun textWithoutTags(text: String): String { + val regex = "".toRegex() + return regex.replace(text, "") +} + +private fun createEditor(file: VirtualFile, project: Project): Editor { + val instance = FileEditorManager.getInstance(project) + PsiDocumentManager.getInstance(project).commitAllDocuments() + val editor = instance.openTextEditor(OpenFileDescriptor(project, file, 0), false) + (editor as EditorImpl).setCaretActive() + PsiDocumentManager.getInstance(project).commitAllDocuments() + DaemonCodeAnalyzer.getInstance(project).restart() + return editor +} + +internal fun configureEditorByExistingFile( + virtualFile: VirtualFile, + project: Project, + contentToSet: String? = null +): Pair { + var result: Pair? = null + runInEdtAndWait { + val editor = createEditor(virtualFile, project) + val document = editor.document + val editorInfo = EditorInfo(document.text) + val textWithTags = editorInfo.newFileText + ApplicationManager.getApplication().runWriteAction { + val newText = contentToSet ?: textWithoutTags(textWithTags) + if (document.text != newText) { + document.setText(newText) + } + + editorInfo.applyToEditor(editor) + } + PsiDocumentManager.getInstance(project).commitAllDocuments() + result = editor to textWithTags + } + return result!! } \ No newline at end of file diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt new file mode 100644 index 00000000000..fdcfdf2c94f --- /dev/null +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle + +import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase +import org.junit.Test +import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions + + +class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() { + + @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+") + fun testMultiplatformLibrary() { + importAndCheckHighlighting() + } + + @Test + @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+") + fun testUnresolvedInMultiplatformLibrary() { + importAndCheckHighlighting(false, false) + } + + private fun importAndCheckHighlighting(testLineMarkers: Boolean = true, checkWarnings: Boolean = true) { + val files = configureByFiles() + importProject() + val project = myTestFixture.project + checkFiles(files, project, GradleDaemonAnalyzerTestCase(testLineMarkers = testLineMarkers, checkWarnings = checkWarnings, checkInfos = false)) { file -> + file.extension == "kt" || file.extension == "java" + } + } + + override fun testDataDirName(): String { + return "importAndCheckHighlighting" + } +} diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle new file mode 100644 index 00000000000..eb69e40893d --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle @@ -0,0 +1,59 @@ +plugins { + id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}' +} +repositories { + mavenCentral() +} +group 'com.example' +version '0.0.1' + +apply plugin: 'maven-publish' + +kotlin { + jvm() + js { + browser { + } + nodejs { + } + } + + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib-common') + } + } + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + } + } + jvmMain { + dependencies { + implementation kotlin('stdlib-jdk8') + } + } + jvmTest { + dependencies { + implementation kotlin('test') + implementation kotlin('test-junit') + } + } + jsMain { + dependencies { + implementation kotlin('stdlib-js') + } + } + jsTest { + dependencies { + implementation kotlin('test-js') + } + } + mingwMain { + } + mingwTest { + } + } +} diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties new file mode 100644 index 00000000000..29e08e8ca88 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle new file mode 100644 index 00000000000..6993f68b3c7 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'mppLibrary' + +enableFeaturePreview('GRADLE_METADATA') diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt new file mode 100644 index 00000000000..b047d192f93 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt @@ -0,0 +1,11 @@ +package sample + +expect class Sample() { + fun checkMe(): Int +} + +expect object Platform { + val name: String +} + +fun hello(): String = "Hello from ${Platform.name}" \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt new file mode 100644 index 00000000000..2d298871ae8 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt @@ -0,0 +1,11 @@ +package sample + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTests { + @Test + fun testMe() { + assertTrue(Sample().checkMe() > 0) + } +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt new file mode 100644 index 00000000000..5bac311f4d4 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt @@ -0,0 +1,9 @@ +package sample + +actual class Sample { + actual fun checkMe() = 12 +} + +actual object Platform { + actual val name: String = "JS" +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt new file mode 100644 index 00000000000..14f2be23f42 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt @@ -0,0 +1,9 @@ +package sample + +actual class Sample { + actual fun checkMe() = 42 +} + +actual object Platform { + actual val name: String = "JVM" +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt new file mode 100644 index 00000000000..faa97a40242 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt @@ -0,0 +1,11 @@ +package sample + +import kotlin.test.Test +import kotlin.test.assertTrue + +class SampleTestsJVM { + @Test + fun testHello() { + assertTrue("JVM" in hello()) + } +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle new file mode 100644 index 00000000000..eb69e40893d --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle @@ -0,0 +1,59 @@ +plugins { + id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}' +} +repositories { + mavenCentral() +} +group 'com.example' +version '0.0.1' + +apply plugin: 'maven-publish' + +kotlin { + jvm() + js { + browser { + } + nodejs { + } + } + + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib-common') + } + } + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + } + } + jvmMain { + dependencies { + implementation kotlin('stdlib-jdk8') + } + } + jvmTest { + dependencies { + implementation kotlin('test') + implementation kotlin('test-junit') + } + } + jsMain { + dependencies { + implementation kotlin('stdlib-js') + } + } + jsTest { + dependencies { + implementation kotlin('test-js') + } + } + mingwMain { + } + mingwTest { + } + } +} diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties new file mode 100644 index 00000000000..29e08e8ca88 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle new file mode 100644 index 00000000000..6993f68b3c7 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'mppLibrary' + +enableFeaturePreview('GRADLE_METADATA') diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt new file mode 100644 index 00000000000..ca79b5bb60d --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt @@ -0,0 +1,4 @@ +package sample +fun common(): Boolean { + return "" +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt new file mode 100644 index 00000000000..b54d9079de7 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt @@ -0,0 +1,5 @@ +package sample + +fun js() { + println(common()) +} \ No newline at end of file diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt new file mode 100644 index 00000000000..ff0d16d6566 --- /dev/null +++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt @@ -0,0 +1,6 @@ +package sample + +fun jvm() { + println(common()) + println(js()) +} \ No newline at end of file