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

Maven: extract maven support to the separate module

Browse Source
This commit is contained in:
Sergey Mashkov
2016-04-01 17:49:28 +03:00
parent dfaba1d0aa
commit fc197cd616
64 changed files with 221 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/generators.iml
+1
View File
@@ -37,6 +37,7 @@
<orderEntry type="module" module-name="build-common" scope="TEST" />
<orderEntry type="module" module-name="plugins-tests" scope="TEST" />
<orderEntry type="module" module-name="idea-android" scope="TEST" />
<orderEntry type="module" module-name="idea-maven" scope="TEST" />
<orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
</component>
</module>
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+13 -8
View File
@@ -57,7 +57,7 @@ import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordComplet
import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
import org.jetbrains.kotlin.idea.configuration.AbstractConfigureProjectByChangingFileTest
import org.jetbrains.kotlin.idea.configuration.AbstractMavenConfigureProjectByChangingFileTest
import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
@@ -491,10 +491,6 @@ fun main(args: Array<String>) {
model("inspections", pattern = "^(inspections\\.test)$", singleClass = true)
}
testClass<AbstractKotlinMavenInspectionTest> {
model("maven-inspections", pattern = "^([\\w\\-]+).xml$", singleClass = true)
}
testClass<AbstractHierarchyTest>() {
model("hierarchy/class/type", extension = null, recursive = false, testMethod = "doTypeClassHierarchyTest")
model("hierarchy/class/super", extension = null, recursive = false, testMethod = "doSuperClassHierarchyTest")
@@ -600,10 +596,8 @@ fun main(args: Array<String>) {
model("multiFileInspections", extension = "test", singleClass = true)
}
testClass<AbstractConfigureProjectByChangingFileTest>() {
testClass<org.jetbrains.kotlin.idea.configuration.AbstractGradleConfigureProjectByChangingFileTest>() {
model("configuration/gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestGradle")
model("configuration/maven", extension = null, recursive = false, testMethod = "doTestWithMaven")
model("configuration/js-maven", extension = null, recursive = false, testMethod = "doTestWithJSMaven")
}
testClass<AbstractFormatterTest>() {
@@ -800,6 +794,17 @@ fun main(args: Array<String>) {
}
}
testGroup("idea/idea-maven/test", "idea/idea-maven/testData") {
testClass<AbstractMavenConfigureProjectByChangingFileTest>() {
model("configurator/jvm", extension = null, recursive = false, testMethod = "doTestWithMaven")
model("configurator/js", extension = null, recursive = false, testMethod = "doTestWithJSMaven")
}
testClass<AbstractKotlinMavenInspectionTest> {
model("maven-inspections", pattern = "^([\\w\\-]+).xml$", singleClass = true)
}
}
testGroup("idea/tests", "compiler/testData") {
testClass<AbstractResolveByStubTest>() {
model("loadJava/compiledKotlin")