From 927f3ccaa16e0a5229077d06b35ec311f7aede36 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Fri, 25 Nov 2016 17:45:17 +0100
Subject: [PATCH] testdata for IDEA-132418

---
 .../EnsureConflictingImportsNotCollapsed.java | 26 +++++++++++++++++++
 ...eConflictingImportsNotCollapsed_after.java | 26 +++++++++++++++++++
 .../com/intellij/psi/OptimizeImportsTest.java |  4 +++
 3 files changed, 56 insertions(+)
 create mode 100644 java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed.java
 create mode 100644 java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed_after.java

diff --git a/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed.java b/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed.java
new file mode 100644
index 000000000000..723739aabc80
--- /dev/null
+++ b/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed.java
@@ -0,0 +1,26 @@
+package package1;
+
+
+import static package1.Utils1.method2;
+import static package1.Utils2.method2;
+import static package1.Utils2.method1;
+import static package1.Utils2.*;
+
+class Sample2 {
+  public void method() {
+    method2();
+    method1("");
+    method2("");
+    method3("");
+  }
+}
+
+class Utils1 {
+  public static void method1(Integer parameter1, Boolean parameter2) {}
+  public static void method2() {}
+}
+class Utils2 {
+  public static void method1(String parameter) {}
+  public static void method2(String parameter) {}
+  public static void method3(String parameter) {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed_after.java b/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed_after.java
new file mode 100644
index 000000000000..7f4ea76b8945
--- /dev/null
+++ b/java/java-tests/testData/psi/optimizeImports/EnsureConflictingImportsNotCollapsed_after.java
@@ -0,0 +1,26 @@
+package package1;
+
+
+import static package1.Utils1.method2;
+import static package1.Utils2.method1;
+import static package1.Utils2.method2;
+import static package1.Utils2.method3;
+
+class Sample2 {
+  public void method() {
+    method2();
+    method1("");
+    method2("");
+    method3("");
+  }
+}
+
+class Utils1 {
+  public static void method1(Integer parameter1, Boolean parameter2) {}
+  public static void method2() {}
+}
+class Utils2 {
+  public static void method1(String parameter) {}
+  public static void method2(String parameter) {}
+  public static void method3(String parameter) {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
index 7d566c9d1c6c..efa556b0a803 100644
--- a/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/OptimizeImportsTest.java
@@ -41,6 +41,10 @@ public class OptimizeImportsTest extends OptimizeImportsTestCase {
   public void testDontCollapseToOnDemandImport() throws Exception { doTest(); }
   public void testIgnoreInaccessible() throws Exception{ doTest();}
 
+  public void testEnsureConflictingImportsNotCollapsed() throws Exception {
+    doTest();
+  }
+
   private void doTest() throws Exception {
     doTest(".java");
   }