From fde1890de96502d24def3f26bf42ae5fdb97e436 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sun, 11 Jan 2015 13:29:59 +0100 Subject: [PATCH] More tests #KT-1670 Fixed #KT-2690 Fixed --- .../common/annotations/FunctionAnnotation1.kt | 11 ++++ .../common/annotations/FunctionAnnotation2.kt | 10 ++++ ...ation7.kt.todo => ParameterAnnotation7.kt} | 0 .../common/annotations/TopLevelAnnotation1.kt | 10 ++++ .../common/annotations/TopLevelAnnotation2.kt | 10 ++++ .../common/annotations/TopLevelAnnotation3.kt | 11 ++++ .../common/annotations/TopLevelAnnotation4.kt | 11 ++++ .../annotations/TopLevelAnnotationArg1.kt | 6 +++ .../annotations/TopLevelAnnotationArg2.kt | 7 +++ .../JSBasicCompletionTestGenerated.java | 54 +++++++++++++++++++ .../JvmBasicCompletionTestGenerated.java | 54 +++++++++++++++++++ 11 files changed, 184 insertions(+) create mode 100644 idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt create mode 100644 idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt rename idea/testData/completion/basic/common/annotations/{ParameterAnnotation7.kt.todo => ParameterAnnotation7.kt} (100%) create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt create mode 100644 idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt diff --git a/idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt b/idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt new file mode 100644 index 00000000000..82ad91356f6 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt @@ -0,0 +1,11 @@ +annotation class Hello +val v = 1 + + +fun some() {} + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt b/idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt new file mode 100644 index 00000000000..639f9f1f048 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt @@ -0,0 +1,10 @@ +annotation class Hello +val v = 1 + +[] fun some() {} + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt.todo b/idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt similarity index 100% rename from idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt.todo rename to idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt new file mode 100644 index 00000000000..813017f2026 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt @@ -0,0 +1,10 @@ +annotation class Hello +val v = 1 + + + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt new file mode 100644 index 00000000000..d49a98f5c40 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt @@ -0,0 +1,10 @@ +annotation class Hello +val v = 1 + +[] + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt new file mode 100644 index 00000000000..d476c3f67b3 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt @@ -0,0 +1,11 @@ +annotation class Hello +val v = 1 + + +class C + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt new file mode 100644 index 00000000000..16ecf965813 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt @@ -0,0 +1,11 @@ +annotation class Hello +val v = 1 + +[] +class C + +// INVOCATION_COUNT: 0 +// EXIST: Hello +// EXIST: inlineOptions +// ABSENT: String +// ABSENT: v diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt new file mode 100644 index 00000000000..2bf71dd2bff --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt @@ -0,0 +1,6 @@ +import java.lang.annotation.* + +Retention( + +// INVOCATION_COUNT: 0 +// EXIST_JAVA_ONLY: RetentionPolicy diff --git a/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt b/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt new file mode 100644 index 00000000000..403d251f2c7 --- /dev/null +++ b/idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt @@ -0,0 +1,7 @@ +import java.lang.annotation.* + +Retention(RetentionPolicy. + +// INVOCATION_COUNT: 0 +// EXIST_JAVA_ONLY: SOURCE +// EXIST_JAVA_ONLY: CLASS diff --git a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java index f9cee1bce7c..9897177c5cc 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java @@ -900,6 +900,18 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("FunctionAnnotation1.kt") + public void testFunctionAnnotation1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt"); + doTest(fileName); + } + + @TestMetadata("FunctionAnnotation2.kt") + public void testFunctionAnnotation2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt"); + doTest(fileName); + } + @TestMetadata("NoParameterAnnotationAutoPopup1.kt") public void testNoParameterAnnotationAutoPopup1() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/NoParameterAnnotationAutoPopup1.kt"); @@ -948,6 +960,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes doTest(fileName); } + @TestMetadata("ParameterAnnotation7.kt") + public void testParameterAnnotation7() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt"); + doTest(fileName); + } + @TestMetadata("ParameterAnnotation8.kt") public void testParameterAnnotation8() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation8.kt"); @@ -977,6 +995,42 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); doTest(fileName); } + + @TestMetadata("TopLevelAnnotation1.kt") + public void testTopLevelAnnotation1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation2.kt") + public void testTopLevelAnnotation2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation3.kt") + public void testTopLevelAnnotation3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation4.kt") + public void testTopLevelAnnotation4() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotationArg1.kt") + public void testTopLevelAnnotationArg1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotationArg2.kt") + public void testTopLevelAnnotationArg2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt"); + doTest(fileName); + } } @TestMetadata("idea/testData/completion/basic/common/extensions") diff --git a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java index 4fbea8317e8..9e729fda75d 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java @@ -900,6 +900,18 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("FunctionAnnotation1.kt") + public void testFunctionAnnotation1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation1.kt"); + doTest(fileName); + } + + @TestMetadata("FunctionAnnotation2.kt") + public void testFunctionAnnotation2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/FunctionAnnotation2.kt"); + doTest(fileName); + } + @TestMetadata("NoParameterAnnotationAutoPopup1.kt") public void testNoParameterAnnotationAutoPopup1() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/NoParameterAnnotationAutoPopup1.kt"); @@ -948,6 +960,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT doTest(fileName); } + @TestMetadata("ParameterAnnotation7.kt") + public void testParameterAnnotation7() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation7.kt"); + doTest(fileName); + } + @TestMetadata("ParameterAnnotation8.kt") public void testParameterAnnotation8() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotation8.kt"); @@ -977,6 +995,42 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); doTest(fileName); } + + @TestMetadata("TopLevelAnnotation1.kt") + public void testTopLevelAnnotation1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation1.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation2.kt") + public void testTopLevelAnnotation2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation2.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation3.kt") + public void testTopLevelAnnotation3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation3.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotation4.kt") + public void testTopLevelAnnotation4() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotation4.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotationArg1.kt") + public void testTopLevelAnnotationArg1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg1.kt"); + doTest(fileName); + } + + @TestMetadata("TopLevelAnnotationArg2.kt") + public void testTopLevelAnnotationArg2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/annotations/TopLevelAnnotationArg2.kt"); + doTest(fileName); + } } @TestMetadata("idea/testData/completion/basic/common/extensions")