do not ignore suppressed exceptions

This commit is contained in:
Alexey Kudravtsev
2018-12-03 11:57:47 +03:00
parent ae3b36fd74
commit fffea92b1e
34 changed files with 107 additions and 18 deletions
@@ -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();
}
}
@@ -58,6 +58,9 @@ public abstract class ClsGenericsHighlightingTest extends UsefulTestCase {
try {
myFixture.tearDown();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myFixture = null;
myModule = null;
@@ -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();
}
}
@@ -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();
}
}
@@ -69,6 +69,9 @@ public class SuppressExternalTest extends UsefulTestCase {
try {
myFixture.tearDown();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myFixture = null;
super.tearDown();
@@ -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();
}
}
@@ -152,6 +152,9 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
ProjectManagerEx.getInstanceEx().forceCloseProject(project, false);
}
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myDaemonCodeAnalyzer = null;
super.tearDown();
@@ -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();
}
}
@@ -44,9 +44,11 @@ public class BlockMarkerCommentsTest extends LightCodeInsightFixtureTestCase {
try {
myFixture.disableInspections(myInspection);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myInspection = null;
super.tearDown();
}
}
@@ -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;
@@ -31,6 +31,9 @@ public class SameParameterValueSlashesTest extends LightCodeInsightFixtureTestCa
try {
myFixture.disableInspections(myInspection);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myInspection = null;
super.tearDown();
@@ -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();
@@ -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();
}
}
@@ -40,6 +40,9 @@ public class JavaSOEOnReparsePerformanceTest extends LightDaemonAnalyzerTestCase
myHugeExpr = null;
}
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -35,6 +35,9 @@ public class AnnotationFormatterTest extends JavaFormatterTestCase {
try {
CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -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();
}
@@ -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();
}
@@ -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();
}
@@ -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();
}
}
@@ -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;
@@ -61,6 +61,9 @@ public abstract class EditorUndoTestCase extends UndoTestCase {
Messages.setTestDialog(myOldTestDialog);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myView = null;
myEditors = null;
@@ -67,6 +67,9 @@ public class GlobalUndoTest extends UndoTestCase implements TestDialog {
myContainingFile = null;
myClass = null;
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -56,6 +56,9 @@ public abstract class UndoTestCase extends CodeInsightTestCase {
myManager = null;
myOldEditorProvider = null;
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -126,6 +126,9 @@ public class ModuleDeleteProviderTest extends PlatformTestCase {
try {
Messages.setTestDialog(TestDialog.DEFAULT);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -51,10 +51,12 @@ public class ManagingContentRootFoldersTest extends IdeaTestCase {
myModel.dispose();
}
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myModel = null;
entry = null;
super.tearDown();
}
}
@@ -54,9 +54,11 @@ public class ModuleScopesTest extends ModuleTestCase {
try {
myFixture.tearDown();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myFixture = null;
super.tearDown();
}
}
@@ -46,6 +46,9 @@ public class RenameModuleTest extends ModuleTestCase {
try {
Messages.setTestInputDialog(TestInputDialog.DEFAULT);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}
@@ -47,6 +47,9 @@ public class CreateModuleLibraryFromFilesTest extends ModuleRootManagerTestCase
try {
myModifiableRootModel.dispose();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myModifiableModel = null;
myModifiableRootModel = null;
@@ -21,6 +21,9 @@ public class UnscrambleDialogTest extends JavaCodeInsightFixtureTestCase {
try {
Disposer.dispose(myContent);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myContent = null;
super.tearDown();
@@ -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();
}
}
@@ -24,6 +24,9 @@ public class BlockingMethodInNonBlockingContextInspectionTest extends UsefulTest
try {
myFixture.tearDown();
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
myFixture = null;
super.tearDown();
@@ -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();
}
}
@@ -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();
}
}
@@ -39,6 +39,9 @@ public class HtmlSelectWordTest extends LightCodeInsightFixtureTestCase {
try {
WebEditorOptions.getInstance().setSelectWholeCssIdentifierOnDoubleClick(oldSelectWholeCssSelectorOptionValue);
}
catch (Throwable e) {
addSuppressedException(e);
}
finally {
super.tearDown();
}