From dc1f2d5b5fe326d84e666a5da90885ce3cc8dae0 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sun, 28 Aug 2016 11:11:46 +0300 Subject: [PATCH] And one more split test --- .../conventions/components/dataClass.log | 16 +--------------- .../components/dataClass.results.txt | 4 +--- ...lass.3.kt => dataClassInsideDataClass.0.kt} | 4 +++- .../components/dataClassInsideDataClass.log | 18 ++++++++++++++++++ .../dataClassInsideDataClass.results.txt | 2 ++ .../findUsages/FindUsagesTestGenerated.java | 6 ++++++ 6 files changed, 31 insertions(+), 19 deletions(-) rename idea/testData/findUsages/kotlin/conventions/components/{dataClass.3.kt => dataClassInsideDataClass.0.kt} (64%) create mode 100644 idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log create mode 100644 idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log index ce4e6fd83e0..8dd62238ccb 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log @@ -1,31 +1,17 @@ Searched inheritors of pack.A -Searched inheritors of pack.B -Searched inheritors of pack.C Searched references to JavaClass.getA() in Kotlin files Searched references to a in Kotlin files -Searched references to a in Kotlin files -Searched references to a1 in Kotlin files Searched references to f() in Kotlin files Searched references to g() in Kotlin files Searched references to h() in Kotlin files Searched references to list in Kotlin files Searched references to listOfA() in Kotlin files Searched references to pack.A -Searched references to pack.B -Searched references to pack.C -Searched references to pack.C.component1() in Kotlin files -Searched references to parameter a in B() in Kotlin files Searched references to parameter a in null in Kotlin files -Searched references to parameter b in pack.f() in Kotlin files -Searched references to parameter c in pack.f() in Kotlin files Used plain search in LocalSearchScope: CLASS:A FUN:ext1 FUN:ext1 FUN:x KtWhenEntry "else" - KtWhenEntry "is A" -Used plain search in LocalSearchScope: - CLASS:B -Used plain search in LocalSearchScope: - CLASS:C \ No newline at end of file + KtWhenEntry "is A" \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt index edd5cc1dae1..25bb434ee10 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt @@ -14,6 +14,4 @@ [dataClass.2.kt] Value read 5 a.n [dataClass.2.kt] Value read 53 val (x, y) = o [dataClass.2.kt] Value read 8 val (x, y, z) = a -[dataClass.2.kt] Value read 9 val (x1, y1, z1) = f() -[dataClass.3.kt] Value read 12 val (x, y, z) = a -[dataClass.3.kt] Value read 15 val (x1, y1, z1) = a1 \ No newline at end of file +[dataClass.2.kt] Value read 9 val (x1, y1, z1) = f() \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.3.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt similarity index 64% rename from idea/testData/findUsages/kotlin/conventions/components/dataClass.3.kt rename to idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt index d8da6cfa35f..9169d9a5b32 100644 --- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.3.kt +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt @@ -1,5 +1,7 @@ -package pack +// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter +// OPTIONS: usages +data class A(val x: Int, val y: Int, val z: String) data class B(val a: A, val n: Int) class C { diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log new file mode 100644 index 00000000000..d4acf0d6855 --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.log @@ -0,0 +1,18 @@ +Searched inheritors of A +Searched inheritors of B +Searched inheritors of C +Searched references to A +Searched references to B +Searched references to C +Searched references to C.component1() in Kotlin files +Searched references to a in Kotlin files +Searched references to a1 in Kotlin files +Searched references to parameter a in B() in Kotlin files +Searched references to parameter b in f() in Kotlin files +Searched references to parameter c in f() in Kotlin files +Used plain search in LocalSearchScope: + CLASS:A +Used plain search in LocalSearchScope: + CLASS:B +Used plain search in LocalSearchScope: + CLASS:C diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt new file mode 100644 index 00000000000..609852519cc --- /dev/null +++ b/idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.results.txt @@ -0,0 +1,2 @@ +Value read 14 val (x, y, z) = a +Value read 17 val (x1, y1, z1) = a1 diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java index 10c2974ebde..7a44a56de0d 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java @@ -200,6 +200,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest { doTest(fileName); } + @TestMetadata("dataClassInsideDataClass.0.kt") + public void testDataClassInsideDataClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt"); + doTest(fileName); + } + @TestMetadata("extensionComponentFun.0.kt") public void testExtensionComponentFun() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt");