From 64e9ecc7b4de192cb15d00b74297360866568a22 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 4 Jun 2015 19:29:34 +0300 Subject: [PATCH] Moved test data --- .../basic/{ExclChar1.kt => exclChar/1.kt} | 0 .../1.kt.after} | 0 .../basic/{ExclChar2.kt => exclChar/2.kt} | 0 .../2.kt.after} | 0 .../basic/{ExclChar3.kt => exclChar/3.kt} | 0 .../3.kt.after} | 0 .../basic/{ExclChar4.kt => exclChar/4.kt} | 0 .../4.kt.after} | 0 .../basic/{ExclChar5.kt => exclChar/5.kt} | 0 .../5.kt.after} | 0 .../BasicCompletionHandlerTestGenerated.java | 69 +++++++++++-------- 11 files changed, 39 insertions(+), 30 deletions(-) rename idea/idea-completion/testData/handlers/basic/{ExclChar1.kt => exclChar/1.kt} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar1.kt.after => exclChar/1.kt.after} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar2.kt => exclChar/2.kt} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar2.kt.after => exclChar/2.kt.after} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar3.kt => exclChar/3.kt} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar3.kt.after => exclChar/3.kt.after} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar4.kt => exclChar/4.kt} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar4.kt.after => exclChar/4.kt.after} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar5.kt => exclChar/5.kt} (100%) rename idea/idea-completion/testData/handlers/basic/{ExclChar5.kt.after => exclChar/5.kt.after} (100%) diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar1.kt b/idea/idea-completion/testData/handlers/basic/exclChar/1.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar1.kt rename to idea/idea-completion/testData/handlers/basic/exclChar/1.kt diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar1.kt.after b/idea/idea-completion/testData/handlers/basic/exclChar/1.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar1.kt.after rename to idea/idea-completion/testData/handlers/basic/exclChar/1.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar2.kt b/idea/idea-completion/testData/handlers/basic/exclChar/2.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar2.kt rename to idea/idea-completion/testData/handlers/basic/exclChar/2.kt diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar2.kt.after b/idea/idea-completion/testData/handlers/basic/exclChar/2.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar2.kt.after rename to idea/idea-completion/testData/handlers/basic/exclChar/2.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar3.kt b/idea/idea-completion/testData/handlers/basic/exclChar/3.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar3.kt rename to idea/idea-completion/testData/handlers/basic/exclChar/3.kt diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar3.kt.after b/idea/idea-completion/testData/handlers/basic/exclChar/3.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar3.kt.after rename to idea/idea-completion/testData/handlers/basic/exclChar/3.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar4.kt b/idea/idea-completion/testData/handlers/basic/exclChar/4.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar4.kt rename to idea/idea-completion/testData/handlers/basic/exclChar/4.kt diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar4.kt.after b/idea/idea-completion/testData/handlers/basic/exclChar/4.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar4.kt.after rename to idea/idea-completion/testData/handlers/basic/exclChar/4.kt.after diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar5.kt b/idea/idea-completion/testData/handlers/basic/exclChar/5.kt similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar5.kt rename to idea/idea-completion/testData/handlers/basic/exclChar/5.kt diff --git a/idea/idea-completion/testData/handlers/basic/ExclChar5.kt.after b/idea/idea-completion/testData/handlers/basic/exclChar/5.kt.after similarity index 100% rename from idea/idea-completion/testData/handlers/basic/ExclChar5.kt.after rename to idea/idea-completion/testData/handlers/basic/exclChar/5.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 612699542e5..90ca98858d6 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 @@ -47,36 +47,6 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion doTest(fileName); } - @TestMetadata("ExclChar1.kt") - public void testExclChar1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExclChar1.kt"); - doTest(fileName); - } - - @TestMetadata("ExclChar2.kt") - public void testExclChar2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExclChar2.kt"); - doTest(fileName); - } - - @TestMetadata("ExclChar3.kt") - public void testExclChar3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExclChar3.kt"); - doTest(fileName); - } - - @TestMetadata("ExclChar4.kt") - public void testExclChar4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExclChar4.kt"); - doTest(fileName); - } - - @TestMetadata("ExclChar5.kt") - public void testExclChar5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExclChar5.kt"); - doTest(fileName); - } - @TestMetadata("ExtensionReceiverTypeArg.kt") public void testExtensionReceiverTypeArg() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExtensionReceiverTypeArg.kt"); @@ -149,6 +119,45 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion doTest(fileName); } + @TestMetadata("idea/idea-completion/testData/handlers/basic/exclChar") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ExclChar extends AbstractBasicCompletionHandlerTest { + @TestMetadata("1.kt") + public void test1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/1.kt"); + doTest(fileName); + } + + @TestMetadata("2.kt") + public void test2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/2.kt"); + doTest(fileName); + } + + @TestMetadata("3.kt") + public void test3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/3.kt"); + doTest(fileName); + } + + @TestMetadata("4.kt") + public void test4() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/4.kt"); + doTest(fileName); + } + + @TestMetadata("5.kt") + public void test5() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/5.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInExclChar() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/exclChar"), Pattern.compile("^(.+)\\.kt$"), true); + } + } + @TestMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)