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

New J2K: Fix after merge

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-05-08 18:11:59 +03:00
committed by Ilya Kirillov
parent 6806ef8cf6
commit 4551d3921b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+11 -3
View File
@@ -143,9 +143,7 @@ import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest
import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest
import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest
import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.*
import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest import org.jetbrains.kotlin.j2k.*
import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
import org.jetbrains.kotlin.jps.build.* import org.jetbrains.kotlin.jps.build.*
import org.jetbrains.kotlin.jps.build.dependeciestxt.actualizeMppJpsIncTestCaseDirs import org.jetbrains.kotlin.jps.build.dependeciestxt.actualizeMppJpsIncTestCaseDirs
import org.jetbrains.kotlin.jps.incremental.AbstractJsProtoComparisonTest import org.jetbrains.kotlin.jps.incremental.AbstractJsProtoComparisonTest
@@ -965,6 +963,16 @@ fun main(args: Array<String>) {
} }
} }
testGroup("j2k/tests", "j2k/testData") {
testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
model("fileOrElement", extension = "java")
}
testClass<AbstractNewJavaToKotlinConverterNewSingleFileTest> {
model("newFileOrElement", extension = "java")
}
}
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
testClass<AbstractIncrementalJpsTest> { testClass<AbstractIncrementalJpsTest> {
model("incremental/multiModule/common", extension = null, excludeParentDirs = true) model("incremental/multiModule/common", extension = null, excludeParentDirs = true)