JPS tests: support custom mpp multi module tests, rearrange test data files for more consistency, configure js modules with facet (not with stdlib dependency which should be deprecated), temporary mute some complex mpp tests
This commit is contained in:
Sergey Rostov
@@ -940,21 +940,22 @@ fun main(args: Array<String>) {
|
||||
testClass<AbstractIncrementalJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true)
|
||||
model("incremental/multiModule/multiplatform/custom", extension = null, excludeParentDirs = true)
|
||||
model("incremental/pureKotlin", extension = null, recursive = false)
|
||||
model("incremental/withJava", extension = null, excludeParentDirs = true)
|
||||
model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true)
|
||||
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
|
||||
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiModule/multiplatform/withGeneratedContent")
|
||||
|
||||
testClass<AbstractIncrementalJsJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractMultiplatformJpsTest> {
|
||||
testClass<AbstractMultiplatformJpsTestWithGeneratedContent> {
|
||||
model(
|
||||
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
|
||||
"incremental/multiModule/multiplatform/withGeneratedContent", extension = null, excludeParentDirs = true,
|
||||
testClassName = "MultiplatformMultiModule", recursive = true
|
||||
)
|
||||
}
|
||||
@@ -1020,10 +1021,10 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalMultiplatformJvmCompilerRunnerTest> {
|
||||
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
|
||||
model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
|
||||
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
|
||||
model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -930,69 +930,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
}
|
||||
/* There is no jps in AS
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true)
|
||||
model("incremental/pureKotlin", extension = null, recursive = false)
|
||||
model("incremental/withJava", extension = null, excludeParentDirs = true)
|
||||
model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true)
|
||||
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
|
||||
|
||||
testClass<AbstractIncrementalJsJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractMultiplatformJpsTest> {
|
||||
model(
|
||||
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
|
||||
testClassName = "MultiplatformMultiModule", recursive = true
|
||||
)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/jvm", extension = null, recursive = false)
|
||||
}
|
||||
testClass<AbstractJsLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/js", extension = null, recursive = false)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalLazyCachesTest> {
|
||||
model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true)
|
||||
model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalCacheVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractDataContainerVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
fun TestGroup.TestClass.commonProtoComparisonTests() {
|
||||
model("comparison/classSignatureChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classPrivateOnlyChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classMembersOnlyChanged", extension = null, excludeParentDirs = true)
|
||||
model("comparison/packageMembers", extension = null, excludeParentDirs = true)
|
||||
model("comparison/unchanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jvmOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJsProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jsOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
....
|
||||
*/
|
||||
testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJvmCompilerRunnerTest> {
|
||||
|
||||
@@ -930,69 +930,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
}
|
||||
/* There is no jps in AS
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true)
|
||||
model("incremental/pureKotlin", extension = null, recursive = false)
|
||||
model("incremental/withJava", extension = null, excludeParentDirs = true)
|
||||
model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true)
|
||||
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
|
||||
|
||||
testClass<AbstractIncrementalJsJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractMultiplatformJpsTest> {
|
||||
model(
|
||||
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
|
||||
testClassName = "MultiplatformMultiModule", recursive = true
|
||||
)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/jvm", extension = null, recursive = false)
|
||||
}
|
||||
testClass<AbstractJsLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/js", extension = null, recursive = false)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalLazyCachesTest> {
|
||||
model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true)
|
||||
model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalCacheVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractDataContainerVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
fun TestGroup.TestClass.commonProtoComparisonTests() {
|
||||
model("comparison/classSignatureChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classPrivateOnlyChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classMembersOnlyChanged", extension = null, excludeParentDirs = true)
|
||||
model("comparison/packageMembers", extension = null, excludeParentDirs = true)
|
||||
model("comparison/unchanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jvmOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJsProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jsOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
....
|
||||
*/
|
||||
testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJvmCompilerRunnerTest> {
|
||||
|
||||
@@ -922,69 +922,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
}
|
||||
/* There is no jps in AS
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
model("incremental/multiModule/jvm", extension = null, excludeParentDirs = true)
|
||||
model("incremental/pureKotlin", extension = null, recursive = false)
|
||||
model("incremental/withJava", extension = null, excludeParentDirs = true)
|
||||
model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true)
|
||||
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
|
||||
|
||||
testClass<AbstractIncrementalJsJpsTest> {
|
||||
model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractMultiplatformJpsTest> {
|
||||
model(
|
||||
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
|
||||
testClassName = "MultiplatformMultiModule", recursive = true
|
||||
)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/jvm", extension = null, recursive = false)
|
||||
}
|
||||
testClass<AbstractJsLookupTrackerTest> {
|
||||
model("incremental/lookupTracker/js", extension = null, recursive = false)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalLazyCachesTest> {
|
||||
model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true)
|
||||
model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractIncrementalCacheVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractDataContainerVersionChangedTest> {
|
||||
model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
|
||||
testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
|
||||
fun TestGroup.TestClass.commonProtoComparisonTests() {
|
||||
model("comparison/classSignatureChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classPrivateOnlyChange", extension = null, excludeParentDirs = true)
|
||||
model("comparison/classMembersOnlyChanged", extension = null, excludeParentDirs = true)
|
||||
model("comparison/packageMembers", extension = null, excludeParentDirs = true)
|
||||
model("comparison/unchanged", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJvmProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jvmOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
|
||||
testClass<AbstractJsProtoComparisonTest> {
|
||||
commonProtoComparisonTests()
|
||||
model("comparison/jsOnly", extension = null, excludeParentDirs = true)
|
||||
}
|
||||
}
|
||||
....
|
||||
*/
|
||||
testGroup("compiler/incremental-compilation-impl/test", "jps-plugin/testData") {
|
||||
testClass<AbstractIncrementalJvmCompilerRunnerTest> {
|
||||
|
||||
Reference in New Issue
Block a user