diff --git a/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt b/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt deleted file mode 100644 index 475834f0ee7..00000000000 --- a/compiler/testData/codegen/box/jvmPackageName/rootPackage.kt +++ /dev/null @@ -1,18 +0,0 @@ -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.2 - -// FILE: foo.kt - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmPackageName("jjj") - -fun f(): String = "O" - -val g: String? get() = "K" - -inline fun i(block: () -> String) = block() - -// FILE: bar.kt - -fun box(): String = i { f() + g } diff --git a/compiler/testData/codegen/box/jvmPackageName/simple.kt b/compiler/testData/codegen/box/jvmPackageName/simple.kt deleted file mode 100644 index 01d9fac7917..00000000000 --- a/compiler/testData/codegen/box/jvmPackageName/simple.kt +++ /dev/null @@ -1,21 +0,0 @@ -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.2 - -// FILE: foo.kt - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmPackageName("baz.foo.quux.bar") -package foo.bar - -fun f(): String = "O" - -val g: String? get() = "K" - -inline fun i(block: () -> T): T = block() - -// FILE: bar.kt - -import foo.bar.* - -fun box(): String = i { f() + g } diff --git a/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt b/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt deleted file mode 100644 index df2917bef0e..00000000000 --- a/compiler/testData/codegen/box/jvmPackageName/withJvmName.kt +++ /dev/null @@ -1,19 +0,0 @@ -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.2 - -// FILE: foo.kt - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmPackageName("jjj") -@file:JvmName("Foooo") - -fun f(): String = "O" - -val g: String? get() = "K" - -inline fun i(block: () -> String) = block() - -// FILE: bar.kt - -fun box(): String = i { f() + g } diff --git a/compiler/testData/codegen/boxInline/jvmPackageName/simple.kt b/compiler/testData/codegen/boxInline/jvmPackageName/simple.kt deleted file mode 100644 index a68cc6dd26d..00000000000 --- a/compiler/testData/codegen/boxInline/jvmPackageName/simple.kt +++ /dev/null @@ -1,21 +0,0 @@ -// TARGET_BACKEND: JVM -// WITH_RUNTIME -// LANGUAGE_VERSION: 1.2 - -// FILE: 1.kt - -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmPackageName("baz.foo.quux.bar") -package foo.bar - -fun f(): String = "O" - -val g: String? get() = "K" - -inline fun i(block: () -> T): T = block() - -// FILE: 2.kt - -import foo.bar.* - -fun box(): String = i { f() + g } diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt b/compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt deleted file mode 100644 index 8a351766474..00000000000 --- a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt +++ /dev/null @@ -1,26 +0,0 @@ -// IGNORE_BACKEND: NATIVE -// FILE: A.kt -// LANGUAGE_VERSION: 1.2 - -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("bar") -package foo - -fun f() = "OK" - -var v: Int = 1 - -inline fun i(block: () -> Unit) = block() - -// FILE: B.kt -// LANGUAGE_VERSION: 1.2 - -import foo.* - -fun box(): String { - v = 2 - if (v != 2) return "Fail" - i { v = 3 } - if (v != 3) return "Fail" - return f() -} diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt b/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt deleted file mode 100644 index 65d9f3365ab..00000000000 --- a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt +++ /dev/null @@ -1,19 +0,0 @@ -// IGNORE_BACKEND: NATIVE -// FILE: A.kt -// LANGUAGE_VERSION: 1.2 - -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("bar") - -fun f() = "OK" - -var v: Int = 1 - -// FILE: B.kt -// LANGUAGE_VERSION: 1.2 - -fun box(): String { - v = 2 - if (v != 2) return "Fail" - return f() -} diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt b/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt deleted file mode 100644 index d5aa6ce0906..00000000000 --- a/compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt +++ /dev/null @@ -1,23 +0,0 @@ -// IGNORE_BACKEND: NATIVE -// FILE: A.kt -// LANGUAGE_VERSION: 1.2 - -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("bar") -@file:JvmName("Baz") -package foo - -fun f() = "OK" - -var v: Int = 1 - -// FILE: B.kt -// LANGUAGE_VERSION: 1.2 - -import foo.* - -fun box(): String { - v = 2 - if (v != 2) return "Fail" - return f() -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt deleted file mode 100644 index e739a7e7461..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !DIAGNOSTICS: -INVISIBLE_MEMBER -INVISIBLE_REFERENCE -// !API_VERSION: 1.2 - -// FILE: a.kt -@file:JvmPackageName("a") -@file:JvmMultifileClass -package a -fun a() {} - -// FILE: b.kt -@file:JvmPackageName("") -package b -fun b() {} - -// FILE: c.kt -@file:JvmPackageName("invalid-fq-name") -package c -fun c() {} - -// FILE: d.kt -@file:JvmPackageName("d") -package d -class D -fun d() {} - -// FILE: e.kt -@file:JvmPackageName(42) -package e -fun e() {} - -// FILE: f.kt -@file:JvmPackageName(f) -package f -const val name = "f" diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.txt deleted file mode 100644 index 628e6376875..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.txt +++ /dev/null @@ -1,32 +0,0 @@ -package - -package a { - public fun a(): kotlin.Unit -} - -package b { - public fun b(): kotlin.Unit -} - -package c { - public fun c(): kotlin.Unit -} - -package d { - public fun d(): kotlin.Unit - - public final class D { - public constructor D() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} - -package e { - public fun e(): kotlin.Unit -} - -package f { - public const val name: kotlin.String = "f" -} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt b/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt deleted file mode 100644 index e314ca02610..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("j") -package bar - -fun file0() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt b/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt deleted file mode 100644 index 1332d265269..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt +++ /dev/null @@ -1,6 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmName("JJ") -@file:JvmPackageName("jj") -package bar - -fun jj() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt b/compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt deleted file mode 100644 index ffa0ca17992..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun file1() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt b/compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt deleted file mode 100644 index 4bb55187bca..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("jjj") -package foo - -fun file2() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt b/compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt deleted file mode 100644 index 7c7268d5381..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:JvmMultifileClass -@file:JvmName("MultiFoo") -package foo - -fun multiFile1() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt b/compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt deleted file mode 100644 index 0390ef39c28..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt +++ /dev/null @@ -1,7 +0,0 @@ -bar - j/BarAsJKt - jj/JJ -foo - foo/MultiFoo__FooMultiFileKt (foo/MultiFoo) - foo/FooKt - jjj/FooAsJJJKt diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt b/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt deleted file mode 100644 index ffa0ca17992..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -fun file1() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt b/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt deleted file mode 100644 index ad28a3952ca..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("j") -package foo - -fun file2() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt b/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt deleted file mode 100644 index 78bc5936829..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt +++ /dev/null @@ -1,2 +0,0 @@ -foo - foo/FooKt diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt b/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt deleted file mode 100644 index 55ca8bc833e..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("foo.jvm") -package foo - -fun foo1() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt b/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt deleted file mode 100644 index f7e3ccea95b..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("foo.jvm") -package foo - -fun foo2() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt b/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt deleted file mode 100644 index ac492382822..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt +++ /dev/null @@ -1,5 +0,0 @@ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("foo.jvm") -package foo - -fun foo3() {} diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt b/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt deleted file mode 100644 index 5500612a972..00000000000 --- a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt +++ /dev/null @@ -1,4 +0,0 @@ -foo - foo/jvm/Foo1Kt - foo/jvm/Foo2Kt - foo/jvm/Foo3Kt diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 6aeea46ce43..a0916dfc998 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -10401,33 +10401,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes } } - @TestMetadata("compiler/testData/codegen/box/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractIrBlackBoxCodegenTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); - } - - @TestMetadata("rootPackage.kt") - public void testRootPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/rootPackage.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/simple.kt"); - doTest(fileName); - } - - @TestMetadata("withJvmName.kt") - public void testWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/withJvmName.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java index 689a82569cd..b510fa962ef 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java @@ -1572,21 +1572,6 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli } } - @TestMetadata("compiler/testData/codegen/boxInline/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractIrBlackBoxInlineCodegenTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/jvmPackageName/simple.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java index 63206bdaf8d..bbdd4282ca0 100644 --- a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -1572,21 +1572,6 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC } } - @TestMetadata("compiler/testData/codegen/boxInline/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractIrCompileKotlinAgainstInlineKotlinTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/jvmPackageName/simple.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index 0b982460af8..42de2143933 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -539,21 +539,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW } } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractDiagnosticsTestWithStdLib { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("incorrectJvmPackageName.kt") - public void testIncorrectJvmPackageName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java index e1325e81638..e8eb40d96a3 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java @@ -539,21 +539,6 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno } } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractDiagnosticsTestWithStdLibUsingJavac { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("incorrectJvmPackageName.kt") - public void testIncorrectJvmPackageName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index bc50609cb6c..74b9e236cc0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -10401,33 +10401,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @TestMetadata("compiler/testData/codegen/box/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); - } - - @TestMetadata("rootPackage.kt") - public void testRootPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/rootPackage.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/simple.kt"); - doTest(fileName); - } - - @TestMetadata("withJvmName.kt") - public void testWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/withJvmName.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java index 4c05101df54..c8da2d68c1c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java @@ -1572,21 +1572,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo } } - @TestMetadata("compiler/testData/codegen/boxInline/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractBlackBoxInlineCodegenTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/jvmPackageName/simple.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index 445a59a4bba..936a348dbcd 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -1572,21 +1572,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } } - @TestMetadata("compiler/testData/codegen/boxInline/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractCompileKotlinAgainstInlineKotlinTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/jvmPackageName/simple.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java index 9749ca8fb27..73cf7c74e51 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java @@ -138,24 +138,6 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl doTest(fileName); } - @TestMetadata("jvmPackageName.kt") - public void testJvmPackageName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt"); - doTest(fileName); - } - - @TestMetadata("jvmPackageNameInRootPackage.kt") - public void testJvmPackageNameInRootPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt"); - doTest(fileName); - } - - @TestMetadata("jvmPackageNameWithJvmName.kt") - public void testJvmPackageNameWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt"); - doTest(fileName); - } - @TestMetadata("jvmStaticInObject.kt") public void testJvmStaticInObject() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmStaticInObject.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt index dbcb53f5f2a..d291b5d71cc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt @@ -76,19 +76,4 @@ class JvmPackageTableTest : KtUsefulTestCase() { fun testSimple() { doTest("/jvmPackageTable/simple") } - - fun testJvmPackageName() { - doTest("/jvmPackageTable/jvmPackageName", - compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2) - } - - fun testJvmPackageNameManyParts() { - doTest("/jvmPackageTable/jvmPackageNameManyParts", - compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2) - } - - fun testJvmPackageNameLanguageVersion11() { - doTest("/jvmPackageTable/jvmPackageNameLanguageVersion11", - compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_1) - } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index bdd067b2e93..4c6f6d88d16 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -10401,33 +10401,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes } } - @TestMetadata("compiler/testData/codegen/box/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractLightAnalysisModeTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true); - } - - @TestMetadata("rootPackage.kt") - public void testRootPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/rootPackage.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/simple.kt"); - doTest(fileName); - } - - @TestMetadata("withJvmName.kt") - public void testWithJvmName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/jvmPackageName/withJvmName.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/core/runtime.jvm/src/kotlin/jvm/annotations/JvmPlatformAnnotations.kt b/core/runtime.jvm/src/kotlin/jvm/annotations/JvmPlatformAnnotations.kt index e270da2ded6..28890bec5fc 100644 --- a/core/runtime.jvm/src/kotlin/jvm/annotations/JvmPlatformAnnotations.kt +++ b/core/runtime.jvm/src/kotlin/jvm/annotations/JvmPlatformAnnotations.kt @@ -62,18 +62,6 @@ public annotation class JvmName(val name: String) @MustBeDocumented public annotation class JvmMultifileClass -/** - * Changes the fully qualified name of the JVM package of the .class file generated from this file. - * This does not affect the way Kotlin clients will see the declarations in this file, but Java clients and other JVM language clients - * will see the class file as if it was declared in the specified package. - * If a file is annotated with this annotation, it can only have function, property and typealias declarations, but no classes. - */ -@Target(AnnotationTarget.FILE) -@Retention(AnnotationRetention.SOURCE) -@MustBeDocumented -@SinceKotlin("1.2") -internal annotation class JvmPackageName(val name: String) - @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.FIELD) @Retention(AnnotationRetention.SOURCE) public annotation class JvmSynthetic diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index e7916d83290..0cc7030b0c7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -11733,15 +11733,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } } - @TestMetadata("compiler/testData/codegen/box/jvmPackageName") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class JvmPackageName extends AbstractJsCodegenBoxTest { - public void testAllFilesPresentInJvmPackageName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/jvmPackageName"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); - } - } - @TestMetadata("compiler/testData/codegen/box/jvmStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)