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

as33: Add AS 3.3 bunchset built with AS 3.3 C4

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-02 19:56:16 +03:00
parent 94bbb3831a
commit 8fc0c1d7b0
24 changed files with 1037 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/build.gradle.kts.as33
+53
View File
@@ -0,0 +1,53 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
sourceSets {
"main" { }
"test" { projectDefault() }
}
val builtinsSourceSet = sourceSets.create("builtins") {
java.srcDir("builtins")
}
val builtinsCompile by configurations
dependencies {
compile(projectTests(":compiler:cli"))
compile(projectTests(":idea:idea-maven"))
compile(projectTests(":j2k"))
compile(projectTests(":idea:idea-android"))
compile(projectTests(":jps-plugin"))
compile(projectTests(":plugins:android-extensions-compiler"))
compile(projectTests(":plugins:android-extensions-ide"))
compile(projectTests(":plugins:android-extensions-jps"))
compile(projectTests(":kotlin-annotation-processing"))
compile(projectTests(":kotlin-allopen-compiler-plugin"))
compile(projectTests(":kotlin-noarg-compiler-plugin"))
compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
compile(projectTests(":generators:test-generator"))
// testCompileOnly(intellijDep("jps-build-test"))
builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion")
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(builtinsSourceSet.output)
testRuntime(intellijDep()) { includeJars("idea_rt") }
testRuntime(projectDist(":kotlin-reflect"))
}
projectTest {
workingDir = rootDir
}
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt")
val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt")
val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare")
val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt")
val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet)
testsJar()
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as33
+83 -6
View File
@@ -67,7 +67,10 @@ import org.jetbrains.kotlin.idea.conversion.copy.AbstractLiteralKotlinToKotlinCo
import org.jetbrains.kotlin.idea.conversion.copy.AbstractLiteralTextToKotlinCopyPasteTest
import org.jetbrains.kotlin.idea.conversion.copy.AbstractTextJavaToKotlinCopyPasteConversionTest
import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
import org.jetbrains.kotlin.idea.debugger.*
import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
import org.jetbrains.kotlin.idea.debugger.AbstractKotlinSteppingTest
import org.jetbrains.kotlin.idea.debugger.AbstractPositionManagerTest
import org.jetbrains.kotlin.idea.debugger.AbstractSmartStepIntoTest
import org.jetbrains.kotlin.idea.debugger.evaluate.*
import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest
import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest
@@ -625,10 +628,6 @@ fun main(args: Array<String>) {
model("debugger/tinyApp/src/evaluate/multipleBreakpoints", testMethod = "doMultipleBreakpointsTest")
}
testClass<AbstractFileRankingTest> {
model("debugger/fileRanking")
}
testClass<AbstractStubBuilderTest> {
model("stubs", extension = "kt")
}
@@ -921,7 +920,8 @@ 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", extension = null, excludeParentDirs = true)
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)
@@ -930,6 +930,10 @@ fun main(args: Array<String>) {
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,
@@ -1059,6 +1063,79 @@ fun main(args: Array<String>) {
}
}
/*
testGroup("plugins/android-extensions/android-extensions-idea/tests", "plugins/android-extensions/android-extensions-idea/testData") {
testClass<AbstractAndroidCompletionTest> {
model("android/completion", recursive = false, extension = null)
}
testClass<AbstractAndroidGotoTest> {
model("android/goto", recursive = false, extension = null)
}
testClass<AbstractAndroidRenameTest> {
model("android/rename", recursive = false, extension = null)
}
testClass<AbstractAndroidLayoutRenameTest> {
model("android/renameLayout", recursive = false, extension = null)
}
testClass<AbstractAndroidFindUsagesTest> {
model("android/findUsages", recursive = false, extension = null)
}
testClass<AbstractAndroidUsageHighlightingTest> {
model("android/usageHighlighting", recursive = false, extension = null)
}
testClass<AbstractAndroidExtractionTest> {
model("android/extraction", recursive = false, extension = null)
}
testClass<AbstractParcelCheckerTest> {
model("android/parcel/checker", excludeParentDirs = true)
}
testClass<AbstractParcelQuickFixTest> {
model("android/parcel/quickfix", pattern = """^(\w+)\.((before\.Main\.\w+)|(test))$""", testMethod = "doTestWithExtraFile")
}
}
testGroup("idea/idea-android/tests", "idea/testData") {
testClass<AbstractConfigureProjectTest> {
model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle")
model("configuration/android-gsk", pattern = """(\w+)_before\.gradle.kts$""", testMethod = "doTestAndroidGradle")
}
testClass<AbstractAndroidIntentionTest> {
model("android/intention", pattern = "^([\\w\\-_]+)\\.kt$")
}
testClass<AbstractAndroidResourceIntentionTest> {
model("android/resourceIntention", extension = "test", singleClass = true)
}
testClass<AbstractAndroidQuickFixMultiFileTest> {
model("android/quickfix", pattern = """^(\w+)\.((before\.Main\.\w+)|(test))$""", testMethod = "doTestWithExtraFile")
}
testClass<AbstractKotlinLintTest> {
model("android/lint", excludeParentDirs = true)
}
testClass<AbstractAndroidLintQuickfixTest> {
model("android/lintQuickfix", pattern = "^([\\w\\-_]+)\\.kt$")
}
testClass<AbstractAndroidResourceFoldingTest> {
model("android/folding")
}
testClass<AbstractAndroidGutterIconTest> {
model("android/gutterIcon")
}
}
testGroup("plugins/android-extensions/android-extensions-jps/test", "plugins/android-extensions/android-extensions-jps/testData") {
testClass<AbstractAndroidJpsTestCase> {
model("android", recursive = false, extension = null)