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

[JS TESTS] Drop unused additionalCommonFileDirectories property

Browse Source
This commit is contained in:
Ivan Kylchik
2021-08-24 17:28:02 +03:00
parent 0d02b1d51c
commit 3cbeb08f79
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+5 -14
View File
@@ -84,8 +84,6 @@ abstract class BasicBoxTest(
private val generateNodeJsRunner: Boolean = true, private val generateNodeJsRunner: Boolean = true,
private val targetBackend: TargetBackend = TargetBackend.JS private val targetBackend: TargetBackend = TargetBackend.JS
) : KotlinTestWithEnvironment() { ) : KotlinTestWithEnvironment() {
private val additionalCommonFileDirectories = mutableListOf<String>()
val pathToRootOutputDir = System.getProperty("kotlin.js.test.root.out.dir") ?: error("'kotlin.js.test.root.out.dir' is not set") val pathToRootOutputDir = System.getProperty("kotlin.js.test.root.out.dir") ?: error("'kotlin.js.test.root.out.dir' is not set")
private val testGroupOutputDirForCompilation = File(pathToRootOutputDir + "out/" + testGroupOutputDirPrefix) private val testGroupOutputDirForCompilation = File(pathToRootOutputDir + "out/" + testGroupOutputDirPrefix)
private val testGroupOutputDirForMinification = File(pathToRootOutputDir + "out-min/" + testGroupOutputDirPrefix) private val testGroupOutputDirForMinification = File(pathToRootOutputDir + "out-min/" + testGroupOutputDirPrefix)
@@ -275,10 +273,6 @@ abstract class BasicBoxTest(
val localCommonFile = file.parent + "/" + COMMON_FILES_NAME + JavaScript.DOT_EXTENSION val localCommonFile = file.parent + "/" + COMMON_FILES_NAME + JavaScript.DOT_EXTENSION
val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList() val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList()
val additionalCommonFiles = additionalCommonFileDirectories.flatMap { baseDir ->
JsTestUtils.getFilesInDirectoryByExtension(baseDir + "/", JavaScript.EXTENSION)
}
val inputJsFilesBefore = mutableListOf<String>() val inputJsFilesBefore = mutableListOf<String>()
val inputJsFilesAfter = mutableListOf<String>() val inputJsFilesAfter = mutableListOf<String>()
@@ -381,14 +375,14 @@ abstract class BasicBoxTest(
} }
val allJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map { it.first } + globalCommonFiles + localCommonFiles + val allJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map { it.first } + globalCommonFiles + localCommonFiles +
additionalCommonFiles + additionalMainFiles + inputJsFilesAfter additionalMainFiles + inputJsFilesAfter
val dceAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map { val dceAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map {
it.first.replace( it.first.replace(
outputDir.absolutePath, outputDir.absolutePath,
dceOutputDir.absolutePath dceOutputDir.absolutePath
) )
} + globalCommonFiles + localCommonFiles + additionalCommonFiles + additionalMainFiles + inputJsFilesAfter } + globalCommonFiles + localCommonFiles + additionalMainFiles + inputJsFilesAfter
val pirAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map { val pirAllJsFiles = additionalFiles + inputJsFilesBefore + generatedJsFiles.map {
it.first.replace( it.first.replace(
@@ -396,7 +390,7 @@ abstract class BasicBoxTest(
pirOutputDir.absolutePath pirOutputDir.absolutePath
) )
} + } +
globalCommonFiles + localCommonFiles + additionalCommonFiles + additionalMainFiles + inputJsFilesAfter globalCommonFiles + localCommonFiles + additionalMainFiles + inputJsFilesAfter
val dontRunGeneratedCode = val dontRunGeneratedCode =
InTextDirectivesUtils.dontRunGeneratedCode(targetBackend, file) InTextDirectivesUtils.dontRunGeneratedCode(targetBackend, file)
@@ -597,11 +591,8 @@ abstract class BasicBoxTest(
val globalCommonFiles = JsTestUtils.getFilesInDirectoryByExtension(COMMON_FILES_DIR_PATH, KotlinFileType.EXTENSION) val globalCommonFiles = JsTestUtils.getFilesInDirectoryByExtension(COMMON_FILES_DIR_PATH, KotlinFileType.EXTENSION)
val localCommonFile = directory + "/" + COMMON_FILES_NAME + "." + KotlinFileType.EXTENSION val localCommonFile = directory + "/" + COMMON_FILES_NAME + "." + KotlinFileType.EXTENSION
val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList() val localCommonFiles = if (File(localCommonFile).exists()) listOf(localCommonFile) else emptyList()
// TODO probably it's no longer needed.
val additionalCommonFiles = additionalCommonFileDirectories.flatMap { baseDir -> val additionalFiles = globalCommonFiles + localCommonFiles
JsTestUtils.getFilesInDirectoryByExtension(baseDir + "/", KotlinFileType.EXTENSION)
}
val additionalFiles = globalCommonFiles + localCommonFiles + additionalCommonFiles
val allSourceFiles = (testFiles + additionalFiles).map(::File) val allSourceFiles = (testFiles + additionalFiles).map(::File)
val psiFiles = createPsiFiles(allSourceFiles.sortedBy { it.canonicalPath }.map { it.canonicalPath }) val psiFiles = createPsiFiles(allSourceFiles.sortedBy { it.canonicalPath }.map { it.canonicalPath })