diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java')
| -rw-r--r-- | platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java index 92b2ebad945c..99c6f5b5d25a 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -15,7 +15,6 @@ */ package com.intellij.ide.util.treeView; -import com.intellij.openapi.diagnostic.Log; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Progressive; @@ -2753,22 +2752,6 @@ public class TreeUiTest extends AbstractTreeBuilderTest { return suite; } - @Override - protected void tearDown() throws Exception { - AbstractTreeUi ui = getBuilder().getUi(); - if (ui != null) { - ui.getReady(this).doWhenProcessed(new Runnable() { - @Override - public void run() { - Log.flush(); - } - }); - } else { - Log.flush(); - } - super.tearDown(); - } - private abstract static class MyRunnable implements Runnable { @Override public final void run() { |