From 5970cfff75d8268feef3aff6fcd9a80f1dfe1273 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 31 Mar 2023 17:02:16 +0200 Subject: [PATCH] [JS][tests] Rename KLIB binary compatibility tests to KLIB evolution tests --- .../jetbrains/kotlin/generators/tests/GenerateJsTests.kt | 4 ++-- .../AbstractJsKlibEvolutionTest.kt} | 6 +++--- .../JsKlibEvolutionTestGenerated.java} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename js/js.tests/test/org/jetbrains/kotlin/js/testOld/{compatibility/binary/AbstractJsKlibBinaryCompatibilityTest.kt => klib/AbstractJsKlibEvolutionTest.kt} (95%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/{compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java => klib/JsKlibEvolutionTestGenerated.java} (98%) diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index 4b3047563bb..dce938dc1ad 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.js.test.* import org.jetbrains.kotlin.js.test.fir.* import org.jetbrains.kotlin.js.test.ir.* import org.jetbrains.kotlin.js.testOld.AbstractDceTest -import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.js.test.fir.AbstractFirLightTreeJsIrTextTest +import org.jetbrains.kotlin.js.testOld.klib.AbstractJsKlibEvolutionTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -68,7 +68,7 @@ fun main(args: Array) { } testGroup("js/js.tests/tests-gen", "compiler/testData/binaryCompatibility", testRunnerMethodName = "runTest0") { - testClass { + testClass { model("klibEvolution", targetBackend = TargetBackend.JS_IR) } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/compatibility/binary/AbstractJsKlibBinaryCompatibilityTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt similarity index 95% rename from js/js.tests/test/org/jetbrains/kotlin/js/testOld/compatibility/binary/AbstractJsKlibBinaryCompatibilityTest.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt index 06a619c17ea..f5fbd9eec46 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/compatibility/binary/AbstractJsKlibBinaryCompatibilityTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.js.testOld.compatibility.binary +package org.jetbrains.kotlin.js.testOld.klib import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION import org.jetbrains.kotlin.test.KotlinBaseTest import java.io.File -abstract class AbstractJsKlibBinaryCompatibilityTest : AbstractKlibBinaryCompatibilityTest() { +abstract class AbstractJsKlibEvolutionTest : AbstractKlibBinaryCompatibilityTest() { override fun createEnvironment() = KotlinCoreEnvironment.createForTests(testRootDisposable, CompilerConfiguration(), EnvironmentConfigFiles.JS_CONFIG_FILES) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/JsKlibEvolutionTestGenerated.java similarity index 98% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/JsKlibEvolutionTestGenerated.java index 1379ad7f277..480e6229562 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/JsKlibEvolutionTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.js.testOld.compatibility.binary; +package org.jetbrains.kotlin.js.testOld.klib; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; @@ -21,7 +21,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/binaryCompatibility/klibEvolution") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JsKlibBinaryCompatibilityTestGenerated extends AbstractJsKlibBinaryCompatibilityTest { +public class JsKlibEvolutionTestGenerated extends AbstractJsKlibEvolutionTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath); }