From 8fe3a1d36691d010e1ced19ed161b5f7badd13e6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 15 Apr 2015 20:29:47 +0300 Subject: [PATCH] Added test for inheritor renamer (Kotlin subclasses of Java class). --- .../rename/automaticRenamerForJavaClass/after/Bar.java | 3 +++ .../rename/automaticRenamerForJavaClass/after/usage.kt | 3 +++ .../rename/automaticRenamerForJavaClass/before/Foo.java | 3 +++ .../rename/automaticRenamerForJavaClass/before/usage.kt | 3 +++ .../rename/automaticRenamerForJavaClass/javaClass.test | 7 +++++++ .../idea/refactoring/rename/RenameTestGenerated.java | 6 ++++++ 6 files changed, 25 insertions(+) create mode 100644 idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/Bar.java create mode 100644 idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/usage.kt create mode 100644 idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/Foo.java create mode 100644 idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/usage.kt create mode 100644 idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test diff --git a/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/Bar.java b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/Bar.java new file mode 100644 index 00000000000..a0e430b0587 --- /dev/null +++ b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/Bar.java @@ -0,0 +1,3 @@ +class Bar { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/usage.kt b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/usage.kt new file mode 100644 index 00000000000..b63595935ef --- /dev/null +++ b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/after/usage.kt @@ -0,0 +1,3 @@ +class BarImpl : Bar() + +object BarObj : Bar() \ No newline at end of file diff --git a/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/Foo.java b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/Foo.java new file mode 100644 index 00000000000..576000ea446 --- /dev/null +++ b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/Foo.java @@ -0,0 +1,3 @@ +class Foo { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/usage.kt b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/usage.kt new file mode 100644 index 00000000000..1437cd9640a --- /dev/null +++ b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/before/usage.kt @@ -0,0 +1,3 @@ +class FooImpl : Foo() + +object FooObj : Foo() \ No newline at end of file diff --git a/idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test new file mode 100644 index 00000000000..82edf4031f4 --- /dev/null +++ b/idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test @@ -0,0 +1,7 @@ +{ + "type": "JAVA_CLASS", + "classId": "/Foo", + "oldName": "Foo", + "newName": "Bar", + "mainFile": "Foo.java" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index 040cebcf291..ffaf511cdfa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -41,6 +41,12 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("automaticRenamerForJavaClass/javaClass.test") + public void testAutomaticRenamerForJavaClass_JavaClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test"); + doTest(fileName); + } + @TestMetadata("defaultObject/defaultObject.test") public void testDefaultObject_DefaultObject() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/defaultObject/defaultObject.test");