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

Move Android-related tests to the separate testGroup

Browse Source
This commit is contained in:
Yan Zhulanow
2014-11-06 15:23:08 +03:00
parent fa62d3bcec
commit 1b355004d5
2 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/generators.iml
+3 -1
View File
@@ -25,5 +25,7 @@
<orderEntry type="module" module-name="js.frontend" scope="TEST" />
<orderEntry type="module" module-name="util" scope="TEST" />
<orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
</component>
</module>
</module>
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+41 -34
View File
@@ -322,20 +322,6 @@ fun main(args: Array<String>) {
testClass(javaClass<AbstractLocalClassProtoTest>()) {
model("serialization/local")
}
testClass(javaClass<AbstractAndroidXml2KConversionTest>()) {
model("android/converter/simple", recursive = false, extension = null)
model("android/converter/exceptions", recursive = false, extension = null, testMethod = "doNoManifestTest")
}
testClass(javaClass<AbstractAndroidBoxTest>()) {
model("codegen/android", recursive = false, extension = null, testMethod = "doCompileAgainstAndroidSdkTest")
model("codegen/android", recursive = false, extension = null, testMethod = "doFakeInvocationTest", testClassName = "Invoke")
}
testClass(javaClass<AbstractAndroidBytecodePersistenceTest>()) {
model("codegen/androidPersistence", recursive = false, extension = null)
}
}
testGroup("idea/tests", "idea/testData") {
@@ -708,11 +694,8 @@ fun main(args: Array<String>) {
testClass(javaClass<AbstractReferenceResolveTest>(), "org.jetbrains.kotlin.idea.kdoc.KdocResolveTestGenerated") {
model("kdoc/resolve")
testClass(javaClass<AbstractCrossParserTest>()) {
model("android/crossParser", recursive = false, extension = null)
}
testClass(javaClass<AbstractKDocHighlightingTest>()) {
model("kdoc/highlighting")
}
@@ -720,22 +703,6 @@ fun main(args: Array<String>) {
testClass<AbstractJvmBasicCompletionTest>("org.jetbrains.kotlin.idea.kdoc.KDocCompletionTestGenerated") {
model("kdoc/completion")
}
testClass(javaClass<AbstractAndroidCompletionTest>()) {
model("android/completion", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidGotoTest>()) {
model("android/goto", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidRenameTest>()) {
model("android/rename", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidFindUsagesTest>()) {
model("android/findUsages", recursive = false, extension = null)
}
}
testGroup("idea/tests", "compiler/testData") {
@@ -766,7 +733,47 @@ fun main(args: Array<String>) {
model("incremental/pureKotlin", extension = null, excludeParentDirs = true)
model("incremental/withJava", extension = null, excludeParentDirs = true)
}
}
testGroup("plugins/android-compiler-plugin/tests", "plugins/android-compiler-plugin/testData") {
testClass(javaClass<AbstractAndroidXml2KConversionTest>()) {
model("android/converter/simple", recursive = false, extension = null)
model("android/converter/exceptions", recursive = false, extension = null, testMethod = "doNoManifestTest")
}
testClass(javaClass<AbstractAndroidBoxTest>()) {
model("codegen/android", recursive = false, extension = null, testMethod = "doCompileAgainstAndroidSdkTest")
model("codegen/android", recursive = false, extension = null, testMethod = "doFakeInvocationTest", testClassName = "Invoke")
}
testClass(javaClass<AbstractAndroidBytecodePersistenceTest>()) {
model("codegen/androidPersistence", recursive = false, extension = null)
}
}
testGroup("plugins/android-idea-plugin/tests", "plugins/android-idea-plugin/testData") {
testClass(javaClass<AbstractCrossParserTest>()) {
model("android/crossParser", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidCompletionTest>()) {
model("android/completion", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidGotoTest>()) {
model("android/goto", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidRenameTest>()) {
model("android/rename", recursive = false, extension = null)
}
testClass(javaClass<AbstractAndroidFindUsagesTest>()) {
model("android/findUsages", recursive = false, extension = null)
}
}
testGroup("plugins/android-jps-plugin/tests", "plugins/android-jps-plugin/testData") {
testClass(javaClass<AbstractAndroidJpsTestCase>()) {
model("android", recursive = false, extension = null)
}