From 95f4056c893036cb775145a635d2707c301aee92 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Tue, 19 Jan 2010 19:20:57 +0300
Subject: [PATCH] rename: find collisions with static imported members in
 findUsages tests

---
 .../renameCollisions/RenameVarConstToAlien1.java       | 10 ++++++++++
 .../renameCollisions/RenameVarConstToAlien1.java.after | 10 ++++++++++
 .../com/intellij/refactoring/RenameCollisionsTest.java |  4 ++++
 3 files changed, 24 insertions(+)
 create mode 100644 java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java
 create mode 100644 java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java.after

diff --git a/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java b/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java
new file mode 100644
index 000000000000..fec107902d54
--- /dev/null
+++ b/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java
@@ -0,0 +1,10 @@
+import static java.lang.String.valueOf;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static final int SI_STATIC_FIELD<caret> = 9;
+        public static void staticContext() {
+            valueOf(null);
+        }
+    }
+}
diff --git a/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java.after b/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java.after
new file mode 100644
index 000000000000..9006fb6ce821
--- /dev/null
+++ b/java/java-tests/testData/refactoring/renameCollisions/RenameVarConstToAlien1.java.after
@@ -0,0 +1,10 @@
+import static java.lang.String.valueOf;
+
+public class RenameCollisions {
+    public static class StaticInnerClass {
+        public static final int CASE_INSENSITIVE_ORDER<caret> = 9;
+        public static void staticContext() {
+            valueOf(null);
+        }
+    }
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
index 2f57239d75d5..5286661ee273 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
@@ -76,6 +76,10 @@ public class RenameCollisionsTest extends LightCodeInsightTestCase {
     doTest("CASE_INSENSITIVE_ORDER");
   }
 
+  public void testRenameVarConstToAlien1() throws Exception {
+    doTest("CASE_INSENSITIVE_ORDER");
+  }
+
   public void testRenameVarConstToParam() throws Exception {
     doTest("param3");
   }