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

[CHERRY PICKED FROM IJ] pull up addJdk from AbstractKotlinJpsBuildTestCase to BaseKotlinJpsBuildTestCase to fix tests

Browse Source 
GitOrigin-RevId: fd76500448ab232b34b5aef3cfa51b75be91803b
Original commit: https://github.com/JetBrains/intellij-community/commit/ad2f48e57191253bcde4b100a4536dbbed990ff1
This commit is contained in:
Dmitry Gridin
2020-09-07 21:55:19 +07:00
committed by Nikita Bobko
parent 58bc5b80a1
commit ba9bcee24d
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
-11
View File
@@ -16,15 +16,12 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.model.JpsDummyElement
import org.jetbrains.jps.model.JpsModuleRootModificationUtil
import org.jetbrains.jps.model.JpsProject
import org.jetbrains.jps.model.java.JpsJavaDependencyScope
import org.jetbrains.jps.model.java.JpsJavaLibraryType
import org.jetbrains.jps.model.java.JpsJavaSdkType
import org.jetbrains.jps.model.library.JpsLibrary
import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.jps.model.library.sdk.JpsSdk
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.util.JpsPathUtil
import java.io.File
@@ -38,14 +35,6 @@ abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
return workDir
}
override fun addJdk(name: String, path: String?): JpsSdk<JpsDummyElement> {
val homePath = System.getProperty("java.home")
val versionString = System.getProperty("java.version")
val jdk = myModel.global.addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE)
jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED)
return jdk.properties
}
protected fun addKotlinMockRuntimeDependency(): JpsLibrary {
return addDependency(KotlinJpsLibrary.MockRuntime)
}
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
+15
View File
@@ -16,9 +16,16 @@
package org.jetbrains.kotlin.jps.build
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.util.ThrowableRunnable
import com.intellij.util.io.URLUtil
import org.jetbrains.jps.builders.JpsBuildTestCase
import org.jetbrains.jps.model.JpsDummyElement
import org.jetbrains.jps.model.java.JpsJavaSdkType
import org.jetbrains.jps.model.library.JpsLibrary
import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.jps.model.library.sdk.JpsSdk
import org.jetbrains.jps.util.JpsPathUtil
import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
import org.jetbrains.kotlin.test.runTest
@@ -43,6 +50,14 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() {
)
}
override fun addJdk(name: String, path: String?): JpsSdk<JpsDummyElement> {
val homePath = System.getProperty("java.home")
val versionString = System.getProperty("java.version")
val jdk = myModel.global.addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE)
jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED)
return jdk.properties
}
private val libraries = mutableMapOf<String, JpsLibrary>()
protected fun requireLibrary(library: KotlinJpsLibrary) = libraries.getOrPut(library.id) {