From 2c6020183234e52401d32c6b059a2892ba37dbaf Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 14 Jan 2015 22:26:19 +0300
Subject: [PATCH] Fixed test data (+ renamed test)

---
 ...{Imports-hidden.kt => ClassImportsConflicting.kt} |  4 ++--
 ...mports-hidden.txt => ClassImportsConflicting.txt} |  0
 .../kotlin/checkers/JetDiagnosticsTestGenerated.java | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename compiler/testData/diagnostics/tests/scopes/{Imports-hidden.kt => ClassImportsConflicting.kt} (56%)
 rename compiler/testData/diagnostics/tests/scopes/{Imports-hidden.txt => ClassImportsConflicting.txt} (100%)

diff --git a/compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt b/compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
similarity index 56%
rename from compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt
rename to compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
index 498cd0ecdfb..5a4ef3a43fa 100644
--- a/compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt
+++ b/compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
@@ -1,8 +1,8 @@
 //FILE:a.kt
 package a
 
-import <!USELESS_HIDDEN_IMPORT!>b.O<!>
-import c.O
+import <!CONFLICTING_IMPORT!>b.O<!>
+import <!CONFLICTING_IMPORT!>c.O<!>
 
 //FILE:b.kt
 package b
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports-hidden.txt b/compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/scopes/Imports-hidden.txt
rename to compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
index f77e8e3c6d3..9c20c421207 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
@@ -9444,6 +9444,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ClassImportsConflicting.kt")
+            public void testClassImportsConflicting() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("DontImportRootScope.kt")
             public void testDontImportRootScope() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt");
@@ -9504,12 +9510,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("Imports-hidden.kt")
-            public void testImports_hidden() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("initializerScopeOfExtensionProperty.kt")
             public void testInitializerScopeOfExtensionProperty() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt");