From 64e520b689ea0652a6bcf20e48e0dd495f29de1e Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 2 Sep 2015 20:13:12 +0300 Subject: [PATCH] Moved test data --- .../annotation.after.Declaration.kt} | 0 .../annotation.after.Other.kt} | 0 .../annotation.after.kt} | 0 .../annotation.before.Declaration.kt} | 0 .../annotation.before.Main.kt} | 0 .../annotation.before.Other.kt} | 0 .../QuickFixMultiFileTestGenerated.java | 17 +++++++++++++---- .../idea/quickfix/QuickFixTestGenerated.java | 1 + 8 files changed, 14 insertions(+), 4 deletions(-) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.after.Declaration.kt => wholeProject/annotation.after.Declaration.kt} (100%) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.after.Other.kt => wholeProject/annotation.after.Other.kt} (100%) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.after.kt => wholeProject/annotation.after.kt} (100%) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.before.Declaration.kt => wholeProject/annotation.before.Declaration.kt} (100%) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.before.Main.kt => wholeProject/annotation.before.Main.kt} (100%) rename idea/testData/quickfix/deprecatedSymbolUsage/classUsages/{inWholeProject.before.Other.kt => wholeProject/annotation.before.Other.kt} (100%) diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.Declaration.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.Declaration.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.Declaration.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.Declaration.kt diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.Other.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.Other.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.Other.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.Other.kt diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.after.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.after.kt diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Declaration.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Declaration.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Declaration.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Declaration.kt diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Main.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Main.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Main.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Main.kt diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Other.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Other.kt similarity index 100% rename from idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Other.kt rename to idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Other.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index 87e629eacdb..1bd019e4967 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -920,10 +920,19 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - @TestMetadata("inWholeProject.before.Main.kt") - public void testInWholeProject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inWholeProject.before.Main.kt"); - doTestWithExtraFile(fileName); + @TestMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class WholeProject extends AbstractQuickFixMultiFileTest { + public void testAllFilesPresentInWholeProject() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); + } + + @TestMetadata("annotation.before.Main.kt") + public void testAnnotation() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Main.kt"); + doTestWithExtraFile(fileName); + } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 5240f2f7139..8979ec50707 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -3383,6 +3383,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/simple.kt"); doTest(fileName); } + } @TestMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments")