diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/RenameKotlinPackageFunctionFromJava.kt b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/RenameKotlinPackageFunctionFromJava.kt new file mode 100644 index 00000000000..c4cf88fc6d5 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/RenameKotlinPackageFunctionFromJava.kt @@ -0,0 +1,9 @@ +package testing.rename + +public fun bar() = 1 + +fun usage() { + bar() +} + +val some = bar() diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java new file mode 100644 index 00000000000..a56f73f6306 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java @@ -0,0 +1,9 @@ +package testing; + +import testing.rename.RenamePackage; + +class JavaClient { + public void testing() { + RenamePackage.bar(); + } +} diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/RenameKotlinPackageFunctionFromJava.kt b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/RenameKotlinPackageFunctionFromJava.kt new file mode 100644 index 00000000000..10d2a6b611f --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/RenameKotlinPackageFunctionFromJava.kt @@ -0,0 +1,9 @@ +package testing.rename + +public fun foo() = 1 + +fun usage() { + foo() +} + +val some = foo() diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java new file mode 100644 index 00000000000..bc2388a90d3 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java @@ -0,0 +1,9 @@ +package testing; + +import testing.rename.RenamePackage; + +class JavaClient { + public void testing() { + RenamePackage.foo(); + } +} diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test new file mode 100644 index 00000000000..31c9f71cb03 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test @@ -0,0 +1 @@ +// RENAME: JAVA_METHOD->testing.rename.RenamePackage->int foo()->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 a498481f707..72fd71b0668 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -33,7 +33,9 @@ import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest; @TestMetadata("idea/testData/refactoring/rename") public class RenameTestGenerated extends AbstractRenameTest { public void testAllFilesPresentInRename() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$")); + JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", + new File("idea/testData/refactoring/rename"), + Pattern.compile("^(.+)\\.test$")); } @TestMetadata("renameJavaClass/renameJavaClass.test") @@ -76,4 +78,9 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test"); } + @TestMetadata("renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test") + public void testRenameKotlinPackageFunctionFromJava_RenameKotlinPackageFunctionFromJava() throws Exception { + doTest("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test"); + } + }