From 0d992ee38fe6e70aa6aaea142192de16cfba6955 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 4 Jun 2015 22:45:44 +0300 Subject: [PATCH] Moved tests --- .../smart/{Vararg1.kt => vararg/1.kt} | 0 .../smart/{Vararg2.kt => vararg/2.kt} | 0 .../smart/{Vararg3.kt => vararg/3.kt} | 0 .../smart/{Vararg4.kt => vararg/4.kt} | 0 .../AfterStar.kt} | 0 .../NamedArgumentAfterStar.kt} | 0 .../smart/{ => vararg}/SecondVararg.kt | 0 .../test/JvmSmartCompletionTestGenerated.java | 93 ++++++++++--------- 8 files changed, 51 insertions(+), 42 deletions(-) rename idea/idea-completion/testData/smart/{Vararg1.kt => vararg/1.kt} (100%) rename idea/idea-completion/testData/smart/{Vararg2.kt => vararg/2.kt} (100%) rename idea/idea-completion/testData/smart/{Vararg3.kt => vararg/3.kt} (100%) rename idea/idea-completion/testData/smart/{Vararg4.kt => vararg/4.kt} (100%) rename idea/idea-completion/testData/smart/{VarargAfterStar.kt => vararg/AfterStar.kt} (100%) rename idea/idea-completion/testData/smart/{NamedVarargAfterStar.kt => vararg/NamedArgumentAfterStar.kt} (100%) rename idea/idea-completion/testData/smart/{ => vararg}/SecondVararg.kt (100%) diff --git a/idea/idea-completion/testData/smart/Vararg1.kt b/idea/idea-completion/testData/smart/vararg/1.kt similarity index 100% rename from idea/idea-completion/testData/smart/Vararg1.kt rename to idea/idea-completion/testData/smart/vararg/1.kt diff --git a/idea/idea-completion/testData/smart/Vararg2.kt b/idea/idea-completion/testData/smart/vararg/2.kt similarity index 100% rename from idea/idea-completion/testData/smart/Vararg2.kt rename to idea/idea-completion/testData/smart/vararg/2.kt diff --git a/idea/idea-completion/testData/smart/Vararg3.kt b/idea/idea-completion/testData/smart/vararg/3.kt similarity index 100% rename from idea/idea-completion/testData/smart/Vararg3.kt rename to idea/idea-completion/testData/smart/vararg/3.kt diff --git a/idea/idea-completion/testData/smart/Vararg4.kt b/idea/idea-completion/testData/smart/vararg/4.kt similarity index 100% rename from idea/idea-completion/testData/smart/Vararg4.kt rename to idea/idea-completion/testData/smart/vararg/4.kt diff --git a/idea/idea-completion/testData/smart/VarargAfterStar.kt b/idea/idea-completion/testData/smart/vararg/AfterStar.kt similarity index 100% rename from idea/idea-completion/testData/smart/VarargAfterStar.kt rename to idea/idea-completion/testData/smart/vararg/AfterStar.kt diff --git a/idea/idea-completion/testData/smart/NamedVarargAfterStar.kt b/idea/idea-completion/testData/smart/vararg/NamedArgumentAfterStar.kt similarity index 100% rename from idea/idea-completion/testData/smart/NamedVarargAfterStar.kt rename to idea/idea-completion/testData/smart/vararg/NamedArgumentAfterStar.kt diff --git a/idea/idea-completion/testData/smart/SecondVararg.kt b/idea/idea-completion/testData/smart/vararg/SecondVararg.kt similarity index 100% rename from idea/idea-completion/testData/smart/SecondVararg.kt rename to idea/idea-completion/testData/smart/vararg/SecondVararg.kt diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java index 97b1a346227..6df4fe84120 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java @@ -269,12 +269,6 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT doTest(fileName); } - @TestMetadata("NamedVarargAfterStar.kt") - public void testNamedVarargAfterStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NamedVarargAfterStar.kt"); - doTest(fileName); - } - @TestMetadata("NoExtensionMethodFromClassObject.kt") public void testNoExtensionMethodFromClassObject() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoExtensionMethodFromClassObject.kt"); @@ -377,12 +371,6 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT doTest(fileName); } - @TestMetadata("SecondVararg.kt") - public void testSecondVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SecondVararg.kt"); - doTest(fileName); - } - @TestMetadata("SkipDeclarationsOfType.kt") public void testSkipDeclarationsOfType() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SkipDeclarationsOfType.kt"); @@ -401,36 +389,6 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT doTest(fileName); } - @TestMetadata("Vararg1.kt") - public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Vararg1.kt"); - doTest(fileName); - } - - @TestMetadata("Vararg2.kt") - public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Vararg2.kt"); - doTest(fileName); - } - - @TestMetadata("Vararg3.kt") - public void testVararg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Vararg3.kt"); - doTest(fileName); - } - - @TestMetadata("Vararg4.kt") - public void testVararg4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Vararg4.kt"); - doTest(fileName); - } - - @TestMetadata("VarargAfterStar.kt") - public void testVarargAfterStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VarargAfterStar.kt"); - doTest(fileName); - } - @TestMetadata("VariableAsFunction1.kt") public void testVariableAsFunction1() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableAsFunction1.kt"); @@ -1310,6 +1268,57 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT } } + @TestMetadata("idea/idea-completion/testData/smart/vararg") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Vararg extends AbstractJvmSmartCompletionTest { + @TestMetadata("1.kt") + public void test1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/1.kt"); + doTest(fileName); + } + + @TestMetadata("2.kt") + public void test2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/2.kt"); + doTest(fileName); + } + + @TestMetadata("3.kt") + public void test3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/3.kt"); + doTest(fileName); + } + + @TestMetadata("4.kt") + public void test4() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/4.kt"); + doTest(fileName); + } + + @TestMetadata("AfterStar.kt") + public void testAfterStar() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/AfterStar.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInVararg() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("NamedArgumentAfterStar.kt") + public void testNamedArgumentAfterStar() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/NamedArgumentAfterStar.kt"); + doTest(fileName); + } + + @TestMetadata("SecondVararg.kt") + public void testSecondVararg() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/SecondVararg.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/idea-completion/testData/smart/whenEntry") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)