From e2c7ba7f40c67dbd42700ef8d3326fa0c4592617 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 15 Oct 2015 19:17:26 +0300 Subject: [PATCH] Changed test data to not use deprecated api --- .../basic/AnnotationInClassAddImport.kt | 5 ++++ .../basic/AnnotationInClassAddImport.kt.after | 7 ++++++ .../AnnotationInCompanionObjectAddImport.kt | 9 +++++++ ...otationInCompanionObjectAddImport.kt.after | 9 +++++++ .../handlers/basic/PlatformStaticInClass.kt | 5 ---- .../basic/PlatformStaticInClass.kt.after | 7 ------ .../basic/PlatformStaticInCompanionObject.kt | 7 ------ .../PlatformStaticInCompanionObject.kt.after | 9 ------- .../BasicCompletionHandlerTestGenerated.java | 24 +++++++++---------- 9 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt create mode 100644 idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after create mode 100644 idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt create mode 100644 idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after delete mode 100644 idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after delete mode 100644 idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt delete mode 100644 idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt b/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt new file mode 100644 index 00000000000..2dac4bd7985 --- /dev/null +++ b/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt @@ -0,0 +1,5 @@ +class A { + @Inh +} + +// ELEMENT: Inherited \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after b/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after new file mode 100644 index 00000000000..1b445a21336 --- /dev/null +++ b/idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt.after @@ -0,0 +1,7 @@ +import java.lang.annotation.Inherited + +class A { + @Inherited +} + +// ELEMENT: Inherited \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt b/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt new file mode 100644 index 00000000000..23827ac397d --- /dev/null +++ b/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt @@ -0,0 +1,9 @@ +import java.lang.annotation.Inherited + +class A { + companion object { + @Inh + } +} + +// ELEMENT: Inherited diff --git a/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after b/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after new file mode 100644 index 00000000000..3afb64277a5 --- /dev/null +++ b/idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt.after @@ -0,0 +1,9 @@ +import java.lang.annotation.Inherited + +class A { + companion object { + @Inherited + } +} + +// ELEMENT: Inherited diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt deleted file mode 100644 index eb6c80e06ad..00000000000 --- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt +++ /dev/null @@ -1,5 +0,0 @@ -class A { - @pl -} - -// ELEMENT: platformStatic \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after deleted file mode 100644 index 119077b86cd..00000000000 --- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -import kotlin.platform.platformStatic - -class A { - @platformStatic -} - -// ELEMENT: platformStatic \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt deleted file mode 100644 index 2552910f224..00000000000 --- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -class A { - companion object { - @pl - } -} - -// ELEMENT: platformStatic \ No newline at end of file diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after deleted file mode 100644 index 740d6dc28b8..00000000000 --- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after +++ /dev/null @@ -1,9 +0,0 @@ -import kotlin.platform.platformStatic - -class A { - companion object { - @platformStatic - } -} - -// ELEMENT: platformStatic \ No newline at end of file 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 1ddcac2370c..2aeaf03eb29 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 @@ -35,6 +35,18 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("AnnotationInClassAddImport.kt") + public void testAnnotationInClassAddImport() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt"); + doTest(fileName); + } + + @TestMetadata("AnnotationInCompanionObjectAddImport.kt") + public void testAnnotationInCompanionObjectAddImport() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt"); + doTest(fileName); + } + @TestMetadata("ClassWithClassObject.kt") public void testClassWithClassObject() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt"); @@ -95,18 +107,6 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion doTest(fileName); } - @TestMetadata("PlatformStaticInClass.kt") - public void testPlatformStaticInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt"); - doTest(fileName); - } - - @TestMetadata("PlatformStaticInCompanionObject.kt") - public void testPlatformStaticInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt"); - doTest(fileName); - } - @TestMetadata("PreferMatchingKeyword.kt") public void testPreferMatchingKeyword() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PreferMatchingKeyword.kt");