From c7e475e50ea6f0ffca55783cd66b962035b1ffbf Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 26 Sep 2017 13:57:03 -0400 Subject: [PATCH] Bug 524338 - Make sure SemanticHighlightingTest.teardown() is called even if an exception was thrown during the test run Change-Id: Idd19728c2e920d1bb8a590863c40d8646f916e1a --- .../ui/tests/text/SemanticHighlightingTest.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java index b9ab582e367..4ff0042aedd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java @@ -184,9 +184,7 @@ public class SemanticHighlightingTest extends TestCase { return document.getPositions(positionCategory); } - private void makeAssertions(boolean isCpp) throws Exception { - setup(isCpp); - + private void doMakeAssertions() throws Exception { IDocument document = fSourceViewer.getDocument(); int lines = document.getNumberOfLines(); @@ -217,8 +215,15 @@ public class SemanticHighlightingTest extends TestCase { } assertEqualMaps(actual, expected); - - teardown(); + } + + private void makeAssertions(boolean isCpp) throws Exception { + setup(isCpp); + try { + doMakeAssertions(); + } finally { + teardown(); + } } private void makeAssertions() throws Exception {