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

Rewritten single class tests to DSL.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-12-18 23:17:46 +04:00
parent dd5766d878
commit 9134fc8586
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+15 -22
View File
@@ -77,6 +77,7 @@ import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest
import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel
import org.jetbrains.jet.generators.tests.generator.TestClassModel
fun main(args: Array<String>) { fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true") System.setProperty("java.awt.headless", "true")
@@ -400,6 +401,10 @@ fun main(args: Array<String>) {
model("diagnosticMessage") model("diagnosticMessage")
} }
testClass(javaClass<AbstractRenameTest>()) {
model("refactoring/rename", extension = "test", singleClass = true)
}
testClass(javaClass<AbstractOutOfBlockModificationTest>()) { testClass(javaClass<AbstractOutOfBlockModificationTest>()) {
model("codeInsight/outOfBlock") model("codeInsight/outOfBlock")
} }
@@ -408,20 +413,6 @@ fun main(args: Array<String>) {
model("dataFlowValueRendering") model("dataFlowValueRendering")
} }
} }
// TODO this is the only custom test left
TestGenerator("idea/tests/",
javaClass<AbstractRenameTest>().getPackage()!!.getName()!!,
"RenameTestGenerated",
javaClass<AbstractRenameTest>(),
listOf(SingleClassTestModel(
File("idea/testData/refactoring/rename"),
Pattern.compile("^(.+)\\.test$"),
"doTest"
)),
"org.jetbrains.jet.generators.tests.TestsPackage"
).generateAndSave()
} }
private class TestGroup(val testsRoot: String, val testDataRoot: String) { private class TestGroup(val testsRoot: String, val testDataRoot: String) {
@@ -445,20 +436,22 @@ private class TestGroup(val testsRoot: String, val testDataRoot: String) {
inner class TestClass() { inner class TestClass() {
val testModels = ArrayList<SimpleTestClassModel>() val testModels = ArrayList<TestClassModel>()
fun model( fun model(
relativeRootPath: String, relativeRootPath: String,
recursive: Boolean = true, recursive: Boolean = true,
extension: String = "kt", // empty string means dir extension: String = "kt", // empty string means dir
pattern: String = "^(.+)" + (if (extension == "") "" else "\\.$extension") + "\$", pattern: String = "^(.+)" + (if (extension == "") "" else "\\.$extension") + "\$",
testMethod: String = "doTest" testMethod: String = "doTest",
singleClass: Boolean = false
) { ) {
testModels.add(SimpleTestClassModel( val rootFile = File(testDataRoot + "/" + relativeRootPath)
File(testDataRoot + "/" + relativeRootPath), val compiledPattern = Pattern.compile(pattern)
recursive, testModels.add(if (singleClass)
Pattern.compile(pattern), SingleClassTestModel(rootFile, compiledPattern, testMethod)
testMethod else
)) SimpleTestClassModel(rootFile, recursive, compiledPattern, testMethod))
} }
} }