From 0c14058d1330b3acecd4dbef7a5e8ae0538a9652 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 10 Oct 2016 16:27:10 +0300 Subject: [PATCH] Moved tests --- .../{ => annotation}/AnnotationInBrackets.kt | 0 .../AnnotationInBrackets.kt.after | 0 .../AnnotationInClassAddImport.kt | 0 .../AnnotationInClassAddImport.kt.after | 0 .../AnnotationInCompanionObjectAddImport.kt | 0 ...otationInCompanionObjectAddImport.kt.after | 0 .../BasicCompletionHandlerTestGenerated.java | 45 +++++++++++-------- 7 files changed, 27 insertions(+), 18 deletions(-) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInBrackets.kt (100%) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInBrackets.kt.after (100%) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInClassAddImport.kt (100%) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInClassAddImport.kt.after (100%) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInCompanionObjectAddImport.kt (100%) rename idea/idea-completion/testData/handlers/basic/{ => annotation}/AnnotationInCompanionObjectAddImport.kt.after (100%) diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInBrackets.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInBrackets.kt diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt.after b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInBrackets.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt.after rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInBrackets.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInClassAddImport.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInClassAddImport.kt diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInClassAddImport.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInClassAddImport.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInCompanionObjectAddImport.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInCompanionObjectAddImport.kt diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after b/idea/idea-completion/testData/handlers/basic/annotation/AnnotationInCompanionObjectAddImport.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after rename to idea/idea-completion/testData/handlers/basic/annotation/AnnotationInCompanionObjectAddImport.kt.after diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java index 4ac5ddd1645..fc1e8aeb129 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java @@ -41,24 +41,6 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("AnnotationInBrackets.kt") - public void testAnnotationInBrackets() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt"); - doTest(fileName); - } - - @TestMetadata("AnnotationInClassAddImport.kt") - public void testAnnotationInClassAddImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt"); - doTest(fileName); - } - - @TestMetadata("AnnotationInCompanionObjectAddImport.kt") - public void testAnnotationInCompanionObjectAddImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt"); - doTest(fileName); - } - @TestMetadata("ClassKeywordBeforeName.kt") public void testClassKeywordBeforeName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassKeywordBeforeName.kt"); @@ -221,6 +203,33 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion doTest(fileName); } + @TestMetadata("idea/idea-completion/testData/handlers/basic/annotation") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Annotation extends AbstractBasicCompletionHandlerTest { + public void testAllFilesPresentInAnnotation() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/annotation"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("AnnotationInBrackets.kt") + public void testAnnotationInBrackets() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/annotation/AnnotationInBrackets.kt"); + doTest(fileName); + } + + @TestMetadata("AnnotationInClassAddImport.kt") + public void testAnnotationInClassAddImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/annotation/AnnotationInClassAddImport.kt"); + doTest(fileName); + } + + @TestMetadata("AnnotationInCompanionObjectAddImport.kt") + public void testAnnotationInCompanionObjectAddImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/annotation/AnnotationInCompanionObjectAddImport.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/idea-completion/testData/handlers/basic/callableReference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)