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

Ensure jps caches are always cleared in tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-10-19 21:28:28 +03:00
parent 72fdb77628
commit ea93ec3eec
7 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/plugins-tests/plugins-tests.iml
+1
View File
@@ -35,5 +35,6 @@
<orderEntry type="library" scope="TEST" name="junit-plugin" level="project" />
<orderEntry type="module" module-name="annotation-processing" scope="TEST" />
<orderEntry type="module" module-name="build-common" scope="TEST" />
<orderEntry type="module" module-name="jps-tests" scope="TEST" />
</component>
</module>
plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
+2 -7
View File
@@ -17,24 +17,19 @@
package org.jetbrains.kotlin.jps.build.android
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jps.builders.JpsBuildTestCase
import org.jetbrains.jps.android.model.JpsAndroidSdkProperties
import org.jetbrains.jps.model.JpsSimpleElement
import org.jetbrains.jps.model.library.sdk.JpsSdk
import org.jetbrains.jps.android.model.JpsAndroidSdkType
import org.jetbrains.jps.model.impl.JpsSimpleElementImpl
import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.kotlin.jps.build.BaseKotlinJpsBuildTestCase
import java.io.File
abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() {
abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
private val SDK_NAME = "Android API 23 Platform"
override fun setUp() {
super.setUp()
System.setProperty("kotlin.jps.tests", "true")
}
fun doTest(path: String) {
addJdkAndAndroidSdk()
loadProject(path + getTestName(true) + ".ipr")