Minor: Add tests for KT-13759

This commit is contained in:
Alexey Sedunov
2016-09-15 15:32:00 +03:00
parent 4313f249a4
commit 6e8bcb987a
12 changed files with 89 additions and 1 deletions
+1
View File
@@ -126,6 +126,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
- [`KT-8867`](https://youtrack.jetbrains.com/issue/KT-8867) Rename: Rename all overridden members if user chooses to refactor base declaration(s)
- Pull Up: Drop 'override' modifier if moved member doesn't override anything
- [`KT-13660`](https://youtrack.jetbrains.com/issue/KT-13660) Move: Do not drop object receivers when calling variable of extension functional type
- [`KT-13759`](https://youtrack.jetbrains.com/issue/KT-13759) Rename: Process object-wrapping alias references
##### New features
@@ -0,0 +1,9 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtTypeAlias
// OPTIONS: usages
object OOO
typealias <caret>Alias = OOO
fun f() {
Alias
val a: Alias
}
@@ -0,0 +1,2 @@
Local variable declaration 8 val a: Alias
Unclassified usage 7 Alias
@@ -0,0 +1,9 @@
package test
object OOO
typealias AliasNew = OOO
fun f() {
AliasNew
val a: AliasNew
}
@@ -0,0 +1,9 @@
package test
object OOO
typealias /*rename*/Alias = OOO
fun f() {
Alias
val a: Alias
}
@@ -0,0 +1,6 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test/test.kt",
"newName": "AliasNew",
"withRuntime": "true"
}
@@ -0,0 +1,9 @@
package test
object OOO
typealias AliasNew = OOO
fun f() {
AliasNew
val a: AliasNew
}
@@ -0,0 +1,9 @@
package test
object OOO
typealias Alias = OOO
fun f() {
/*rename*/Alias
val a: Alias
}
@@ -0,0 +1,7 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test/test.kt",
"newName": "AliasNew",
"byRef": "true",
"withRuntime": "true"
}
@@ -393,7 +393,7 @@ abstract class AbstractFindUsagesTest : KotlinLightCodeInsightFixtureTestCase()
val handler: FindUsagesHandler = (if (targetElement is PsiMember) {
JavaFindUsagesHandler(targetElement, JavaFindUsagesHandlerFactory(project))
}
else if (targetElement is KtDeclaration) {
else if (targetElement is KtDeclaration && targetElement !is KtTypeAlias) {
KotlinFindUsagesHandlerFactory(project).createFindUsagesHandlerNoQuestions(targetElement)
}
else {
@@ -1195,6 +1195,21 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
}
}
@TestMetadata("idea/testData/findUsages/kotlin/findTypeAliasUsages")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class FindTypeAliasUsages extends AbstractFindUsagesTest {
public void testAllFilesPresentInFindTypeAliasUsages() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeAliasUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
}
@TestMetadata("objectAlias.0.kt")
public void testObjectAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeAliasUsages/objectAlias.0.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -239,6 +239,18 @@ public class RenameTestGenerated extends AbstractRenameTest {
doTest(fileName);
}
@TestMetadata("objectAlias/objectAlias.test")
public void testObjectAlias_ObjectAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/objectAlias/objectAlias.test");
doTest(fileName);
}
@TestMetadata("objectAliasByRef/objectAliasByRef.test")
public void testObjectAliasByRef_ObjectAliasByRef() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/objectAliasByRef/objectAliasByRef.test");
doTest(fileName);
}
@TestMetadata("paramererAsReceiverWithNewNameAsSelector/parameterAsReceiverWithNewNameAsSelector.test")
public void testParamererAsReceiverWithNewNameAsSelector_ParameterAsReceiverWithNewNameAsSelector() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/paramererAsReceiverWithNewNameAsSelector/parameterAsReceiverWithNewNameAsSelector.test");