diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/AddAnnotationFixTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/AddAnnotationFixTest.java index eae11e20d8da..d911b7b0fa6f 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/AddAnnotationFixTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/AddAnnotationFixTest.java @@ -82,12 +82,14 @@ public class AddAnnotationFixTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; myModule = null; myProject = null; myBusConnection = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/ClsGenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/ClsGenericsHighlightingTest.java index 4742e101dc8a..5cb03b4e9ad9 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/ClsGenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/ClsGenericsHighlightingTest.java @@ -58,6 +58,9 @@ public abstract class ClsGenericsHighlightingTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; myModule = null; diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java index 83d7d477fcbd..033689547579 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java @@ -62,11 +62,13 @@ public class ExternalAnnotationsTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; myModule = null; myProject = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/MultipleJdksHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/MultipleJdksHighlightingTest.java index d0a579c84361..52100fb0890e 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/MultipleJdksHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/MultipleJdksHighlightingTest.java @@ -51,12 +51,14 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; myJava3Module = null; myJava7Module = null; myJava8Module = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/SuppressExternalTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/SuppressExternalTest.java index d9afd3128bd8..f724cbbbc7d7 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/SuppressExternalTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/SuppressExternalTest.java @@ -69,6 +69,9 @@ public class SuppressExternalTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; super.tearDown(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/AbstractLayoutCodeProcessorTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/AbstractLayoutCodeProcessorTest.java index 154eef353a7c..54f7b642550f 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/AbstractLayoutCodeProcessorTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/AbstractLayoutCodeProcessorTest.java @@ -105,9 +105,11 @@ public abstract class AbstractLayoutCodeProcessorTest extends PsiTestCase { try { VfsTestUtil.deleteFile(myWorkingDirectory.getVirtualFile()); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myWorkingDirectory = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java index e5b2dbb839d7..d39b18bf704c 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/impl/DaemonRespondToChangesTest.java @@ -152,6 +152,9 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { ProjectManagerEx.getInstanceEx().forceCloseProject(project, false); } } + catch (Throwable e) { + addSuppressedException(e); + } finally { myDaemonCodeAnalyzer = null; super.tearDown(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java index 3738e10bc99f..e8c3cae61af1 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/indentOptionsProvider/FileIndentProviderTest.java @@ -57,11 +57,13 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC Extensions.getRootArea().getExtensionPoint(FileIndentOptionsProvider.EP_NAME); extensionPoint.unregisterExtension(TEST_FILE_INDENT_OPTIONS_PROVIDER); } + catch (Throwable e) { + addSuppressedException(e); + } finally { - myTestIndentOptions = null; - myUseOnFullReformat = false; - - super.tearDown(); + myTestIndentOptions = null; + myUseOnFullReformat = false; + super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java index 38f5e52c2060..67eb332d7e7b 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/BlockMarkerCommentsTest.java @@ -44,9 +44,11 @@ public class BlockMarkerCommentsTest extends LightCodeInsightFixtureTestCase { try { myFixture.disableInspections(myInspection); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myInspection = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/OfflineInspectionResultViewTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/OfflineInspectionResultViewTest.java index f4a4249350eb..a9b40d7e2ff2 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/OfflineInspectionResultViewTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/OfflineInspectionResultViewTest.java @@ -93,7 +93,9 @@ public class OfflineInspectionResultViewTest extends TestSourceBasedTestCase { protected void tearDown() throws Exception { try { Disposer.dispose(myView); - + } + catch (Throwable e) { + addSuppressedException(e); } finally { InspectionProfileImpl.INIT_INSPECTIONS = false; diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java index 097407497b21..120cb3a9bbee 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java @@ -31,6 +31,9 @@ public class SameParameterValueSlashesTest extends LightCodeInsightFixtureTestCa try { myFixture.disableInspections(myInspection); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myInspection = null; super.tearDown(); diff --git a/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java index c24153214d8b..b70d50b10b8d 100644 --- a/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesFindUsagesTest.java @@ -50,6 +50,9 @@ public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase { CompilerReferenceService.IS_ENABLED_KEY.setValue(myDefaultEnableState); myCompilerTester.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myCompilerTester = null; super.tearDown(); diff --git a/java/java-tests/testSrc/com/intellij/java/execution/AntImportTest.java b/java/java-tests/testSrc/com/intellij/java/execution/AntImportTest.java index 6736905710e4..5d029c1571b0 100644 --- a/java/java-tests/testSrc/com/intellij/java/execution/AntImportTest.java +++ b/java/java-tests/testSrc/com/intellij/java/execution/AntImportTest.java @@ -44,10 +44,12 @@ public class AntImportTest extends BaseSMTRunnerTestCase { Disposer.dispose(myEventsProcessor); Disposer.dispose(myRootNode); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myRootNode = null; myEventsProcessor = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/JavaSOEOnReparsePerformanceTest.java b/java/java-tests/testSrc/com/intellij/java/psi/JavaSOEOnReparsePerformanceTest.java index 5e4a07872d8b..197b93220728 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/JavaSOEOnReparsePerformanceTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/JavaSOEOnReparsePerformanceTest.java @@ -40,6 +40,9 @@ public class JavaSOEOnReparsePerformanceTest extends LightDaemonAnalyzerTestCase myHugeExpr = null; } } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/AnnotationFormatterTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/AnnotationFormatterTest.java index 35a493d57740..db905a73dd69 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/AnnotationFormatterTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/AnnotationFormatterTest.java @@ -35,6 +35,9 @@ public class AnnotationFormatterTest extends JavaFormatterTestCase { try { CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/IndentTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/IndentTest.java index cee6d2b5b833..877867639b90 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/IndentTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/IndentTest.java @@ -23,7 +23,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; -import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.testFramework.LightIdeaTestCase; @@ -178,6 +177,9 @@ public class IndentTest extends LightIdeaTestCase { try { defaultSettings(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/resolve/Resolve15TestCase.java b/java/java-tests/testSrc/com/intellij/java/psi/resolve/Resolve15TestCase.java index 29b498fedf7b..76aca5c00896 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/resolve/Resolve15TestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/resolve/Resolve15TestCase.java @@ -40,6 +40,9 @@ public abstract class Resolve15TestCase extends ResolveTestCase { try { LanguageLevelProjectExtension.getInstance(myJavaFacade.getProject()).setLanguageLevel(myOldLanguageLevel); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodObject4DebuggerTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodObject4DebuggerTest.java index 64ca8200f096..56ed3b5cb6d9 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodObject4DebuggerTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodObject4DebuggerTest.java @@ -68,6 +68,9 @@ public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase { Registry.get("debugger.compiling.evaluator.magic.accessor").resetToDefault(); Registry.get("debugger.compiling.evaluator.reflection.access.with.java8").resetToDefault(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/MultipleJdksMoveClassTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/MultipleJdksMoveClassTest.java index f87185dd4474..b1d37bdee75b 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/MultipleJdksMoveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/MultipleJdksMoveClassTest.java @@ -42,11 +42,13 @@ public class MultipleJdksMoveClassTest extends UsefulTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; myJava7Module = null; myJava8Module = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/openapi/command/undo/DocumentCopyUndoTest.java b/java/java-tests/testSrc/com/intellij/openapi/command/undo/DocumentCopyUndoTest.java index 68a9f52073f4..0fdd3f9c4758 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/command/undo/DocumentCopyUndoTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/command/undo/DocumentCopyUndoTest.java @@ -36,6 +36,9 @@ public class DocumentCopyUndoTest extends UndoTestCase { getEditorFactory().releaseEditor(myEditorCopy1); getEditorFactory().releaseEditor(myEditorCopy2); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myEditor = null; myEditorCopy1 = null; diff --git a/java/java-tests/testSrc/com/intellij/openapi/command/undo/EditorUndoTestCase.java b/java/java-tests/testSrc/com/intellij/openapi/command/undo/EditorUndoTestCase.java index 8bcadfe7c3bd..527cc6fe18fa 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/command/undo/EditorUndoTestCase.java +++ b/java/java-tests/testSrc/com/intellij/openapi/command/undo/EditorUndoTestCase.java @@ -61,6 +61,9 @@ public abstract class EditorUndoTestCase extends UndoTestCase { Messages.setTestDialog(myOldTestDialog); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myView = null; myEditors = null; diff --git a/java/java-tests/testSrc/com/intellij/openapi/command/undo/GlobalUndoTest.java b/java/java-tests/testSrc/com/intellij/openapi/command/undo/GlobalUndoTest.java index a2ba9f74eb10..095b1df84b8c 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/command/undo/GlobalUndoTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/command/undo/GlobalUndoTest.java @@ -67,6 +67,9 @@ public class GlobalUndoTest extends UndoTestCase implements TestDialog { myContainingFile = null; myClass = null; } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java b/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java index 579072dae561..84dbd849d73f 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java +++ b/java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java @@ -56,6 +56,9 @@ public abstract class UndoTestCase extends CodeInsightTestCase { myManager = null; myOldEditorProvider = null; } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProviderTest.java b/java/java-tests/testSrc/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProviderTest.java index d47a126efa8e..3838715354e5 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProviderTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/roots/ui/configuration/actions/ModuleDeleteProviderTest.java @@ -126,6 +126,9 @@ public class ModuleDeleteProviderTest extends PlatformTestCase { try { Messages.setTestDialog(TestDialog.DEFAULT); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java index 0cde9ec8a111..f4454db92bfb 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ManagingContentRootFoldersTest.java @@ -51,10 +51,12 @@ public class ManagingContentRootFoldersTest extends IdeaTestCase { myModel.dispose(); } } + catch (Throwable e) { + addSuppressedException(e); + } finally { myModel = null; entry = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java index 8800cb8baa6d..91a2258f676a 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java @@ -54,9 +54,11 @@ public class ModuleScopesTest extends ModuleTestCase { try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; - super.tearDown(); } } diff --git a/java/java-tests/testSrc/com/intellij/roots/RenameModuleTest.java b/java/java-tests/testSrc/com/intellij/roots/RenameModuleTest.java index 097dce130154..86509e358b1b 100644 --- a/java/java-tests/testSrc/com/intellij/roots/RenameModuleTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/RenameModuleTest.java @@ -46,6 +46,9 @@ public class RenameModuleTest extends ModuleTestCase { try { Messages.setTestInputDialog(TestInputDialog.DEFAULT); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); } diff --git a/java/java-tests/testSrc/com/intellij/roots/libraries/CreateModuleLibraryFromFilesTest.java b/java/java-tests/testSrc/com/intellij/roots/libraries/CreateModuleLibraryFromFilesTest.java index 09f99443a204..c4705a67df2e 100644 --- a/java/java-tests/testSrc/com/intellij/roots/libraries/CreateModuleLibraryFromFilesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/libraries/CreateModuleLibraryFromFilesTest.java @@ -47,6 +47,9 @@ public class CreateModuleLibraryFromFilesTest extends ModuleRootManagerTestCase try { myModifiableRootModel.dispose(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myModifiableModel = null; myModifiableRootModel = null; diff --git a/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java b/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java index 6e97c67b3720..ba24145d9053 100644 --- a/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java +++ b/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java @@ -21,6 +21,9 @@ public class UnscrambleDialogTest extends JavaCodeInsightFixtureTestCase { try { Disposer.dispose(myContent); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myContent = null; super.tearDown(); diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java index 7780f85650ca..b5df3db902a6 100644 --- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java +++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java @@ -35,7 +35,11 @@ public abstract class JsonSchemaHeavyAbstractTest extends CompletionTestCase { //WriteCommandAction.runWriteCommandAction(getProject(), () -> myFileTypeManager.removeAssociatedExtension(JsonSchemaFileType.INSTANCE, "*Schema.json")); final JsonSchemaMappingsProjectConfiguration instance = JsonSchemaMappingsProjectConfiguration.getInstance(getProject()); instance.setState(Collections.emptyMap()); - } finally { + } + catch (Throwable e) { + addSuppressedException(e); + } + finally { super.tearDown(); } } diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/BlockingMethodInNonBlockingContextInspectionTest.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/BlockingMethodInNonBlockingContextInspectionTest.java index aed9c1495539..57aad421ce85 100644 --- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/BlockingMethodInNonBlockingContextInspectionTest.java +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/BlockingMethodInNonBlockingContextInspectionTest.java @@ -24,6 +24,9 @@ public class BlockingMethodInNonBlockingContextInspectionTest extends UsefulTest try { myFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFixture = null; super.tearDown(); diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java index fddf71659813..53213ddf5d35 100644 --- a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java +++ b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java @@ -72,10 +72,12 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase { try { Disposer.dispose(myDisposable); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myFooElementFile = null; myBarElementFile = null; - super.tearDown(); } } diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java index a6d158b421f9..f4302173892d 100644 --- a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java +++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java @@ -121,9 +121,11 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide try { myTestFixture.tearDown(); } + catch (Throwable e) { + addSuppressedException(e); + } finally { myTestFixture = null; - super.tearDown(); } } diff --git a/xml/tests/src/com/intellij/codeInsight/editorActions/HtmlSelectWordTest.java b/xml/tests/src/com/intellij/codeInsight/editorActions/HtmlSelectWordTest.java index 6a47183b3523..9f465027927b 100644 --- a/xml/tests/src/com/intellij/codeInsight/editorActions/HtmlSelectWordTest.java +++ b/xml/tests/src/com/intellij/codeInsight/editorActions/HtmlSelectWordTest.java @@ -39,6 +39,9 @@ public class HtmlSelectWordTest extends LightCodeInsightFixtureTestCase { try { WebEditorOptions.getInstance().setSelectWholeCssIdentifierOnDoubleClick(oldSelectWholeCssSelectorOptionValue); } + catch (Throwable e) { + addSuppressedException(e); + } finally { super.tearDown(); }