From c4b4a23cb10f798c8ea7ff77425e128fc3c1bb4c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 27 Feb 2016 16:15:52 +0300 Subject: [PATCH] Minor, move abstract codegen tests out of 'generated' Delete unused AbstractBlackBoxCodegenJava8Test --- ...BlackBoxWithJava8CodegenTestGenerated.java | 2 +- .../AbstractBlackBoxCodegenJava8Test.java | 23 ------------------- .../AbstractBlackBoxCodegenTest.java | 14 ++++------- .../AbstractBlackBoxInlineCodegenTest.kt | 7 ++---- ...ackBoxAgainstJavaCodegenTestGenerated.java | 2 +- .../BlackBoxCodegenTestGenerated.java | 2 +- .../BlackBoxInlineCodegenTestGenerated.java | 2 +- ...BlackBoxMultiFileCodegenTestGenerated.java | 2 +- .../BlackBoxWithJavaCodegenTestGenerated.java | 2 +- ...lackBoxWithStdlibCodegenTestGenerated.java | 2 +- .../kotlin/generators/tests/GenerateTests.kt | 2 -- .../android/test/AbstractAndroidBoxTest.kt | 19 ++++++++------- 12 files changed, 23 insertions(+), 56 deletions(-) rename compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxWithJava8CodegenTestGenerated.java (99%) delete mode 100644 compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/AbstractBlackBoxCodegenTest.java (94%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/AbstractBlackBoxInlineCodegenTest.kt (86%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxAgainstJavaCodegenTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxCodegenTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxInlineCodegenTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxMultiFileCodegenTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxWithJavaCodegenTestGenerated.java (99%) rename compiler/tests/org/jetbrains/kotlin/codegen/{generated => }/BlackBoxWithStdlibCodegenTestGenerated.java (99%) diff --git a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java similarity index 99% rename from compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java rename to compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java index aa0d0ea1f6d..46387597a99 100644 --- a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java +++ b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJava8CodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java deleted file mode 100644 index bab71d1e6bb..00000000000 --- a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenJava8Test.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen.generated; - - -public abstract class AbstractBlackBoxCodegenJava8Test extends AbstractBlackBoxCodegenTest { - - -} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java similarity index 94% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index c48ac4239f0..4faa502db5d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; @@ -28,10 +28,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; -import org.jetbrains.kotlin.codegen.CodegenTestCase; -import org.jetbrains.kotlin.codegen.CodegenTestFiles; -import org.jetbrains.kotlin.codegen.GeneratedClassLoader; -import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil; import org.jetbrains.kotlin.psi.KtDeclaration; @@ -65,11 +61,11 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } } - public void doTestAgainstJava(@NotNull String filename) { + protected void doTestAgainstJava(@NotNull String filename) { blackBoxFileAgainstJavaByFullPath(filename); } - public void doTestWithJava(@NotNull String filename) { + protected void doTestWithJava(@NotNull String filename) { try { blackBoxFileWithJavaByFullPath(filename); } @@ -78,7 +74,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } } - public void doTestWithStdlib(@NotNull String filename) { + protected void doTestWithStdlib(@NotNull String filename) { configurationKind = InTextDirectivesUtils.isDirectiveDefined( FilesKt.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT" ) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt similarity index 86% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt rename to compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt index 1dc3989bb7d..d9317be19c0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxInlineCodegenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxInlineCodegenTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,9 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated +package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava -import org.jetbrains.kotlin.codegen.InlineTestUtil -import org.jetbrains.kotlin.codegen.filterClassFiles -import org.jetbrains.kotlin.codegen.getClassFiles 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/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java index 38920ea2fa0..2daa7c92958 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 283fbc0d047..63daee5266f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java index 707d1374f49..f62867add1c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java index fa99a9d9f95..121196b2f8d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java index 15b65d19e34..df51005123e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithJavaCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java index b3913342108..07baff2bec5 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxWithStdlibCodegenTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.generated; +package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 01f0f52ae09..904c59cde9b 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -33,8 +33,6 @@ import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest -import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest -import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxInlineCodegenTest import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index 146ef6ff4c0..e73c6f9f03c 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -16,19 +16,18 @@ package org.jetbrains.kotlin.lang.resolve.android.test -import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest -import org.jetbrains.kotlin.config.CompilerConfiguration -import java.io.File -import com.intellij.util.Processor -import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.test.KotlinTestUtils -import java.util.regex.Pattern import com.intellij.openapi.util.io.FileUtil -import java.util.ArrayList -import java.util.Collections import com.intellij.util.ArrayUtil +import com.intellij.util.Processor +import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.codegen.CodegenTestFiles +import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.TestJdkKind +import java.io.File +import java.util.* +import java.util.regex.Pattern abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {