ensure inserted single-static-import when conflicting on-demand imports are presented (IDEA-155031)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/AllowSingleStaticImportWhenOnDemandImportOverloadedMethod.java

@@ -0,0 +1,12 @@
+package use;
+
+import foo.Bar;
+
+import static foo.Foo.*;
+
+public class Test {
+  void test() {
+    foo(1);
+    Bar.<caret>foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/AllowSingleStaticImportWhenOnDemandImportOverloadedMethod_after.java

@@ -0,0 +1,14 @@
+package use;
+
+import foo.Bar;
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+
+public class Test {
+  void test() {
+    Foo.foo(1);
+    foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/ProhibitWhenMethodWithIdenticalSignatureAlreadyImportedFromAnotherClass.java

@@ -0,0 +1,12 @@
+package use;
+
+import foo.Bar;
+
+import static foo.Foo.foo;
+
+public class Test {
+  void test() {
+    foo(1);
+    Bar.<caret>foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/SingleImportWhenConflictingWithOnDemand.java

@@ -0,0 +1,11 @@
+
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+class Test {
+  void test() {
+    Foo.f<caret>oo(1);
+    foo("1");
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport/SingleImportWhenConflictingWithOnDemand_after.java

@@ -0,0 +1,13 @@
+
+import foo.Foo;
+
+import static foo.Bar.foo;
+import static foo.Foo.*;
+import static foo.Foo.foo;
+
+class Test {
+  void test() {
+    foo(1);
+    foo("1");
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/intention/AddSingleStaticImportActionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 package com.intellij.codeInsight.intention;
 
 import com.intellij.JavaTestUtil;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
 
 public class AddSingleStaticImportActionTest extends JavaCodeInsightFixtureTestCase {
@@ -85,7 +87,6 @@ public class AddSingleStaticImportActionTest extends JavaCodeInsightFixtureTestC
   }
 
   public void testSkipSameNamedNonStaticReferences() throws Exception {
-
     myFixture.addClass("package foo;" +
                        "public class Clazz {" +
                        "   public void print(String s) {}" +
@@ -99,6 +100,45 @@ public class AddSingleStaticImportActionTest extends JavaCodeInsightFixtureTestC
     myFixture.checkResultByFile(getTestName(false) + "_after.java");
   }
 
+  public void testAllowSingleStaticImportWhenOnDemandImportOverloadedMethod() throws Exception {
+    myFixture.addClass("package foo; class Foo {public static void foo(int i){}}");
+    myFixture.addClass("package foo; class Bar {public static void foo(String s){}}");
+    myFixture.configureByFile(getTestName(false) + ".java");
+
+    IntentionAction intention = myFixture.findSingleIntention("Add static import for 'foo.Bar.foo'");
+    assertNotNull(intention);
+    myFixture.launchAction(intention);
+    myFixture.checkResultByFile(getTestName(false) + "_after.java");
+  }
+
+  public void testSingleImportWhenConflictingWithOnDemand() throws Exception {
+    myFixture.addClass("package foo; class Foo {public static void foo(int i){}}");
+    myFixture.addClass("package foo; class Bar {public static void foo(String s){}}");
+    myFixture.configureByFile(getTestName(false) + ".java");
+
+    CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings();
+    int old = settings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND;
+    settings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = 1;
+    try {
+      IntentionAction intention = myFixture.findSingleIntention("Add static import for 'foo.Foo.foo'");
+      assertNotNull(intention);
+      myFixture.launchAction(intention);
+      myFixture.checkResultByFile(getTestName(false) + "_after.java");
+    }
+    finally {
+      settings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND = old;
+    }
+  }
+
+  public void testProhibitWhenMethodWithIdenticalSignatureAlreadyImportedFromAnotherClass() throws Exception {
+    myFixture.addClass("package foo; class Foo {public static void foo(int i){}}");
+    myFixture.addClass("package foo; class Bar {public static void foo(int i){}}");
+    myFixture.configureByFile(getTestName(false) + ".java");
+
+    IntentionAction intention = myFixture.getAvailableIntention("Add static import for 'foo.Bar.foo'");
+    assertNull(intention);
+  }
+
   @Override
   protected String getTestDataPath() {
     return JavaTestUtil.getJavaTestDataPath() + "/codeInsight/daemonCodeAnalyzer/quickFix/addSingleStaticImport";