From fbcf7c146bc8c4c78ef1fe90b6639c8cbde37454 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 4 Nov 2016 06:02:38 +0300 Subject: [PATCH] Remove JavaPackage from common completion tests, move to java-specific tests --- .../testData/basic/{common => java}/JavaPackage.kt | 0 .../test/JSBasicCompletionTestGenerated.java | 6 ------ .../test/JvmBasicCompletionTestGenerated.java | 12 ++++++------ 3 files changed, 6 insertions(+), 12 deletions(-) rename idea/idea-completion/testData/basic/{common => java}/JavaPackage.kt (100%) diff --git a/idea/idea-completion/testData/basic/common/JavaPackage.kt b/idea/idea-completion/testData/basic/java/JavaPackage.kt similarity index 100% rename from idea/idea-completion/testData/basic/common/JavaPackage.kt rename to idea/idea-completion/testData/basic/java/JavaPackage.kt diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java index da7bc44ed30..833563c665f 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java @@ -475,12 +475,6 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes doTest(fileName); } - @TestMetadata("JavaPackage.kt") - public void testJavaPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); - doTest(fileName); - } - @TestMetadata("KT10664.kt") public void testKT10664() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/KT10664.kt"); diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index db13a31ec48..8d0a4712bc3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java @@ -475,12 +475,6 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT doTest(fileName); } - @TestMetadata("JavaPackage.kt") - public void testJavaPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); - doTest(fileName); - } - @TestMetadata("KT10664.kt") public void testKT10664() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/KT10664.kt"); @@ -2743,6 +2737,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT doTest(fileName); } + @TestMetadata("JavaPackage.kt") + public void testJavaPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/JavaPackage.kt"); + doTest(fileName); + } + @TestMetadata("KProperty.kt") public void testKProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/KProperty.kt");