From c69f14fabc675e346e59e28e7010be2ba7f26f23 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 20 Mar 2017 15:37:12 +0300
Subject: [PATCH] don't wait 2sec for every test in ProjectWizardTestCase.java
 because of JBCardLayout

JBCardLayout doesn't run any animation in unit test mode anymore
---
 .../projectWizard/ProjectWizardTestCase.java  | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index 3562e386c123..c15b4ba5d959 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -173,26 +173,23 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
 
   @Override
   public void tearDown() throws Exception {
-    if (myWizard != null) {
-      Disposer.dispose(myWizard.getDisposable());
-      myWizard = null;
-    }
-    if (myCreatedProject != null) {
-      myProjectManager.closeProject(myCreatedProject);
-      ApplicationManager.getApplication().runWriteAction(() -> Disposer.dispose(myCreatedProject));
-      myCreatedProject = null;
-    }
-    ApplicationManager.getApplication().runWriteAction(() -> {
-      ProjectRootManager.getInstance(myProjectManager.getDefaultProject()).setProjectSdk(myOldDefaultProjectSdk);
-      for (Sdk sdk : mySdks) {
-        ProjectJdkTable.getInstance().removeJdk(sdk);
-      }
-    });
-    SelectTemplateSettings.getInstance().setLastTemplate(null, null);
     try {
-      UIUtil.dispatchAllInvocationEvents();
-      Thread.sleep(2000); //wait for JBCardLayout release timers
-      UIUtil.dispatchAllInvocationEvents();
+      if (myWizard != null) {
+        Disposer.dispose(myWizard.getDisposable());
+        myWizard = null;
+      }
+      if (myCreatedProject != null) {
+        myProjectManager.closeProject(myCreatedProject);
+        ApplicationManager.getApplication().runWriteAction(() -> Disposer.dispose(myCreatedProject));
+        myCreatedProject = null;
+      }
+      ApplicationManager.getApplication().runWriteAction(() -> {
+        ProjectRootManager.getInstance(myProjectManager.getDefaultProject()).setProjectSdk(myOldDefaultProjectSdk);
+        for (Sdk sdk : mySdks) {
+          ProjectJdkTable.getInstance().removeJdk(sdk);
+        }
+      });
+      SelectTemplateSettings.getInstance().setLastTemplate(null, null);
     }
     finally {
       super.tearDown();