Inline inner: rise conflict for recursive inlinement (IDEA-39353)

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java

@@ -13,6 +13,8 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NonNls;
 
+import java.util.Iterator;
+
 /**
  * @author yole
  */
@@ -222,6 +224,10 @@ public class InlineToAnonymousClassTest extends LightCodeInsightTestCase {
     doTest(false, true);
   }
 
+  public void testParamTypeReplacement() throws Exception {
+    doTest(false, true);
+  }
+
   public void testNoInlineAbstract() throws Exception {
     doTestNoInline("Abstract classes cannot be inlined");
   }
@@ -322,13 +328,25 @@ public class InlineToAnonymousClassTest extends LightCodeInsightTestCase {
     doTestPreprocessUsages("Class is never used");
   }
 
+  public void testNoInlineRecursiveAccess() throws Exception {
+    doTestConflict("Class cannot be inlined because a call to its member inside body", "Class cannot be inlined because a call to its member inside body");
+  }
+
   public void testConflictInaccessibleOuterField() throws Exception {
+    doTestConflict(
+      "Field <b><code>C2.a</code></b> that is used in inlined method is not accessible from call site(s) in method <b><code>C2User.test()</code></b>");
+  }
+
+  public void doTestConflict(final String... expected) throws Exception {
     InlineToAnonymousClassProcessor processor = prepareProcessor();
     UsageInfo[] usages = processor.findUsages();
     MultiMap<PsiElement,String> conflicts = processor.getConflicts(usages);
-    assertEquals(1, conflicts.size());
-    assertEquals("Field <b><code>C2.a</code></b> that is used in inlined method is not accessible from call site(s) in method <b><code>C2User.test()</code></b>",
-                 conflicts.values().iterator().next());
+    assertEquals(expected.length, conflicts.size());
+    final Iterator<? extends String> iterator = conflicts.values().iterator();
+    for (String s : expected) {
+      assertTrue(iterator.hasNext());
+      assertEquals(s, iterator.next());
+    }
   }
 
   private void doTestNoInline(final String expectedMessage) throws Exception {