From 699f16ba55f15af736f2fc2b9c2c12801d9a2145 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 2 Dec 2021 12:47:26 +0300 Subject: [PATCH] [KLIB] Move klib-related tests into separate package/directory - regenerate tests --- .../kotlin/{ir => klib}/AbstractKlibTextTestCase.kt | 4 +++- .../kotlin/test/generators/GenerateJUnit3CompilerTests.kt | 6 +++++- .../kotlin/{ir => klib}/KlibJsTextTestCaseGenerated.java | 2 +- .../kotlin/{ir => klib}/KlibTextTestCaseGenerated.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) rename compiler/tests-common/tests/org/jetbrains/kotlin/{ir => klib}/AbstractKlibTextTestCase.kt (98%) rename compiler/tests-gen/org/jetbrains/kotlin/{ir => klib}/KlibJsTextTestCaseGenerated.java (99%) rename compiler/tests-gen/org/jetbrains/kotlin/{ir => klib}/KlibTextTestCaseGenerated.java (99%) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractKlibTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt similarity index 98% rename from compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractKlibTextTestCase.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt index 8afebd26f53..43ddbfc7f02 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractKlibTextTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibTextTestCase.kt @@ -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.ir +package org.jetbrains.kotlin.klib import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement @@ -22,6 +22,8 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.ir.AbstractIrGeneratorTestCase +import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.backend.js.JsFactories import org.jetbrains.kotlin.ir.backend.js.KotlinFileSerializedData import org.jetbrains.kotlin.ir.backend.js.jsResolveLibraries diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 5bc52aafed6..298f1bbcb27 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -28,12 +28,16 @@ import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME import org.jetbrains.kotlin.integration.AbstractAntTaskTest -import org.jetbrains.kotlin.ir.* +import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase +import org.jetbrains.kotlin.ir.AbstractIrJsTextTestCase +import org.jetbrains.kotlin.ir.AbstractIrSourceRangesTestCase import org.jetbrains.kotlin.jvm.compiler.* import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileJavaAgainstKotlinTest import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrCompileKotlinAgainstJavaTest import org.jetbrains.kotlin.jvm.compiler.ir.AbstractIrLoadJavaTest import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJavaUsingJavacTest +import org.jetbrains.kotlin.klib.AbstractKlibJsTextTestCase +import org.jetbrains.kotlin.klib.AbstractKlibTextTestCase import org.jetbrains.kotlin.lexer.kdoc.AbstractKDocLexerTest import org.jetbrains.kotlin.lexer.kotlin.AbstractKotlinLexerTest import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest diff --git a/compiler/tests-gen/org/jetbrains/kotlin/ir/KlibJsTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibJsTextTestCaseGenerated.java similarity index 99% rename from compiler/tests-gen/org/jetbrains/kotlin/ir/KlibJsTextTestCaseGenerated.java rename to compiler/tests-gen/org/jetbrains/kotlin/klib/KlibJsTextTestCaseGenerated.java index 7362724dfa4..134b97cdc02 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/ir/KlibJsTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibJsTextTestCaseGenerated.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.ir; +package org.jetbrains.kotlin.klib; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests-gen/org/jetbrains/kotlin/ir/KlibTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java similarity index 99% rename from compiler/tests-gen/org/jetbrains/kotlin/ir/KlibTextTestCaseGenerated.java rename to compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java index 6266cc4403e..b3f7338408e 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/ir/KlibTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.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.ir; +package org.jetbrains.kotlin.klib; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;