From dc05683f59c072cd9c2997cd37b2bc47a9292bf8 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 16 Nov 2022 16:13:33 +0100 Subject: [PATCH] [PL][tests] Fix: Properly count test steps in KLIB ABI compatibility tests --- .../tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt | 2 +- .../tests/org/jetbrains/kotlin/codegen/TestModel.kt | 6 ++++-- .../kotlin/incremental/AbstractInvalidationTest.kt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt index 0ac24a0b305..9e940573822 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/KlibABITestUtils.kt @@ -87,7 +87,7 @@ object KlibABITestUtils { val (moduleInfo, moduleTestDir, moduleBuildDirs, klibFile) = modulesMap[moduleName] ?: fail { "No module $moduleName found on step ${projectStep.id}" } - val moduleStep = moduleInfo.steps[projectStep.id] + val moduleStep = moduleInfo.steps.getValue(projectStep.id) moduleStep.modifications.forEach { modification -> modification.execute(moduleTestDir, moduleBuildDirs.sourceDir) diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt index 20134d21a49..922c2cb414c 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt @@ -52,7 +52,7 @@ class ModuleInfo(val moduleName: String) { val rebuildKlib: Boolean ) - val steps = mutableListOf() + val steps = hashMapOf() } const val PROJECT_INFO_FILE = "project.info" @@ -276,7 +276,9 @@ class ModuleInfoParser(infoFile: File) : InfoParser(infoFile) { if (stepMatcher.matches()) { val firstId = Integer.parseInt(stepMatcher.group(1)) val lastId = stepMatcher.group(2)?.let { Integer.parseInt(it) } ?: firstId - result.steps += parseSteps(firstId, lastId) + parseSteps(firstId, lastId).forEach { step -> + result.steps[step.id] = step + } } false } diff --git a/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt index 76f27f02914..58d2f86ce0f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt @@ -162,7 +162,7 @@ abstract class AbstractInvalidationTest( val moduleTestDir = File(testDir, module) val moduleSourceDir = File(sourceDir, module) val moduleInfo = moduleInfos[module] ?: error("No module info found for $module") - val moduleStep = moduleInfo.steps[projStepId] + val moduleStep = moduleInfo.steps.getValue(projStepId) val deletedFiles = mutableSetOf() for (modification in moduleStep.modifications) { modification.execute(moduleTestDir, moduleSourceDir) { deletedFiles.add(it.name) }