From 2d5b7a87681836f660c1f38a9f5495221d8a4a7d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 27 Feb 2016 16:31:46 +0300 Subject: [PATCH] Minor, move CompileKotlinAgainstKotlin tests to codegen/ --- .../kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt | 1 - .../AbstractCompileKotlinAgainstInlineKotlinTest.kt | 5 +---- .../AbstractCompileKotlinAgainstKotlinTest.java | 5 +---- .../CompileKotlinAgainstInlineKotlinTestGenerated.java | 2 +- .../CompileKotlinAgainstKotlinTestGenerated.java | 2 +- .../kotlin/{jvm/compiler => codegen}/SMAPTestUtil.kt | 3 +-- 6 files changed, 5 insertions(+), 13 deletions(-) rename compiler/tests/org/jetbrains/kotlin/{jvm/compiler => codegen}/AbstractCompileKotlinAgainstInlineKotlinTest.kt (91%) rename compiler/tests/org/jetbrains/kotlin/{jvm/compiler => codegen}/AbstractCompileKotlinAgainstKotlinTest.java (96%) rename compiler/tests/org/jetbrains/kotlin/{jvm/compiler => codegen}/CompileKotlinAgainstInlineKotlinTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/{jvm/compiler => codegen}/CompileKotlinAgainstKotlinTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/{jvm/compiler => codegen}/SMAPTestUtil.kt (97%) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt index d9317be19c0..f3acec9cfb7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava -import org.jetbrains.kotlin.jvm.compiler.SMAPTestUtil import org.jetbrains.kotlin.test.ConfigurationKind import java.io.File diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt similarity index 91% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt index 7f821364c3a..9621edcc3dc 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstInlineKotlinTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt @@ -14,12 +14,9 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jvm.compiler +package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava -import org.jetbrains.kotlin.codegen.ClassFileFactory -import org.jetbrains.kotlin.codegen.InlineTestUtil -import org.jetbrains.kotlin.codegen.filterClassFiles import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import java.io.File diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java similarity index 96% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index c006fb413e4..45e912542f1 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jvm.compiler; +package org.jetbrains.kotlin.codegen; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; @@ -24,9 +24,6 @@ import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.codegen.ClassFileFactory; -import org.jetbrains.kotlin.codegen.CodegenTestCase; -import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index c2b26eeab6b..3617cd1483c 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jvm.compiler; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java index aa5b59ee4a7..ebe86c8a695 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jvm.compiler; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt b/compiler/tests/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt similarity index 97% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt rename to compiler/tests/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt index 7171626fb83..2b05ac714e1 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/SMAPTestUtil.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jvm.compiler +package org.jetbrains.kotlin.codegen import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil import org.jetbrains.kotlin.backend.common.output.OutputFile -import org.jetbrains.kotlin.codegen.CodegenTestCase import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor