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

Fix JS tests in AbstractConfigureKotlinTest

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-07-13 12:26:01 +02:00
parent 2c2b64d44a
commit 6baa8614e6
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/configuration/jsLibraryVersion106/projectFile.ipr
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="libraryTable">
<library name="KotlinJavaRuntime (2)">
<library name="KotlinJavaRuntime (2)" type="kotlin.js">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../jsRuntime106/kotlin-jslib.jar!/" />
</CLASSES>
idea/testData/configuration/jsLibraryVersion11/projectFile.ipr
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="libraryTable">
<library name="KotlinJavaRuntime (2)">
<library name="KotlinJavaRuntime (2)" type="kotlin.js">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../jsRuntime11Maven/kotlin-stdlib-js-1.1.0.jar!/" />
</CLASSES>
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
+19 -18
View File
@@ -126,14 +126,15 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
companion object {
private val BASE_PATH = "idea/testData/configuration/"
private val TEMP_DIR_MACRO_KEY = "TEMP_TEST_DIR"
protected val JAVA_CONFIGURATOR: KotlinJavaModuleConfigurator = object : KotlinJavaModuleConfigurator() {
override fun getDefaultPathToJarFile(project: Project): String {
return getPathRelativeToTemp("default_jvm_lib")
protected val JAVA_CONFIGURATOR: KotlinJavaModuleConfigurator by lazy {
object : KotlinJavaModuleConfigurator() {
override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_jvm_lib")
}
}
protected val JS_CONFIGURATOR: KotlinJsModuleConfigurator = object : KotlinJsModuleConfigurator() {
override fun getDefaultPathToJarFile(project: Project): String {
return getPathRelativeToTemp("default_js_lib")
protected val JS_CONFIGURATOR: KotlinJsModuleConfigurator by lazy {
object : KotlinJsModuleConfigurator() {
override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_js_lib")
}
}
@@ -187,24 +188,24 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
}
private val pathToNonexistentRuntimeJar: String
get() {
val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.KOTLIN_JAVA_RUNTIME_JAR
PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
return pathToTempKotlinRuntimeJar
}
get() {
val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.KOTLIN_JAVA_RUNTIME_JAR
PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
return pathToTempKotlinRuntimeJar
}
private val pathToNonexistentJsJar: String
get() {
val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME
PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
return pathToTempKotlinRuntimeJar
}
get() {
val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME
PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
return pathToTempKotlinRuntimeJar
}
private val pathToExistentRuntimeJar: String
get() = PathUtil.getKotlinPathsForDistDirectory().stdlibPath.parent
get() = PathUtil.getKotlinPathsForDistDirectory().stdlibPath.parent
private val pathToExistentJsJar: String
get() = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.parent
get() = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.parent
protected fun assertNotConfigured(module: Module, configurator: KotlinWithLibraryConfigurator) {
TestCase.assertFalse(