From 26d31682242f566adbf6a122ea372d1ea1df96dc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 25 Nov 2013 16:17:54 +0400 Subject: [PATCH] Test for KT-4100 'Imports doesn't change after java interface name refactoring' #KT-4100 Fixed --- .../renameJavaInterface/after/RenameJavaClass.kt | 11 +++++++++++ .../after/testing/NewInterfaceName.java | 5 +++++ .../renameJavaInterface/before/RenameJavaClass.kt | 11 +++++++++++ .../before/testing/SomeInterface.java | 5 +++++ .../renameJavaInterface/renameJavaInterface.test | 3 +++ .../refactoring/rename/RenameTestGenerated.java | 5 +++++ 6 files changed, 40 insertions(+) create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/before/RenameJavaClass.kt create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/before/testing/SomeInterface.java create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test diff --git a/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt b/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt new file mode 100644 index 00000000000..e361e3e500e --- /dev/null +++ b/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt @@ -0,0 +1,11 @@ +package kotlin.testing + +import testing.NewInterfaceName + +class Some(s: NewInterfaceName) : NewInterfaceName() { + val test = s + + fun testFun(param : NewInterfaceName) : NewInterfaceName { + return test; + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java b/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java new file mode 100644 index 00000000000..03b896576fd --- /dev/null +++ b/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java @@ -0,0 +1,5 @@ +package testing; + +public interface NewInterfaceName { +} + diff --git a/idea/testData/refactoring/rename/renameJavaInterface/before/RenameJavaClass.kt b/idea/testData/refactoring/rename/renameJavaInterface/before/RenameJavaClass.kt new file mode 100644 index 00000000000..bf64eeb1937 --- /dev/null +++ b/idea/testData/refactoring/rename/renameJavaInterface/before/RenameJavaClass.kt @@ -0,0 +1,11 @@ +package kotlin.testing + +import testing.SomeInterface + +class Some(s: SomeInterface) : SomeInterface() { + val test = s + + fun testFun(param : SomeInterface) : SomeInterface { + return test; + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameJavaInterface/before/testing/SomeInterface.java b/idea/testData/refactoring/rename/renameJavaInterface/before/testing/SomeInterface.java new file mode 100644 index 00000000000..4715afe1fb8 --- /dev/null +++ b/idea/testData/refactoring/rename/renameJavaInterface/before/testing/SomeInterface.java @@ -0,0 +1,5 @@ +package testing; + +public interface SomeInterface { +} + diff --git a/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test b/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test new file mode 100644 index 00000000000..09526210938 --- /dev/null +++ b/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test @@ -0,0 +1,3 @@ +// RENAME: JAVA_CLASS->testing.SomeInterface->NewInterfaceName + +// For KT-4100 Imports doesn't change after java interface name refactoring \ 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 6328bf12bfb..c5411ee879f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -43,6 +43,11 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test"); } + @TestMetadata("renameJavaInterface/renameJavaInterface.test") + public void testRenameJavaInterface_RenameJavaInterface() throws Exception { + doTest("idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test"); + } + @TestMetadata("renameKotlinBaseMethod/javaWrapperForBaseFunction.test") public void testRenameKotlinBaseMethod_JavaWrapperForBaseFunction() throws Exception { doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test");