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

Kotlin JPS plugin: fix paths in tests

Browse Source
This commit is contained in:
Nikita Bobko
2021-12-23 22:14:23 +01:00
parent e3634c1635
commit 208e271b4e
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -820,7 +820,7 @@ tasks {
register("jps-tests") {
dependsOn("dist")
dependsOn(":jps-plugin:test")
dependsOn(":jps:jps-plugin:test")
}
register("frontendApiTests") {
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import org.jetbrains.kotlinx.atomicfu.AbstractAtomicfuJsIrTest
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
generateTestGroupSuite(args) {
testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
testGroup("compiler/incremental-compilation-impl/test", "jps/jps-plugin/testData") {
fun incrementalJvmTestData(targetBackend: TargetBackend): TestGroup.TestClass.() -> Unit = {
model("incremental/pureKotlin", extension = null, recursive = false, targetBackend = targetBackend)
model("incremental/classHierarchyAffected", extension = null, recursive = false, targetBackend = targetBackend)
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+1 -1
View File
@@ -56,7 +56,7 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
}
companion object {
val TEST_DATA_PATH = "jps-plugin/testData/"
val TEST_DATA_PATH = "jps/jps-plugin/testData/"
@JvmStatic
protected fun addKotlinStdlibDependency(modules: Collection<JpsModule>, exported: Boolean = false): JpsLibrary {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
+6 -6
View File
@@ -18,26 +18,26 @@ package org.jetbrains.kotlin.jps.build
class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() {
fun testJavaConstantChangedUsedInKotlin() {
doTest("jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/")
doTest("jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/")
}
fun testJavaConstantUnchangedUsedInKotlin() {
doTest("jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/")
doTest("jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/")
}
fun testKotlinConstantChangedUsedInJava() {
doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/")
doTest("jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/")
}
fun testKotlinJvmFieldChangedUsedInJava() {
doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/")
doTest("jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/")
}
fun testKotlinConstantUnchangedUsedInJava() {
doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/")
doTest("jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/")
}
fun testKotlinJvmFieldUnchangedUsedInJava() {
doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/")
doTest("jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/")
}
}
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.incremental.testingUtils.Modification
class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() {
fun testRenameModule() {
doTest("jps-plugin/testData/incremental/custom/renameModule/")
doTest("jps/jps-plugin/testData/incremental/custom/renameModule/")
}
override fun performAdditionalModifications(modifications: List<Modification>) {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
+2 -2
View File
@@ -22,11 +22,11 @@ import org.jetbrains.kotlin.incremental.testingUtils.Modification
class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) {
fun testProjectPathCaseChanged() {
doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/")
doTest("jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/")
}
fun testProjectPathCaseChangedMultiFile() {
doTest("jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/")
doTest("jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/")
}
override fun doTest(testDataPath: String) {
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
+1 -1
View File
@@ -28,7 +28,7 @@ import java.util.Arrays;
import java.util.Collections;
public class KotlinModuleXmlGeneratorTest extends TestCase {
private final static String testDataPath = "jps-plugin/testData/modules.xml";
private final static String testDataPath = "jps/jps-plugin/testData/modules.xml";
public void testBasic() {
String actual = new KotlinModuleXmlBuilder().addModule(