[K/JS TEST] Run TestGenerated check on generated TS tests

This commit is contained in:
Artem Kobzar
2023-04-14 14:45:11 +00:00
committed by Space Team
parent 20786bb35a
commit 20dea37be0
49 changed files with 19 additions and 1574 deletions
+17 -22
View File
@@ -165,21 +165,6 @@ fun generateJsExportOnFileTestFor(dir: String): Task = task<Copy>("generate-js-e
into(outputDir)
}
val generateTypeScriptJsExportOnFileTests = sequential(
tasks = typescriptTestsDir
.listFiles { it: File ->
it.isDirectory &&
!it.path.endsWith("selective-export") &&
!it.path.endsWith("implicit-export") &&
!it.path.endsWith("inheritance") &&
!it.path.endsWith("strict-implicit-export") &&
!it.path.endsWith("private-primary-constructor") &&
!it.path.endsWith(exportFileDirPostfix)
}
.map { generateJsExportOnFileTestFor(it.name) }
)
fun generateTypeScriptTestFor(dir: String): Task = task<NpmTask>("generate-ts-for-$dir") {
val baseDir = fileTree(typescriptTestsDir.resolve(dir))
@@ -195,6 +180,21 @@ val generateTypeScriptTests = sequential(
.map { generateTypeScriptTestFor(it.name) }
)
val generateTypeScriptJsExportOnFileTests = sequential(
tasks = typescriptTestsDir
.listFiles { it: File ->
it.isDirectory &&
!it.path.endsWith("selective-export") &&
!it.path.endsWith("implicit-export") &&
!it.path.endsWith("inheritance") &&
!it.path.endsWith("strict-implicit-export") &&
!it.path.endsWith("private-primary-constructor") &&
!it.path.endsWith(exportFileDirPostfix)
}
.map { generateJsExportOnFileTestFor(it.name) }
.plus(generateTypeScriptTests)
)
fun Test.setupNodeJs() {
systemProperty("javascript.engine.path.NodeJs", com.github.gradle.node.variant.VariantComputer()
.let { variantComputer ->
@@ -218,10 +218,7 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean, firEnabled: B
inputs.files(rootDir.resolve("js/js.engines/src/org/jetbrains/kotlin/js/engine/repl.js"))
dependsOn(":dist")
if (!project.hasProperty("teamcity")) {
dependsOn(generateTypeScriptTests)
}
dependsOn(generateTypeScriptTests)
if (jsEnabled) {
dependsOn(testJsRuntime)
@@ -390,9 +387,7 @@ testsJar {}
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") {
dependsOn(":compiler:generateTestData")
if (!project.hasProperty("teamcity")) {
dependsOn(generateTypeScriptJsExportOnFileTests)
}
dependsOn(generateTypeScriptJsExportOnFileTests)
}
val prepareNpmTestData by tasks.registering(Copy::class) {