From 2a73247566e14cbad4dcc19a2bec7b56eb423059 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Sat, 6 Jun 2015 02:40:20 +0300 Subject: [PATCH] Find Usages: Rename test class and move test data --- .../kotlin/generators/tests/GenerateTests.kt | 6 +- .../_library/library/Foo.java | 0 .../_library/library/library.kt | 0 .../javaLibrary/LibraryClassUsages.0.kt | 0 .../LibraryClassUsages.results.txt | 0 .../javaLibrary/LibraryConstructorUsages.0.kt | 0 .../LibraryConstructorUsages.results.txt | 0 .../javaLibrary/LibraryFieldUsages.0.kt | 0 .../LibraryFieldUsages.results.txt | 0 .../javaLibrary/LibraryMethodUsages.0.kt | 0 .../LibraryMethodUsages.results.txt | 0 .../javaLibrary/LibraryStaticFieldUsages.0.kt | 0 .../LibraryStaticFieldUsages.results.txt | 0 .../LibraryStaticMethodUsages.0.kt | 0 .../LibraryStaticMethodUsages.results.txt | 0 .../kotlinLibrary/LibraryClassUsages.0.kt | 0 .../kotlinLibrary/LibraryClassUsages.1.java | 0 .../LibraryClassUsages.results.txt | 0 .../kotlinLibrary/LibraryFunctionUsages.0.kt | 0 .../LibraryFunctionUsages.1.java | 0 .../LibraryFunctionUsages.results.txt | 0 .../LibraryMemberFunctionUsages.0.kt | 0 .../LibraryMemberFunctionUsages.1.java | 0 .../LibraryMemberFunctionUsages.results.txt | 0 ...ibraryNestedClassMemberFunctionUsages.0.kt | 0 ...raryNestedClassMemberFunctionUsages.1.java | 0 ...estedClassMemberFunctionUsages.results.txt | 0 ...ryNestedClassPrimaryConstructorUsages.0.kt | 0 ...NestedClassPrimaryConstructorUsages.1.java | 0 ...dClassPrimaryConstructorUsages.results.txt | 0 ...NestedClassSecondaryConstructorUsages.0.kt | 0 ...stedClassSecondaryConstructorUsages.1.java | 0 ...lassSecondaryConstructorUsages.results.txt | 0 .../LibraryNestedClassUsages.0.kt | 0 .../LibraryNestedClassUsages.1.java | 0 .../LibraryNestedClassUsages.results.txt | 0 .../kotlinLibrary/LibraryObjectUsages.0.kt | 0 .../kotlinLibrary/LibraryObjectUsages.1.java | 0 .../LibraryObjectUsages.results.txt | 0 .../LibraryPrimaryConstructorUsages.0.kt | 0 .../LibraryPrimaryConstructorUsages.1.java | 0 ...ibraryPrimaryConstructorUsages.results.txt | 0 .../LibrarySecondaryConstructorUsages.0.kt | 0 .../LibrarySecondaryConstructorUsages.1.java | 0 ...rarySecondaryConstructorUsages.results.txt | 0 ...bstractKotlinFindUsagesWithLibraryTest.kt} | 4 +- ...inFindUsagesWithLibraryTestGenerated.java} | 62 +++++++++++-------- 47 files changed, 41 insertions(+), 31 deletions(-) rename idea/testData/findUsages/{ => libraryUsages}/_library/library/Foo.java (100%) rename idea/testData/findUsages/{ => libraryUsages}/_library/library/library.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryClassUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryClassUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryConstructorUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryConstructorUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryFieldUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryFieldUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryMethodUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryMethodUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryStaticFieldUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryStaticFieldUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryStaticMethodUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/javaLibrary/LibraryStaticMethodUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryClassUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryClassUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryClassUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryFunctionUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryFunctionUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryFunctionUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryMemberFunctionUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryMemberFunctionUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryMemberFunctionUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryNestedClassUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryObjectUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryObjectUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryObjectUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryPrimaryConstructorUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibrarySecondaryConstructorUsages.1.java (100%) rename idea/testData/findUsages/{librarySources => libraryUsages}/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt (100%) rename idea/tests/org/jetbrains/kotlin/findUsages/{AbstractKotlinFindUsagesInLibrarySourceTest.kt => AbstractKotlinFindUsagesWithLibraryTest.kt} (85%) rename idea/tests/org/jetbrains/kotlin/findUsages/{KotlinFindUsagesInLibrarySourceTestGenerated.java => KotlinFindUsagesWithLibraryTestGenerated.java} (68%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index fac4c48d901..792e0fcd107 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxInlineCodegenTest import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest -import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesInLibrarySourceTest +import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.* @@ -504,8 +504,8 @@ fun main(args: Array) { model("findUsages/java", pattern = """^(.+)\.0\.java$""") } - testClass(javaClass()) { - model("findUsages/librarySources", pattern = """^(.+)\.0\.kt$""") + testClass(javaClass()) { + model("findUsages/libraryUsages", pattern = """^(.+)\.0\.kt$""") } testClass(javaClass()) { diff --git a/idea/testData/findUsages/_library/library/Foo.java b/idea/testData/findUsages/libraryUsages/_library/library/Foo.java similarity index 100% rename from idea/testData/findUsages/_library/library/Foo.java rename to idea/testData/findUsages/libraryUsages/_library/library/Foo.java diff --git a/idea/testData/findUsages/_library/library/library.kt b/idea/testData/findUsages/libraryUsages/_library/library/library.kt similarity index 100% rename from idea/testData/findUsages/_library/library/library.kt rename to idea/testData/findUsages/libraryUsages/_library/library/library.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryClassUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryClassUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryConstructorUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryConstructorUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryFieldUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryFieldUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryMethodUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryMethodUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryMethodUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticFieldUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticFieldUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticFieldUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticMethodUsages.0.kt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticMethodUsages.0.kt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticMethodUsages.results.txt rename to idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.1.java similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.1.java rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.1.java diff --git a/idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt similarity index 100% rename from idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesInLibrarySourceTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt similarity index 85% rename from idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesInLibrarySourceTest.kt rename to idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt index 82f23feb6fb..c79b4a83bfd 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesInLibrarySourceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -public abstract class AbstractKotlinFindUsagesInLibrarySourceTest: AbstractJetFindUsagesTest() { +public abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractJetFindUsagesTest() { override fun getProjectDescriptor() = - JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/findUsages/_library", true) + JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/findUsages/libraryUsages/_library", true) } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesInLibrarySourceTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java similarity index 68% rename from idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesInLibrarySourceTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java index 3295197a29d..37ce774d32a 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesInLibrarySourceTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java @@ -27,125 +27,135 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("idea/testData/findUsages/librarySources") +@TestMetadata("idea/testData/findUsages/libraryUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class KotlinFindUsagesInLibrarySourceTestGenerated extends AbstractKotlinFindUsagesInLibrarySourceTest { - public void testAllFilesPresentInLibrarySources() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/librarySources"), Pattern.compile("^(.+)\\.0\\.kt$"), true); +public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFindUsagesWithLibraryTest { + public void testAllFilesPresentInLibraryUsages() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } - @TestMetadata("idea/testData/findUsages/librarySources/javaLibrary") + @TestMetadata("idea/testData/findUsages/libraryUsages/javaLibrary") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaLibrary extends AbstractKotlinFindUsagesInLibrarySourceTest { + public static class JavaLibrary extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentInJavaLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/librarySources/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("LibraryClassUsages.0.kt") public void testLibraryClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryClassUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryConstructorUsages.0.kt") public void testLibraryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryConstructorUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryFieldUsages.0.kt") public void testLibraryFieldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryFieldUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryMethodUsages.0.kt") public void testLibraryMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryMethodUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryStaticFieldUsages.0.kt") public void testLibraryStaticFieldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticFieldUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryStaticMethodUsages.0.kt") public void testLibraryStaticMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/javaLibrary/LibraryStaticMethodUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt"); doTest(fileName); } } - @TestMetadata("idea/testData/findUsages/librarySources/kotlinLibrary") + @TestMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinLibrary extends AbstractKotlinFindUsagesInLibrarySourceTest { + public static class KotlinLibrary extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentInKotlinLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/librarySources/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("LibraryClassUsages.0.kt") public void testLibraryClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryClassUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryFunctionUsages.0.kt") public void testLibraryFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryFunctionUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryMemberFunctionUsages.0.kt") public void testLibraryMemberFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryMemberFunctionUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassMemberFunctionUsages.0.kt") public void testLibraryNestedClassMemberFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassPrimaryConstructorUsages.0.kt") public void testLibraryNestedClassPrimaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassSecondaryConstructorUsages.0.kt") public void testLibraryNestedClassSecondaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassUsages.0.kt") public void testLibraryNestedClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryNestedClassUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryObjectUsages.0.kt") public void testLibraryObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryObjectUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryPrimaryConstructorUsages.0.kt") public void testLibraryPrimaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibrarySecondaryConstructorUsages.0.kt") public void testLibrarySecondaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/librarySources/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt"); doTest(fileName); } } + + @TestMetadata("idea/testData/findUsages/libraryUsages/_library") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class _library extends AbstractKotlinFindUsagesWithLibraryTest { + public void testAllFilesPresentIn_library() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + } + + } }