From b1fb5bdde1538ad1f29656b2ac0987f1d872c91c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Aug 2023 16:10:31 +0200 Subject: [PATCH] Minor, rename JavaModulesIntegrationTest and move to separate package --- .../jvm/compiler/Java11ModulesIntegrationTest.kt | 10 ---------- .../jvm/compiler/Java17ModulesIntegrationTest.kt | 10 ---------- .../AbstractJavaModulesIntegrationTest.kt} | 5 +++-- .../kotlin/jvm/modules/JavaModulesIntegrationTest.kt | 12 ++++++++++++ 4 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt delete mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java17ModulesIntegrationTest.kt rename compiler/tests/org/jetbrains/kotlin/jvm/{compiler/JavaModulesIntegrationTest.kt => modules/AbstractJavaModulesIntegrationTest.kt} (98%) create mode 100644 compiler/tests/org/jetbrains/kotlin/jvm/modules/JavaModulesIntegrationTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt deleted file mode 100644 index 2b3744a8396..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java11ModulesIntegrationTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2010-2018 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.jvm.compiler - -import org.jetbrains.kotlin.test.util.KtTestUtil - -class Java11ModulesIntegrationTest : JavaModulesIntegrationTest(11, KtTestUtil.getJdk11Home()) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java17ModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java17ModulesIntegrationTest.kt deleted file mode 100644 index 169fc853287..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java17ModulesIntegrationTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2010-2021 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.jvm.compiler - -import org.jetbrains.kotlin.test.util.KtTestUtil - -class Java17ModulesIntegrationTest : JavaModulesIntegrationTest(17, KtTestUtil.getJdk17Home()) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt similarity index 98% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt index c94a1509491..2b3c4bd3f14 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JavaModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt @@ -3,19 +3,20 @@ * 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.jvm.compiler +package org.jetbrains.kotlin.jvm.modules import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.cli.AbstractCliTest.getNormalizedCompilerOutput import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime +import org.jetbrains.kotlin.jvm.compiler.AbstractKotlinCompilerIntegrationTest import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.concurrent.TimeUnit import java.util.jar.Manifest import kotlin.test.fail -abstract class JavaModulesIntegrationTest(private val jdkVersion: Int, private val jdkHome: File) : +abstract class AbstractJavaModulesIntegrationTest(private val jdkVersion: Int, private val jdkHome: File) : AbstractKotlinCompilerIntegrationTest() { override val testDataPath: String get() = "compiler/testData/javaModules/" diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/modules/JavaModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/modules/JavaModulesIntegrationTest.kt new file mode 100644 index 00000000000..5b9ae001033 --- /dev/null +++ b/compiler/tests/org/jetbrains/kotlin/jvm/modules/JavaModulesIntegrationTest.kt @@ -0,0 +1,12 @@ +/* + * 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.jvm.modules + +import org.jetbrains.kotlin.test.util.KtTestUtil + +class Java11ModulesIntegrationTest : AbstractJavaModulesIntegrationTest(11, KtTestUtil.getJdk11Home()) + +class Java17ModulesIntegrationTest : AbstractJavaModulesIntegrationTest(17, KtTestUtil.getJdk17Home())