From ba84214bd050475456df184a0da78ed95a90a93c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 15 Oct 2015 22:13:33 +0300 Subject: [PATCH] Fix test data for rename test (cherry picked from commit aee4f25) --- .../after/testing/JavaClient.java | 4 ++-- .../before/testing/JavaClient.java | 4 ++-- .../javaWrapperForKotlinPackageClass.test | 2 +- .../after/testing/JavaClient.java | 4 ++-- .../before/testing/JavaClient.java | 4 ++-- .../renameKotlinPackageFunctionFromJava.test | 2 +- .../after/testing/JavaClientOldFacade.java | 10 ---------- .../before/testing/JavaClientOldFacade.java | 10 ---------- 8 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/after/testing/JavaClientOldFacade.java delete mode 100644 idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/before/testing/JavaClientOldFacade.java diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java index 60b8fb8a68c..1430b77470b 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java +++ b/idea/testData/refactoring/rename/renameKotlinPackageClass/after/testing/JavaClient.java @@ -1,9 +1,9 @@ package testing; -import testing.rename.RenamePackage; +import testing.rename.RenameKotlinClassKt; class JavaClient { void foo() { - RenamePackage.test(); + RenameKotlinClassKt.test(); } } diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java index 60b8fb8a68c..1430b77470b 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java +++ b/idea/testData/refactoring/rename/renameKotlinPackageClass/before/testing/JavaClient.java @@ -1,9 +1,9 @@ package testing; -import testing.rename.RenamePackage; +import testing.rename.RenameKotlinClassKt; class JavaClient { void foo() { - RenamePackage.test(); + RenameKotlinClassKt.test(); } } diff --git a/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test b/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test index 6a11cbb415d..a99ed960d29 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test +++ b/idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test @@ -1,6 +1,6 @@ { "type": "JAVA_CLASS", "hint": "Can\u0027t rename Kotlin package facade class", - "classId": "testing/rename/RenamePackage", + "classId": "testing/rename/RenameKotlinClassKt", "newName": "NewPackageName" } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java index a56f73f6306..0483c3417d3 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/after/testing/JavaClient.java @@ -1,9 +1,9 @@ package testing; -import testing.rename.RenamePackage; +import testing.rename.RenameKotlinPackageFunctionFromJavaKt; class JavaClient { public void testing() { - RenamePackage.bar(); + RenameKotlinPackageFunctionFromJavaKt.bar(); } } diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java index bc2388a90d3..7287cf20c9c 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/before/testing/JavaClient.java @@ -1,9 +1,9 @@ package testing; -import testing.rename.RenamePackage; +import testing.rename.RenameKotlinPackageFunctionFromJavaKt; class JavaClient { public void testing() { - RenamePackage.foo(); + RenameKotlinPackageFunctionFromJavaKt.foo(); } } diff --git a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test index 510e30f32b1..426eed272d5 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test +++ b/idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test @@ -1,6 +1,6 @@ { "type": "JAVA_METHOD", - "classId": "testing/rename/RenamePackage", + "classId": "testing/rename/RenameKotlinPackageFunctionFromJavaKt", "methodSignature": "int foo()", "newName": "bar" } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/after/testing/JavaClientOldFacade.java b/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/after/testing/JavaClientOldFacade.java deleted file mode 100644 index e3cab9fedb6..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/after/testing/JavaClientOldFacade.java +++ /dev/null @@ -1,10 +0,0 @@ -package testing; - -import testing.rename.RenamePackage; - -class JavaClientOldFacade { - public void foo() { - String old = RenamePackage.getBar(); - RenamePackage.setBar(old + "new"); - } -} \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/before/testing/JavaClientOldFacade.java b/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/before/testing/JavaClientOldFacade.java deleted file mode 100644 index 27eca780a4f..00000000000 --- a/idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/before/testing/JavaClientOldFacade.java +++ /dev/null @@ -1,10 +0,0 @@ -package testing; - -import testing.rename.RenamePackage; - -class JavaClientOldFacade { - public void foo() { - String old = RenamePackage.getFoo(); - RenamePackage.setFoo(old + "new"); - } -} \ No newline at end of file