From 432c0bb69ed96dbdbbd312aa64cbc5aba4d1eea3 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 14 Nov 2014 17:40:43 +0300 Subject: [PATCH] Rename: Add tests for enum entries #KT-4800 Fixed --- .../renameKotlinEnum/after/RenameKotlinEnum.kt | 7 +++++++ .../renameKotlinEnum/before/RenameKotlinEnum.kt | 7 +++++++ .../rename/renameKotlinEnum/renameKotlinEnum.test | 5 +++++ .../after/RenameKotlinFunctionInEnum.kt | 15 +++++++++++++++ .../before/RenameKotlinFunctionInEnum.kt | 15 +++++++++++++++ .../renameKotlinFunctionInEnum.test | 6 ++++++ .../refactoring/rename/RenameTestGenerated.java | 12 ++++++++++++ 7 files changed, 67 insertions(+) create mode 100644 idea/testData/refactoring/rename/renameKotlinEnum/after/RenameKotlinEnum.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinEnum/before/RenameKotlinEnum.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test create mode 100644 idea/testData/refactoring/rename/renameKotlinFunctionInEnum/after/RenameKotlinFunctionInEnum.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunctionInEnum/before/RenameKotlinFunctionInEnum.kt create mode 100644 idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test diff --git a/idea/testData/refactoring/rename/renameKotlinEnum/after/RenameKotlinEnum.kt b/idea/testData/refactoring/rename/renameKotlinEnum/after/RenameKotlinEnum.kt new file mode 100644 index 00000000000..5c981fe76f7 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinEnum/after/RenameKotlinEnum.kt @@ -0,0 +1,7 @@ +package test + +enum class D(n: Int) { + O: D(0) + A: D(1) + B: D(2) +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinEnum/before/RenameKotlinEnum.kt b/idea/testData/refactoring/rename/renameKotlinEnum/before/RenameKotlinEnum.kt new file mode 100644 index 00000000000..f6040485114 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinEnum/before/RenameKotlinEnum.kt @@ -0,0 +1,7 @@ +package test + +enum class E(n: Int) { + O: E(0) + A: E(1) + B: E(2) +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test b/idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test new file mode 100644 index 00000000000..2e9e726c83b --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test @@ -0,0 +1,5 @@ +{ + "type": "KOTLIN_CLASS", + "classFQN": "test.E", + "newName": "D" +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/after/RenameKotlinFunctionInEnum.kt b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/after/RenameKotlinFunctionInEnum.kt new file mode 100644 index 00000000000..33d590c0c57 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/after/RenameKotlinFunctionInEnum.kt @@ -0,0 +1,15 @@ +package test + +enum class E { + open fun bar(n: Int): Int = n + + O + A { + override fun bar(n: Int): Int = n + 1 + + } + B { + override fun bar(n: Int): Int = n + 2 + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/before/RenameKotlinFunctionInEnum.kt b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/before/RenameKotlinFunctionInEnum.kt new file mode 100644 index 00000000000..1f776cf4b94 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/before/RenameKotlinFunctionInEnum.kt @@ -0,0 +1,15 @@ +package test + +enum class E { + open fun foo(n: Int): Int = n + + O + A { + override fun foo(n: Int): Int = n + 1 + + } + B { + override fun foo(n: Int): Int = n + 2 + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test new file mode 100644 index 00000000000..a6826025484 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test @@ -0,0 +1,6 @@ +{ + "type": "KOTLIN_FUNCTION", + "classFQN": "test.E", + "oldName": "foo", + "newName": "bar" +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java index 1b36461b4cf..ca3585b0d66 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -162,6 +162,18 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } + @TestMetadata("renameKotlinEnum/renameKotlinEnum.test") + public void testRenameKotlinEnum_RenameKotlinEnum() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test"); + doTest(fileName); + } + + @TestMetadata("renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test") + public void testRenameKotlinFunctionInEnum_RenameKotlinFunctionInEnum() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test"); + doTest(fileName); + } + @TestMetadata("renameKotlinMethod/javaWrapperForKotlinMethod.test") public void testRenameKotlinMethod_JavaWrapperForKotlinMethod() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test");