From b52c2380cd9a5d7ddea172db9dc418008337e268 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 27 Oct 2016 10:02:33 +0200 Subject: [PATCH] do less stuff in test tearDown --- .../testFramework/LightPlatformTestCase.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index acd884a43280..772557da2fab 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -420,9 +420,6 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da if (encodingManager instanceof EncodingManagerImpl) ((EncodingManagerImpl)encodingManager).clearDocumentQueue(); FileDocumentManager manager = FileDocumentManager.getInstance(); - - ApplicationManager.getApplication().runWriteAction(EmptyRunnable.getInstance()); // Flush postponed formatting if any. - manager.saveAllDocuments(); if (manager instanceof FileDocumentManagerImpl) { ((FileDocumentManagerImpl)manager).dropAllUnsavedDocuments(); } @@ -439,12 +436,8 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da ((HintManagerImpl)HintManager.getInstance()).cleanup(); DocumentCommitThread.getInstance().clearQueue(); - EdtTestUtil.runInEdtAndWait(() -> { - ((UndoManagerImpl)UndoManager.getGlobalInstance()).dropHistoryInTests(); - ((UndoManagerImpl)UndoManager.getInstance(project)).dropHistoryInTests(); - - UIUtil.dispatchAllInvocationEvents(); - }); + ((UndoManagerImpl)UndoManager.getGlobalInstance()).dropHistoryInTests(); + ((UndoManagerImpl)UndoManager.getInstance(project)).dropHistoryInTests(); TemplateDataLanguageMappings.getInstance(project).cleanupForNextTest(); } @@ -456,11 +449,14 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da CompletionProgressIndicator.cleanupForNextTest(); } + documentManager.clearUncommittedDocuments(); + + UIUtil.dispatchAllInvocationEvents(); + if (checkForEditors) { checkEditorsReleased(exceptions); } - documentManager.clearUncommittedDocuments(); - + if (ourTestCount++ % 100 == 0) { // some tests are written in Groovy, and running all of them may result in some 40M of memory wasted on bean infos // so let's clear the cache every now and then to ensure it doesn't grow too large