Skip to content

Commit 0bb8226

Browse files
Copilotlaeubi
andcommitted
Ensure listener cleanup in finally block
Co-authored-by: laeubi <1331477+laeubi@users.noreply.github.com>
1 parent 582b0ab commit 0bb8226

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentListener.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,19 @@ private void testListener(final int[] segments, boolean exceptionExpected) {
6060

6161
listenerCalled = false;
6262
text.addBidiSegmentListener(listener);
63-
if (exceptionExpected) {
64-
assertThrows(IllegalArgumentException.class, () -> text.getLocationAtOffset(0), " expected exception not thrown");
65-
} else {
66-
text.getLocationAtOffset(0);
67-
}
68-
text.removeBidiSegmentListener(listener);
69-
if (SwtTestUtil.isBidi()) {
70-
assertTrue(listenerCalled, " listener not called");
71-
} else {
72-
assertFalse(listenerCalled, " listener called when it shouldn't be");
63+
try {
64+
if (exceptionExpected) {
65+
assertThrows(IllegalArgumentException.class, () -> text.getLocationAtOffset(0), " expected exception not thrown");
66+
} else {
67+
text.getLocationAtOffset(0);
68+
}
69+
if (SwtTestUtil.isBidi()) {
70+
assertTrue(listenerCalled, " listener not called");
71+
} else {
72+
assertFalse(listenerCalled, " listener called when it shouldn't be");
73+
}
74+
} finally {
75+
text.removeBidiSegmentListener(listener);
7376
}
7477
}
7578
private void testStyleRangeSegmenting(final int[] segments, int[] boldRanges) {

0 commit comments

Comments
 (0)