From 4f412f77d1729e1da5f2db8c18e785437ca23438 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 15 Apr 2015 20:13:51 +0300
Subject: [PATCH] Updated some test data so it won't be affected by automatic
 renamers.

---
 .../rename/renameJavaInterface/after/RenameJavaClass.kt     | 6 +++---
 .../renameJavaInterface/after/testing/NewInterface.java     | 5 +++++
 .../renameJavaInterface/after/testing/NewInterfaceName.java | 5 -----
 .../rename/renameJavaInterface/renameJavaInterface.test     | 2 +-
 .../renameKotlinBaseMethod/after/RenameKotlinBaseMethod.kt  | 2 --
 .../renameKotlinBaseMethod/before/RenameKotlinBaseMethod.kt | 2 --
 6 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterface.java
 delete mode 100644 idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java

diff --git a/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt b/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt
index e361e3e500e..4d4765730bb 100644
--- a/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt
+++ b/idea/testData/refactoring/rename/renameJavaInterface/after/RenameJavaClass.kt
@@ -1,11 +1,11 @@
 package kotlin.testing
 
-import testing.NewInterfaceName
+import testing.NewInterface
 
-class Some(s: NewInterfaceName) : NewInterfaceName() {
+class New(s: NewInterface) : NewInterface() {
     val test = s
 
-    fun testFun(param : NewInterfaceName) : NewInterfaceName {
+    fun testFun(param : NewInterface) : NewInterface {
         return test;
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterface.java b/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterface.java
new file mode 100644
index 00000000000..e5a1efe53ca
--- /dev/null
+++ b/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterface.java
@@ -0,0 +1,5 @@
+package testing;
+
+public interface NewInterface {
+}
+
diff --git a/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java b/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java
deleted file mode 100644
index 03b896576fd..00000000000
--- a/idea/testData/refactoring/rename/renameJavaInterface/after/testing/NewInterfaceName.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package testing;
-
-public interface NewInterfaceName {
-}
-
diff --git a/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test b/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test
index 102b82ac1df..d8171124a78 100644
--- a/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test
+++ b/idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test
@@ -1,6 +1,6 @@
 {
   "type": "JAVA_CLASS",
   "classId": "testing/SomeInterface",
-  "newName": "NewInterfaceName",
+  "newName": "NewInterface",
   "comment": "For KT-4100 Imports doesn't change after java interface name refactoring"
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameKotlinBaseMethod/after/RenameKotlinBaseMethod.kt b/idea/testData/refactoring/rename/renameKotlinBaseMethod/after/RenameKotlinBaseMethod.kt
index 0523cfb4116..615eaeaf2bc 100644
--- a/idea/testData/refactoring/rename/renameKotlinBaseMethod/after/RenameKotlinBaseMethod.kt
+++ b/idea/testData/refactoring/rename/renameKotlinBaseMethod/after/RenameKotlinBaseMethod.kt
@@ -6,8 +6,6 @@ trait A {
 
 public open class B: A {
     override fun second() = 1
-
-    fun first(a: Int) = 12
 }
 
 class C: B() {
diff --git a/idea/testData/refactoring/rename/renameKotlinBaseMethod/before/RenameKotlinBaseMethod.kt b/idea/testData/refactoring/rename/renameKotlinBaseMethod/before/RenameKotlinBaseMethod.kt
index 7e5dcc2a4cc..4f3bcd5ed52 100644
--- a/idea/testData/refactoring/rename/renameKotlinBaseMethod/before/RenameKotlinBaseMethod.kt
+++ b/idea/testData/refactoring/rename/renameKotlinBaseMethod/before/RenameKotlinBaseMethod.kt
@@ -6,8 +6,6 @@ trait A {
 
 public open class B: A {
     override fun first() = 1
-
-    fun first(a: Int) = 12
 }
 
 class C: B() {