Streamline Junit Asserts - Nov18

Remove all SonarLint warnings for "Use AssetEquals instead of
AssertTrue" as well as some AssertNull/AssertThrows changes in the
listed files.

Change-Id: Ida4f7e165e984827ebfd496490b8e09cb18083e3
Signed-off-by: Joel Majano <jmajano@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/187909
Tested-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>

13 files changed, 61 insertions, 68 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java
index 29f960aadd..1d51966aae 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java
@@ -82,8 +82,8 @@ public void test_getImage() {
 @Test
 public void test_getLocation() {
 	decorations.setLocation(10,15);
-	assertTrue(":a:", decorations.getLocation().x == 10);
-	assertTrue(":b:", decorations.getLocation().y == 15);
+	assertEquals(":a:", 10, decorations.getLocation().x);
+	assertEquals(":b:", 15, decorations.getLocation().y);
 }
 
 @Test
@@ -97,7 +97,7 @@ public void test_getMenuBar() {
 @Test
 public void test_getText() {
 	decorations.setText("test");
-	assertTrue(":a:", decorations.getText().equals("test"));
+	assertEquals(":a:", "test", decorations.getText());
 }
 
 @Override
@@ -170,7 +170,7 @@ public void test_setTextLjava_lang_String() {
 
 	String testStr = "test string";
 	decorations.setText(testStr);
-	assertTrue("a", decorations.getText().equals(testStr));
+	assertEquals("a", testStr, decorations.getText());
 	decorations.setText("");
 	assertTrue("b", decorations.getText().isEmpty());
 	try {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java
index eb15185815..2ee461db33 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -56,7 +57,7 @@ public void test_setTextLjava_lang_String() {
 	assertTrue(":1:", dialog.getText() == "");
 	String testStr = "test string";
 	dialog.setText(testStr);
-	assertTrue(":2:", dialog.getText().equals(testStr));
+	assertEquals(":2:", testStr, dialog.getText());
 	dialog.setText("");
 	assertTrue(":3:", dialog.getText().isEmpty());
 	try {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java
index b9591e0ad6..87eafe7591 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java
@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -58,11 +60,11 @@ public void test_setFilterPathLjava_lang_String() {
 	assertTrue(":1:", dirDialog.getFilterPath() == "");
 	String testStr = "./*";
 	dirDialog.setFilterPath(testStr);
-	assertTrue(":2:", dirDialog.getFilterPath().equals(testStr));
+	assertEquals(":2:", testStr, dirDialog.getFilterPath());
 	dirDialog.setFilterPath("");
 	assertTrue(":3:", dirDialog.getFilterPath().isEmpty());
 	dirDialog.setFilterPath(null);
-	assertTrue(":4:", dirDialog.getFilterPath() == null);
+	assertNull(":4:", dirDialog.getFilterPath());
 }
 
 @Test
@@ -70,7 +72,7 @@ public void test_setMessageLjava_lang_String() {
 	assertTrue(":1:", dirDialog.getMessage() == "");
 	String testStr = "test string";
 	dirDialog.setMessage(testStr);
-	assertTrue(":2:", dirDialog.getMessage().equals(testStr));
+	assertEquals(":2:", testStr, dirDialog.getMessage());
 	dirDialog.setMessage("");
 	assertTrue(":3:", dirDialog.getMessage().isEmpty());
 	try {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java
index e882a7c8d4..e7f5d6e7ae 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java
@@ -149,7 +149,7 @@ public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
 public void test_getItemCount() {
 	int number = 10;
 	for (int i = 0; i < number; i++) {
-		assertTrue(":a:" + i, expandBar.getItemCount() == i);
+		assertEquals(":a:" + i, i, expandBar.getItemCount());
 		new ExpandItem(expandBar, 0);
 	}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java
index 4ff2212b00..2d7d2a042b 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java
@@ -56,10 +56,10 @@ public void test_ConstructorLorg_eclipse_swt_widgets_ExpandItemI() {
 public void test_ConstructorLorg_eclipse_swt_widgets_ExpandItemII() {
 	ExpandItem item = new ExpandItem(expandBar, SWT.NULL, 0); //create an expand item at index 0
 	assertNotNull(item);
-	assertTrue(expandBar.getItem(0).equals(item));
+	assertEquals(item, expandBar.getItem(0));
 	item = new ExpandItem(expandBar, SWT.NULL, 1);
 	assertNotNull(item);
-	assertTrue(expandBar.getItem(1).equals(item));
+	assertEquals(item, expandBar.getItem(1));
 }
 
 @Test
@@ -137,7 +137,7 @@ public void test_setImageLorg_eclipse_swt_graphics_Image() {
 @Test
 public void test_setTextLjava_lang_String() {
 	expandItem.setText("ABCDEFG");
-	assertTrue(expandItem.getText().equals("ABCDEFG"));
+	assertEquals("ABCDEFG", expandItem.getText());
 	try {
 		expandItem.setText(null);
 		fail("No exception thrown for addArmListener with null argument");
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java
index 0fd5caeab2..dca19c5b04 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -57,31 +58,31 @@ public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
 	int style = fd.getStyle();
 	style &= ~SWT.LEFT_TO_RIGHT;
 	style &= ~SWT.RIGHT_TO_LEFT;
-	assertTrue(style==SWT.APPLICATION_MODAL);
+	assertEquals(SWT.APPLICATION_MODAL, style);
 
 	fd = new FileDialog(shell, SWT.APPLICATION_MODAL);
 	style = fd.getStyle();
 	style &= ~SWT.LEFT_TO_RIGHT;
 	style &= ~SWT.RIGHT_TO_LEFT;
-	assertTrue(style==SWT.APPLICATION_MODAL);
+	assertEquals(SWT.APPLICATION_MODAL, style);
 
 	fd = new FileDialog(shell, SWT.PRIMARY_MODAL);
 	style = fd.getStyle();
 	style &= ~SWT.LEFT_TO_RIGHT;
 	style &= ~SWT.RIGHT_TO_LEFT;
-	assertTrue(style==SWT.PRIMARY_MODAL);
+	assertEquals(SWT.PRIMARY_MODAL, style);
 
 	fd = new FileDialog(shell, SWT.SYSTEM_MODAL);
 	style = fd.getStyle();
 	style &= ~SWT.LEFT_TO_RIGHT;
 	style &= ~SWT.RIGHT_TO_LEFT;
-	assertTrue(style==SWT.SYSTEM_MODAL);
+	assertEquals(SWT.SYSTEM_MODAL, style);
 }
 
 @Test
 public void test_getFileNames() {
 	String[] names = fileDialog.getFileNames();
-	assertTrue(names.length==0);
+	assertEquals(0, names.length);
 }
 
 @Test
@@ -100,19 +101,19 @@ public void test_setFileNameLjava_lang_String() {
 	assertNull(name);
 	fileDialog.setFileName("somefile.test");
 	name = fileDialog.getFileName();
-	assertTrue(name.equals("somefile.test"));
+	assertEquals("somefile.test", name);
 }
 
 @Test
 public void test_setFilterExtensions$Ljava_lang_String() {
 	fileDialog.setFilterExtensions(new String[] {"txt","java"});
 	String filters[] = fileDialog.getFilterExtensions();
-	assertTrue(filters.length == 2);
-	assertTrue(filters[0].equals("txt"));
-	assertTrue(filters[1].equals("java"));
+	assertEquals(2, filters.length);
+	assertEquals("txt", filters[0]);
+	assertEquals("java", filters[1]);
 	fileDialog.setFilterExtensions(new String[] {""});
 	filters = fileDialog.getFilterExtensions();
-	assertTrue(filters.length == 1);
+	assertEquals(1, filters.length);
 	fileDialog.setFilterExtensions(null);
 	filters = fileDialog.getFilterExtensions();
 	assertNull(filters);
@@ -122,12 +123,12 @@ public void test_setFilterExtensions$Ljava_lang_String() {
 public void test_setFilterNames$Ljava_lang_String() {
 	fileDialog.setFilterNames(new String[] {"a.txt","b.java"});
 	String filters[] = fileDialog.getFilterNames();
-	assertTrue(filters.length == 2);
-	assertTrue(filters[0].equals("a.txt"));
-	assertTrue(filters[1].equals("b.java"));
+	assertEquals(2, filters.length);
+	assertEquals("a.txt", filters[0]);
+	assertEquals("b.java", filters[1]);
 	fileDialog.setFilterNames(new String[] {""});
 	filters = fileDialog.getFilterNames();
-	assertTrue(filters.length == 1);
+	assertEquals(1, filters.length);
 	fileDialog.setFilterNames(null);
 	filters = fileDialog.getFilterNames();
 	assertNull(filters);
@@ -135,10 +136,10 @@ public void test_setFilterNames$Ljava_lang_String() {
 
 @Test
 public void test_setFilterPathLjava_lang_String() {
-	assertTrue(":1:", fileDialog.getFilterPath() == "");
+	assertEquals(":1:", "", fileDialog.getFilterPath());
 	String testStr = "./*";
 	fileDialog.setFilterPath(testStr);
-	assertTrue(":2:", fileDialog.getFilterPath().equals(testStr));
+	assertEquals(":2:", testStr, fileDialog.getFilterPath());
 	fileDialog.setFilterPath("");
 	assertTrue(":3:", fileDialog.getFilterPath().isEmpty());
 	fileDialog.setFilterPath(null);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java
index 3646416930..e636990810 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.eclipse.swt.SWT;
@@ -66,7 +66,7 @@ public void test_setTextLjava_lang_String() {
 	String[] cases = {"", "some text", "ldkashdoehufweovcnhslvhregojebckreavbkuhxbiufvcyhbifuyewvbiureyd.,cmnesljliewjfchvbwoifivbeworixuieurvbiuvbohflksjeahfcliureafgyciabelitvyrwtlicuyrtliureybcliuyreuceyvbliureybct"};
 	for (int i = 0; i < cases.length; i++) {
 		group.setText(cases[i]);
-		assertTrue("case: " + String.valueOf(i), group.getText().equals(cases[i]));
+		assertEquals("case: " + String.valueOf(i), cases[i], group.getText());
 	}
 }
 
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java
index a32ad05a25..52272a0921 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java
@@ -63,7 +63,7 @@ public void test_setImageLorg_eclipse_swt_graphics_Image() {
 public void test_setTextLjava_lang_String() {
 	String testStr = "test string";
 	item.setText(testStr);
-	assertTrue("a", item.getText().equals(testStr));
+	assertEquals("a", testStr, item.getText());
 	item.setText("");
 	assertTrue("b", item.getText().isEmpty());
 	try {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Link.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Link.java
index ef7a6240f1..ab1199effe 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Link.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Link.java
@@ -15,6 +15,7 @@ package org.eclipse.swt.tests.junit;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -180,6 +181,6 @@ public void test_setLinkForegroundLorg_eclipse_swt_graphics_Color() {
 	link.setLinkForeground(color);
 	assertEquals(color, link.getLinkForeground());
 	link.setLinkForeground(null);
-	assertFalse(link.getForeground().equals(color));
+	assertNotEquals(color, link.getForeground());
 }
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java
index dc4700123a..4bffa3d791 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java
@@ -1111,7 +1111,7 @@ public void test_removeI() {
 	list.remove(1);
 	assertEquals(2, list.getItemCount());
 	//////////////////////////////////////////////////////
-	assertTrue(list.getItem(1).equals("text3"));
+	assertEquals("text3", list.getItem(1));
 
 	list.setItems(items);
 	assertEquals(list.getItemCount(), 3);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java
index acd863420b..ba2fa405b1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java
@@ -59,19 +59,19 @@ public void test_ConstructorLorg_eclipse_swt_widgets_MenuI() {
 	catch (IllegalArgumentException e) {
 	}
 	mItem = new MenuItem(menu, SWT.CHECK);
-	assertTrue(mItem.getStyle()==SWT.CHECK);
+	assertEquals(SWT.CHECK, mItem.getStyle());
 	mItem.dispose();
 	mItem = new MenuItem(menu, SWT.CASCADE);
-	assertTrue(mItem.getStyle()==SWT.CASCADE);
+	assertEquals(SWT.CASCADE, mItem.getStyle());
 	mItem.dispose();
 	mItem = new MenuItem(menu, SWT.PUSH);
-	assertTrue(mItem.getStyle()==SWT.PUSH);
+	assertEquals(SWT.PUSH, mItem.getStyle());
 	mItem.dispose();
 	mItem = new MenuItem(menu, SWT.SEPARATOR);
-	assertTrue(mItem.getStyle()==SWT.SEPARATOR);
+	assertEquals(SWT.SEPARATOR, mItem.getStyle());
 	mItem.dispose();
 	mItem = new MenuItem(menu, SWT.RADIO);
-	assertTrue(mItem.getStyle()==SWT.RADIO);
+	assertEquals(SWT.RADIO, mItem.getStyle());
 	mItem.dispose();
 }
 
@@ -79,10 +79,10 @@ public void test_ConstructorLorg_eclipse_swt_widgets_MenuI() {
 public void test_ConstructorLorg_eclipse_swt_widgets_MenuII() {
 	MenuItem mItem = new MenuItem(menu, SWT.NULL, 0); //create a menu item at index 0
 	assertNotNull(mItem);
-	assertTrue(menu.getItem(0).equals(mItem));
+	assertEquals(mItem, menu.getItem(0));
 	mItem = new MenuItem(menu, SWT.NULL, 1);
 	assertNotNull(mItem);
-	assertTrue(menu.getItem(1).equals(mItem));
+	assertEquals(mItem, menu.getItem(1));
 }
 
 @Test
@@ -261,7 +261,7 @@ public void test_setSelectionZ() {
 @Test
 public void test_setTextLjava_lang_String() {
 	menuItem.setText("ABCDEFG");
-	assertTrue(menuItem.getText().equals("ABCDEFG"));
+	assertEquals("ABCDEFG", menuItem.getText());
 	try {
 		menuItem.setText(null);
 		fail("No exception thrown for addArmListener with null argument");
@@ -272,7 +272,7 @@ public void test_setTextLjava_lang_String() {
 	assertTrue(menuItem.getText().startsWith("ABCDEFG"));
 	menuItem.setAccelerator(0);
 	menuItem.setText("AB&CDEFG");
-	assertTrue(menuItem.getText().equals("AB&CDEFG"));
+	assertEquals("AB&CDEFG", menuItem.getText());
 }
 
 /* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
index 308ab5e281..9f6c85ba79 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
@@ -14,9 +14,9 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.eclipse.swt.graphics.Rectangle;
@@ -90,7 +90,7 @@ public void test_getZoom() {
 public void test_hashCode() {
 	for (Monitor monitor : monitors) {
 		if (primary.equals(monitor)) {
-			assertTrue(primary.hashCode() == monitor.hashCode());
+			assertEquals(monitor.hashCode(), primary.hashCode());
 			break;
 		}
 	}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java
index 3e084c26ca..8aa487d8ab 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java
@@ -14,6 +14,7 @@
 package org.eclipse.swt.tests.junit;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.swt.SWT;
@@ -49,7 +50,6 @@ protected String valueString(int[] intArray) {
 @Test
 public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
 	listenerCalled = false;
-	boolean exceptionThrown = false;
 	SelectionListener listener = new SelectionListener() {
 		@Override
 		public void widgetSelected(SelectionEvent event) {
@@ -59,25 +59,13 @@ public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener()
 		public void widgetDefaultSelected(SelectionEvent event) {
 		}
 	};
-	try {
-		scrollBar.addSelectionListener(null);
-	}
-	catch (IllegalArgumentException e) {
-		exceptionThrown = true;
-	}
-	assertTrue("Expected exception not thrown", exceptionThrown);
-	exceptionThrown = false;
+
+	assertThrows(IllegalArgumentException.class, () ->scrollBar.addSelectionListener(null));
 	scrollBar.addSelectionListener(listener);
 	scrollBar.setSelection(100);
-	assertTrue(":a:", listenerCalled == false);
+	assertEquals(":a:", false, listenerCalled);
 	scrollBar.removeSelectionListener(listener);
-	try {
-		scrollBar.removeSelectionListener(null);
-	}
-	catch (IllegalArgumentException e) {
-		exceptionThrown = true;
-	}
-	assertTrue("Expected exception not thrown", exceptionThrown);
+	assertThrows(IllegalArgumentException.class, () ->scrollBar.removeSelectionListener(null));
 }
 
 @Test
@@ -87,7 +75,7 @@ public void test_addSelectionListenerWidgetSelectedAdapterLorg_eclipse_swt_event
 
 	scrollBar.addSelectionListener(listener);
 	scrollBar.setSelection(100);
-	assertTrue(":a:", listenerCalled == false);
+	assertEquals(":a:", false, listenerCalled);
 	scrollBar.removeSelectionListener(listener);
 }
 
@@ -203,12 +191,12 @@ public void test_setThumbI(){
 @Test
 public void test_setValuesIIIIII() {
 	scrollBar.setValues(10, 10, 50, 2, 5, 10);
-	assertTrue(":a:", scrollBar.getSelection() == 10);
-	assertTrue(":b:", scrollBar.getMinimum() == 10);
-	assertTrue(":c:", scrollBar.getMaximum() == 50);
-	assertTrue(":d:", scrollBar.getThumb() == 2);
-	assertTrue(":e:", scrollBar.getIncrement() == 5);
-	assertTrue(":f:", scrollBar.getPageIncrement() == 10);
+	assertEquals(":a:", 10, scrollBar.getSelection());
+	assertEquals(":b:", 10, scrollBar.getMinimum());
+	assertEquals(":c:", 50, scrollBar.getMaximum());
+	assertEquals(":d:", 2, scrollBar.getThumb());
+	assertEquals(":e:", 5, scrollBar.getIncrement());
+	assertEquals(":f:", 10, scrollBar.getPageIncrement());
 }
 
 @Test