Skip to content

Migrate try-catch-fail patterns to assertThrows #4054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Jun 3, 2026
+90 −209
Merged

Migrate try-catch-fail patterns to assertThrows #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions ...tabinding.conformance/src/org/eclipse/jface/databinding/conformance/util/RealmTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

package org.eclipse.jface.databinding.conformance.util;

import static org.junit.Assert.assertThrows;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.AssertionFailedException;
import org.junit.Assert;
Expand Down Expand Up @@ -64,11 +66,8 @@ public static void exerciseCurrent(Runnable runnable) {
previousRealm.setCurrent(false);
}

try {
runnable.run();
Assert.fail("Incorrect realm, exception should have been thrown");
} catch (AssertionFailedException e) {
}
assertThrows("Incorrect realm, exception should have been thrown", AssertionFailedException.class,
runnable::run);
} finally {
setDefault(previousRealm);
}
Expand All @@ -90,10 +89,7 @@ public static void exerciseCurrent(Runnable runnable, CurrentRealm realm) {

realm.setCurrent(false);

try {
runnable.run();
Assert.fail("Incorrect realm, exception should have been thrown");
} catch (AssertionFailedException e) {
}
assertThrows("Incorrect realm, exception should have been thrown", AssertionFailedException.class,
runnable::run);
}
}
13 changes: 5 additions & 8 deletions .../org.eclipse.jface.tests/src/org/eclipse/jface/tests/fieldassist/FieldAssistAPITests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
******************************************************************************/
package org.eclipse.jface.tests.fieldassist;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;

import org.eclipse.jface.fieldassist.ContentProposal;
import org.eclipse.jface.fieldassist.IContentProposal;
Expand Down Expand Up @@ -67,12 +67,9 @@ public void testContentProposalWithDescription() {

@Test
public void testInitializationWithInvalidCursor() {
try {
proposal = new ContentProposal(content, label, description, 100);
fail("4.0");
} catch (IllegalArgumentException e) {
assertNull(proposal, "It is expected to be null");
}
assertThrows(IllegalArgumentException.class,
() -> proposal = new ContentProposal(content, label, description, 100), "4.0");
assertNull(proposal, "It is expected to be null");
}

@Override
Expand Down
270 changes: 79 additions & 191 deletions ...h.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
*******************************************************************************/
package org.eclipse.ui.workbench.texteditor.tests.revisions;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -128,227 +128,115 @@ public void testSplit() throws Exception {
}

@Test
public void testIllegalOperations() throws Exception {
public void testIllegalOperations() {

try {
Range.copy(null);
fail();
} catch (NullPointerException e) {
}
assertThrows(NullPointerException.class, () -> Range.copy(null));

try {
Range.createRelative(0, 0);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createRelative(0, 0));

try {
Range.createRelative(0, -1);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createRelative(0, -1));

try {
Range.createRelative(-1, 0);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createRelative(-1, 0));

try {
Range.createRelative(-1, -1);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createRelative(-1, -1));

try {
Range.createAbsolute(0, 0);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(0, 0));

try {
Range.createAbsolute(0, -1);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(0, -1));

try {
Range.createAbsolute(-1, 0);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(-1, 0));

try {
Range.createAbsolute(-1, 12);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(-1, 12));

try {
Range.createAbsolute(10, 10);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(10, 10));

try {
Range.createAbsolute(12, 10);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(12, 10));

try {
Range.createAbsolute(12, -3);
fail();
} catch (LineIndexOutOfBoundsException e) {
}
assertThrows(LineIndexOutOfBoundsException.class, () -> Range.createAbsolute(12, -3));

Range r= Range.createRelative(5, 10);

try {
r.moveBy(-6);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.moveBy(-6));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

r.moveBy(-4);
try {
r.moveBy(-2);
fail();
} catch (LineIndexOutOfBoundsException e) {
r.moveBy(4);
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.moveBy(-2));
r.moveBy(4);
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.resizeBy(-11);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.resizeBy(-11));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.resizeAndMoveBy(-6);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.resizeAndMoveBy(-6));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.resizeAndMoveBy(10);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.resizeAndMoveBy(10));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.resizeAndMoveBy(11);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.resizeAndMoveBy(11));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.resizeAndMoveBy(20);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.resizeAndMoveBy(20));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setLength(0);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setLength(0));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setLength(-1);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setLength(-1));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.moveTo(-1);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.moveTo(-1));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setEnd(5);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setEnd(5));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setEnd(3);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setEnd(3));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setEnd(-5);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setEnd(-5));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setStart(18);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setStart(18));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.moveEndTo(9);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.moveEndTo(9));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);

try {
r.setLengthAndMove(16);
fail();
} catch (LineIndexOutOfBoundsException e) {
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}
assertThrows(LineIndexOutOfBoundsException.class, () -> r.setLengthAndMove(16));
assertEquals(5, r.start());
assertEquals(10, r.length());
assertConsistency(r);
}

@Test
Expand Down
Loading