Run J2KConverter tests in webDemo mode

This commit is contained in:
Natalia Ukhorskaya
2014-10-21 10:43:28 +04:00
parent 9e19546ba8
commit 40bb8968cc
4 changed files with 3930 additions and 3 deletions
@@ -127,6 +127,7 @@ import org.jetbrains.jet.generators.tests.reservedWords.generateTestDataForReser
import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest
import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest
import org.jetbrains.k2js.test.semantics.AbstractBridgeTest
import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterForWebDemoTest
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
@@ -632,6 +633,12 @@ fun main(args: Array<String>) {
}
}
testGroup("j2k/tests/test", "j2k/tests/testData") {
testClass(javaClass<AbstractJavaToKotlinConverterForWebDemoTest>()) {
model("ast", extension = "java")
}
}
testGroup("jps-plugin/test", "jps-plugin/testData") {
testClass(javaClass<AbstractIncrementalJpsTest>()) {
model("incremental/circularDependency", extension = null, excludeParentDirs = true)
@@ -30,7 +30,7 @@ import com.intellij.codeInsight.NullableNotNullManager
import com.intellij.psi.PsiModifierListOwner
public object JavaToKotlinTranslator {
private val DISPOSABLE = Disposer.newDisposable()
val DISPOSABLE = Disposer.newDisposable()
private fun createFile(text: String): PsiFile? {
val javaCoreEnvironment: JavaCoreProjectEnvironment? = setUpJavaCoreEnvironment()
@@ -32,11 +32,12 @@ import org.jetbrains.jet.test.util.trimIndent
import org.jetbrains.jet.j2k.FilesConversionScope
import org.jetbrains.jet.plugin.j2k.J2kPostProcessor
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiFile
import org.jetbrains.jet.j2k.ReferenceSearcherImpl
import junit.framework.TestCase
import com.intellij.openapi.util.Disposer
import org.jetbrains.jet.j2k.translateToKotlin
public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() {
val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
@@ -168,4 +169,17 @@ public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixt
private fun createJavaFile(text: String): PsiJavaFile {
return myFixture.configureByText("converterTestFile.java", text) as PsiJavaFile
}
}
public abstract class AbstractJavaToKotlinConverterForWebDemoTest() : TestCase() {
public fun doTest(javaPath: String) {
try {
val fileContents = FileUtil.loadFile(File(javaPath), true)
translateToKotlin(fileContents)
}
finally {
Disposer.dispose(JavaToKotlinTranslator.DISPOSABLE)
}
}
}