From 2395a55f8e3a468548c4c1997649781f9a92cb79 Mon Sep 17 00:00:00 2001
From: Aleksandar Kurtakov <akurtakov@gmail.com>
Date: Thu, 10 Jul 2025 12:11:55 +0300
Subject: [PATCH] Use assertThrows in ToolBar tests

---
 .../Test_org_eclipse_swt_widgets_ToolBar.java | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java
index f522352d95e..6547f2da356 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java	
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java	
@@ -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;
@@ -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
@@ -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
@@ -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));
 	}
 }