Skip to content

Use assertThrows in ToolBar tests #2301

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
merged 1 commit into from
Jul 10, 2025
Merged

Use assertThrows in ToolBar tests #2301

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
26 changes: 6 additions & 20 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -45,12 +45,7 @@ public void setUp() {
@Override
@Test
public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
try {
new ToolBar(null, 0);
fail("No exception thrown for parent == null");
}
catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown for parent == null", IllegalArgumentException.class, () -> new ToolBar(null, 0));
}

@Override
Expand Down Expand Up @@ -84,17 +79,12 @@ public void test_getItemI() {
}

toolBar = new ToolBar(shell, 0);
number = 5;
items = new ToolItem[number];
for (int i = 0; i<number ; i++){
items[i] = new ToolItem(toolBar, 0);
}
try {
toolBar.getItem(number);
fail("No exception thrown for illegal index argument");
}
catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown for illegal index argument", IllegalArgumentException.class, ()->
toolBar.getItem(number));
}

@Test
Expand Down Expand Up @@ -159,12 +149,8 @@ public void test_indexOfLorg_eclipse_swt_widgets_ToolItem() {
tis[i] = new ToolItem(toolBar, 0);
}
for (int i = 0; i<number ; i++){
try {
toolBar.indexOf(null);
fail("No exception thrown for toolItem == null");
}
catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown for toolItem == null", IllegalArgumentException.class,
() -> toolBar.indexOf(null));
}
}

Expand Down
Loading