From 905e74f8706ff614a099b2501da9c187ff226ead Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 26 Jun 2015 13:24:05 +0300
Subject: [PATCH] TODO: restore tests: files with same names

---
 .../samWrappersDifferentFiles/2/{wrapped.kt => wrapped2.kt}  | 0
 .../codegen/boxMultiFile/sameFileName/2/{box.kt => box2.kt}  | 0
 idea/testData/debugger/positionManager/multiFilePackage/a.kt | 2 +-
 idea/testData/debugger/positionManager/multiFilePackage/b.kt | 2 +-
 .../debugger/positionManager/multiFileSameName/1/a.kt        | 5 -----
 .../debugger/positionManager/multiFileSameName/1/a1.kt       | 5 +++++
 .../debugger/positionManager/multiFileSameName/2/a.kt        | 5 -----
 .../debugger/positionManager/multiFileSameName/2/a2.kt       | 5 +++++
 .../debugger/positionManager/multiFileSameName/3/a.kt        | 5 -----
 .../debugger/positionManager/multiFileSameName/3/a3.kt       | 5 +++++
 .../debugger/positionManager/multiFileSameName/4/a.kt        | 5 -----
 .../debugger/positionManager/multiFileSameName/4/a4.kt       | 5 +++++
 .../exceptionFilter/multiSameName/1/{foo.kt => foo1.kt}      | 0
 .../exceptionFilter/multiSameName/2/{foo.kt => foo2.kt}      | 0
 .../jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt  | 4 ++--
 15 files changed, 24 insertions(+), 24 deletions(-)
 rename compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/2/{wrapped.kt => wrapped2.kt} (100%)
 rename compiler/testData/codegen/boxMultiFile/sameFileName/2/{box.kt => box2.kt} (100%)
 delete mode 100644 idea/testData/debugger/positionManager/multiFileSameName/1/a.kt
 create mode 100644 idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt
 delete mode 100644 idea/testData/debugger/positionManager/multiFileSameName/2/a.kt
 create mode 100644 idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt
 delete mode 100644 idea/testData/debugger/positionManager/multiFileSameName/3/a.kt
 create mode 100644 idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt
 delete mode 100644 idea/testData/debugger/positionManager/multiFileSameName/4/a.kt
 create mode 100644 idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt
 rename idea/testData/filters/exceptionFilter/multiSameName/1/{foo.kt => foo1.kt} (100%)
 rename idea/testData/filters/exceptionFilter/multiSameName/2/{foo.kt => foo2.kt} (100%)

diff --git a/compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/2/wrapped.kt b/compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/2/wrapped2.kt
similarity index 100%
rename from compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/2/wrapped.kt
rename to compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/2/wrapped2.kt
diff --git a/compiler/testData/codegen/boxMultiFile/sameFileName/2/box.kt b/compiler/testData/codegen/boxMultiFile/sameFileName/2/box2.kt
similarity index 100%
rename from compiler/testData/codegen/boxMultiFile/sameFileName/2/box.kt
rename to compiler/testData/codegen/boxMultiFile/sameFileName/2/box2.kt
diff --git a/idea/testData/debugger/positionManager/multiFilePackage/a.kt b/idea/testData/debugger/positionManager/multiFilePackage/a.kt
index 627d38c7624..6a48e2bf97c 100644
--- a/idea/testData/debugger/positionManager/multiFilePackage/a.kt
+++ b/idea/testData/debugger/positionManager/multiFilePackage/a.kt
@@ -1,5 +1,5 @@
 package test
 
 fun foo() {
-    ""   // test/A.+
+    ""   // test/A
 }
diff --git a/idea/testData/debugger/positionManager/multiFilePackage/b.kt b/idea/testData/debugger/positionManager/multiFilePackage/b.kt
index c11df75d182..e4df69d0201 100644
--- a/idea/testData/debugger/positionManager/multiFilePackage/b.kt
+++ b/idea/testData/debugger/positionManager/multiFilePackage/b.kt
@@ -1,5 +1,5 @@
 package test
 
 fun bar() {
-    foo();   // test/B.+
+    foo();   // test/B
 }
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/1/a.kt b/idea/testData/debugger/positionManager/multiFileSameName/1/a.kt
deleted file mode 100644
index 8efe8dee3e4..00000000000
--- a/idea/testData/debugger/positionManager/multiFileSameName/1/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-    "" // test/TestPackage\$a\$.+
-}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt b/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt
new file mode 100644
index 00000000000..da4da7cc73d
--- /dev/null
+++ b/idea/testData/debugger/positionManager/multiFileSameName/1/a1.kt
@@ -0,0 +1,5 @@
+package test
+
+fun foo() {
+    "" // test/A1
+}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/2/a.kt b/idea/testData/debugger/positionManager/multiFileSameName/2/a.kt
deleted file mode 100644
index 3cb6152505b..00000000000
--- a/idea/testData/debugger/positionManager/multiFileSameName/2/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun bar() {
-    "" // test/TestPackage\$a\$.+
-}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt b/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt
new file mode 100644
index 00000000000..326d8ed5314
--- /dev/null
+++ b/idea/testData/debugger/positionManager/multiFileSameName/2/a2.kt
@@ -0,0 +1,5 @@
+package test
+
+fun bar() {
+    "" // test/A2
+}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/3/a.kt b/idea/testData/debugger/positionManager/multiFileSameName/3/a.kt
deleted file mode 100644
index 2f83c4dc0fe..00000000000
--- a/idea/testData/debugger/positionManager/multiFileSameName/3/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun baz() {
-    "" // test/TestPackage\$a\$.+
-}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt b/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt
new file mode 100644
index 00000000000..e654d22c65d
--- /dev/null
+++ b/idea/testData/debugger/positionManager/multiFileSameName/3/a3.kt
@@ -0,0 +1,5 @@
+package test
+
+fun baz() {
+    "" // test/A3
+}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/4/a.kt b/idea/testData/debugger/positionManager/multiFileSameName/4/a.kt
deleted file mode 100644
index e1008a9e02d..00000000000
--- a/idea/testData/debugger/positionManager/multiFileSameName/4/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun quux() {
-    "" // test/TestPackage\$a\$.+
-}
diff --git a/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt b/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt
new file mode 100644
index 00000000000..04c79089a01
--- /dev/null
+++ b/idea/testData/debugger/positionManager/multiFileSameName/4/a4.kt
@@ -0,0 +1,5 @@
+package test
+
+fun quux() {
+    "" // test/A4
+}
diff --git a/idea/testData/filters/exceptionFilter/multiSameName/1/foo.kt b/idea/testData/filters/exceptionFilter/multiSameName/1/foo1.kt
similarity index 100%
rename from idea/testData/filters/exceptionFilter/multiSameName/1/foo.kt
rename to idea/testData/filters/exceptionFilter/multiSameName/1/foo1.kt
diff --git a/idea/testData/filters/exceptionFilter/multiSameName/2/foo.kt b/idea/testData/filters/exceptionFilter/multiSameName/2/foo2.kt
similarity index 100%
rename from idea/testData/filters/exceptionFilter/multiSameName/2/foo.kt
rename to idea/testData/filters/exceptionFilter/multiSameName/2/foo2.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
index da9edf459f0..f9e21727bc1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
@@ -128,8 +128,8 @@ public class JetExceptionFilterTest : MultiFileTestCase() {
     public fun testMultiSameName() {
         val packageClassFqName = getPackageClassFqName(FqName("multiSameName"))
         // The order and the exact names do matter here
-        doTest("1/foo.kt", 4, { file -> "" + getPackagePartFqName(packageClassFqName, file) + "\$foo\$f\$1" })
-        doTest("2/foo.kt", 4, { file -> "" + getPackagePartFqName(packageClassFqName, file) + "\$foo\$f\$1" })
+        doTest("1/foo1.kt", 4, { file -> "" + getPackagePartFqName(packageClassFqName, file) + "\$foo\$f\$1" })
+        doTest("2/foo2.kt", 4, { file -> "" + getPackagePartFqName(packageClassFqName, file) + "\$foo\$f\$1" })
     }
 
     public fun testLibrarySources() {