extract CompletionAutoPopupTester

java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy

@@ -15,26 +15,19 @@
  */
 package com.intellij.codeInsight.completion
 
-import com.intellij.codeInsight.AutoPopupController
-import com.intellij.codeInsight.completion.impl.CompletionServiceImpl
-import com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.codeInsight.lookup.impl.LookupImpl
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.editor.ex.DocumentEx
-import com.intellij.psi.PsiDocumentManager
+import com.intellij.testFramework.fixtures.CompletionAutoPopupTester
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
-import com.intellij.util.ui.UIUtil
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicInteger
-
 /**
  * @author peter
  */
 abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCase {
+  private CompletionAutoPopupTester myTester
+
   @Override protected void setUp() {
     edt { superSetUp() }
-    CompletionAutoPopupHandler.ourTestingAutopopup = true
+    myTester = new CompletionAutoPopupTester(myFixture)
   }
   void superSetUp() {
     super.setUp()
@@ -44,8 +37,6 @@ abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCa
   }
 
   @Override protected void tearDown() {
-    CompletionAutoPopupHandler.ourTestingAutopopup = false
-    ((DocumentEx) myFixture.editor.document).setModificationStamp(0)  // to not let autopopup handler sneak in
     edt { superTearDown() }
   }
 
@@ -54,92 +45,27 @@ abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCa
   }
 
   void type(String s) {
-    for (i in 0..<s.size()) {
-      final c = s.charAt(i)
-      myFixture.type(c)
-      joinAutopopup() // for the autopopup handler's alarm, or the restartCompletion's invokeLater
-      joinCompletion()
-    }
+    myTester.typeWithPauses(s)
   }
 
   protected void joinCompletion() {
-    for (i in 0.1000) {
-      if (i==999) {
-        printThreadDump()
-        fail("Could not wait for committed doc")
-      }
-      CompletionPhase phase = CompletionServiceImpl.getCompletionPhase()
-      if (phase != com.intellij.codeInsight.completion.CompletionPhase.NoCompletion) break;
-      Thread.sleep(10)
-    }
-
-    for (j in 1..4000) {
-      LookupImpl l = null
-      edt {
-        l = LookupManager.getInstance(project).activeLookup
-      }
-      if (!l || !l.calculating) {
-        edt {} // for invokeLater in CompletionProgressIndicator.stop()
-        return
-      }
-      Thread.sleep(10)
-    }
-    printThreadDump()
-    fail("Too long completion")
+    myTester.joinCompletion()
   }
 
-  final static AtomicInteger cnt = new AtomicInteger()
   protected def joinCommit(Closure c1={}) {
-    final AtomicBoolean committed = new AtomicBoolean()
-    final AtomicBoolean run = new AtomicBoolean()
-    boolean executed=true;
-    def closureSeq = cnt.getAndIncrement()
-    Runnable r = new Runnable() {
-      @Override
-      public void run() {
-        run.set(true)
-        ApplicationManager.application.invokeLater {
-          c1();
-          committed.set(true)
-        };
-      }
-
-      @Override
-      public String toString() {
-        return "Closure "+closureSeq;
-      }
-    };
-    edt {
-      executed = PsiDocumentManager.getInstance(project).performWhenAllCommitted(r);
-    }
-    assert !ApplicationManager.getApplication().isWriteAccessAllowed()
-    assert !ApplicationManager.getApplication().isReadAccessAllowed()
-    assert !ApplicationManager.getApplication().isDispatchThread()
-    def start = System.currentTimeMillis()
-    while (!committed.get()) {
-      if ((System.currentTimeMillis() - start) % 1000 == 0) {
-      //  println("waiting..." + ((PsiDocumentManagerImpl)PsiDocumentManager.getInstance(project)).printStat())
-      }
-      if (System.currentTimeMillis() - start >= 20000) {
-        fail("too long waiting for documents to be committed. executed: $executed; r: $r; run: $run; ")
-        printThreadDump()
-      }
-      UIUtil.pump();
-    }
+    myTester.joinCommit(c1)
   }
 
   protected void joinAutopopup() {
-    joinAlarm();
-    joinCommit() // physical document commit
-    joinCommit() // file copy commit in background
+    myTester.joinAutopopup()
   }
 
   protected def joinAlarm() {
-    AutoPopupController.getInstance(getProject()).executePendingRequests()
+    myTester.joinAlarm()
   }
 
   @Override protected void runTest() {
-    runTestBare()
+    myTester.runWithAutoPopupEnabled { runTestBare() }
   }
 
   @Override protected boolean runInDispatchThread() {