IDEA-151933 Optimize Imports can produce ambiguous code

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/C.java

@@ -0,0 +1,13 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class C {
+    public C() {
+        System.out.println("com.example.bar.C init");
+    }
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/D.java

@@ -0,0 +1,13 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class D {
+    public D() {
+        System.out.println("com.example.bar.D init");
+    }
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/D1.java

@@ -0,0 +1,10 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class D1 {
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/D2.java

@@ -0,0 +1,10 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class D2 {
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/D3.java

@@ -0,0 +1,10 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class D3 {
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/bar/D4.java

@@ -0,0 +1,10 @@
+package bar;
+
+/**
+ * *******************************
+ * Created by Irina.Petrovskaya on 8/31/2016.
+ * Project: untitled1
+ * *******************************
+ */
+public class D4 {
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/foo/A.java

@@ -0,0 +1,22 @@
+package foo;
+
+import bar.*;
+
+import static foo.B.*;
+import static foo.B.C;
+
+public class A
+{
+    public static void main()
+    {
+        new D();
+        new D1();
+        new D2();
+        new D3();
+        new D4();
+        new C();
+        new C1();
+        new C2();
+        new C3();
+    }
+}

java/java-tests/testData/codeInsight/importHelper/conflictBetweenRegularAndStaticClassesInImportList/foo/B.java

@@ -0,0 +1,19 @@
+package foo;
+
+public class B
+{
+    public static class C
+    {
+        public C() {
+        }
+    }
+    public static class C1
+    {
+    }
+    public static class C2
+    {
+    }
+    public static class C3
+    {
+    }
+}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/Usage.java

@@ -0,0 +1,14 @@
+package x;
+
+import x.n.X1;
+import x.n.X2;
+import x.n.X3;
+
+@Deprecated
+class Y {
+    X1 x1;
+    x.n.Class s;
+    X2 x2;
+    Class aclass;
+    X3 cc3;
+}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/Usage_afterOptimize.txt

@@ -0,0 +1,14 @@
+package x;
+
+import x.n.*;
+
+import java.lang.Class;
+
+@Deprecated
+class Y {
+    X1 x1;
+    x.n.Class s;
+    X2 x2;
+    Class aclass;
+    X3 cc3;
+}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/n/Class.java

@@ -0,0 +1,2 @@
+package x.n;
+public class Class{}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/n/X1.java

@@ -0,0 +1,4 @@
+package x.n;
+
+public class X1 {
+}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/n/X2.java

@@ -0,0 +1,4 @@
+package x.n;
+
+public class X2 {
+}

java/java-tests/testData/codeInsight/importHelper/reimportConflictingClasses/x/n/X3.java

@@ -0,0 +1,4 @@
+package x.n;
+
+public class X3 {
+}