Skip to content

Replace fail() with assertThrows() in TreeItem test #2835

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −110
Open

Replace fail() with assertThrows() in TreeItem test #2835

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
135 changes: 27 additions & 108 deletions ....tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2018 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -17,8 +17,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
Expand Down Expand Up @@ -50,13 +50,7 @@ public void setUp() {

@Test
public void test_ConstructorLorg_eclipse_swt_widgets_TreeI() {
try {
new TreeItem((TreeItem)null, SWT.NULL);
fail("No exception thrown for parent == null");
}
catch (IllegalArgumentException e) {
}

assertThrows(IllegalArgumentException.class, () -> new TreeItem((TreeItem)null, SWT.NULL), "No exception thrown for parent == null");
for (int i=0; i<10; i++) {
new TreeItem(tree, SWT.NONE);
}
Expand All @@ -67,12 +61,7 @@ public void test_ConstructorLorg_eclipse_swt_widgets_TreeI() {

@Test
public void test_ConstructorLorg_eclipse_swt_widgets_TreeII() {
try {
new TreeItem(tree, SWT.NONE, 5);
fail("No exception thrown for illegal index argument");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> new TreeItem(tree, SWT.NONE, 5), "No exception thrown for illegal index argument");
}

@Test
Expand All @@ -87,11 +76,7 @@ public void test_ConstructorLorg_eclipse_swt_widgets_TreeItemI() {

@Test
public void test_ConstructorLorg_eclipse_swt_widgets_TreeItemII() {
try {
new TreeItem(treeItem, SWT.NONE, 5);
fail("No exception thrown for illegal index argument");
}
catch (IllegalArgumentException e) {}
assertThrows(IllegalArgumentException.class, () -> new TreeItem(treeItem, SWT.NONE, 5), "No exception thrown for illegal index argument");
assertEquals(1, tree.getItemCount());
}

Expand Down Expand Up @@ -643,26 +628,11 @@ public void test_getItemI() {

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

try {
treeItem.getItem(number+1);
fail("No exception thrown for illegal index argument");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.getItem(number+1), "No exception thrown for illegal index argument");

try {
treeItem.getItem(-1);
fail("No exception thrown for illegal index argument");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.getItem(-1), "No exception thrown for illegal index argument");
}

@Test
Expand Down Expand Up @@ -744,13 +714,9 @@ public void test_setBackgroundILorg_eclipse_swt_graphics_Color() {
treeItem.setBackground(null);
assertEquals(tree.getBackground(),treeItem.getBackground(0));

try {
Color color = new Color(255, 0, 0);
color.dispose();
treeItem.setBackground(color);
fail("No exception thrown for color disposed");
} catch (IllegalArgumentException e) {
}
Color color = new Color(255, 0, 0);
color.dispose();
assertThrows(IllegalArgumentException.class, () -> treeItem.setBackground(color), "No exception thrown for color disposed");
}

@Test
Expand All @@ -761,11 +727,7 @@ public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
treeItem.setBackground(null);
assertEquals(tree.getBackground(),treeItem.getBackground());
color.dispose();
try {
treeItem.setBackground(color);
fail("No exception thrown for color disposed");
} catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setBackground(color), "No exception thrown for color disposed");
}

@Test
Expand Down Expand Up @@ -812,20 +774,15 @@ public void test_setFontLorg_eclipse_swt_graphics_Font() {
treeItem.setFont(font);
assertEquals(treeItem.getFont(), font);

font = new Font(treeItem.getDisplay(), SwtTestUtil.testFontName, 10, SWT.NORMAL);
treeItem.setFont(font);
assertEquals(treeItem.getFont(), font);
Font font2 = new Font(treeItem.getDisplay(), SwtTestUtil.testFontName, 10, SWT.NORMAL);
treeItem.setFont(font2);
assertEquals(treeItem.getFont(), font2);

treeItem.setFont(null);
assertEquals(treeItem.getFont(), tree.getFont());

font.dispose();
try {
treeItem.setFont(font);
treeItem.setFont(null);
fail("No exception thrown for disposed font");
} catch (IllegalArgumentException e) {
}
font2.dispose();
assertThrows(IllegalArgumentException.class, () -> treeItem.setFont(font2), "No exception thrown for disposed font");
}

@Test
Expand Down Expand Up @@ -871,12 +828,7 @@ public void test_setFontILorg_eclipse_swt_graphics_Font() {
font.dispose();
font2.dispose();

try {
treeItem.setFont(0, font);
treeItem.setFont(0, null);
fail("No exception thrown for disposed font");
} catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setFont(0, font), "No exception thrown for disposed font");
}

@Test
Expand Down Expand Up @@ -918,13 +870,9 @@ public void test_setForegroundILorg_eclipse_swt_graphics_Color() {
treeItem.setForeground(null);
assertEquals(tree.getForeground(),treeItem.getForeground(0));

try {
Color color = new Color(255, 0, 0);
color.dispose();
treeItem.setForeground(color);
fail("No exception thrown for color disposed");
} catch (IllegalArgumentException e) {
}
Color color = new Color(255, 0, 0);
color.dispose();
assertThrows(IllegalArgumentException.class, () -> treeItem.setForeground(color), "No exception thrown for color disposed");
}

@Test
Expand All @@ -935,11 +883,7 @@ public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
treeItem.setForeground(null);
assertEquals(tree.getForeground(),treeItem.getForeground());
color.dispose();
try {
treeItem.setForeground(color);
fail("No exception thrown for color disposed");
} catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setForeground(color), "No exception thrown for color disposed");
}

@Test
Expand Down Expand Up @@ -984,12 +928,7 @@ public void test_setGrayedZ() {
for (int i = 0; i < images.length; i++) {
assertEquals(images[i], treeItem.getImage(i));
}
try {
treeItem.setImage((Image []) null);
fail("No exception thrown for images == null");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setImage((Image []) null), "No exception thrown for images == null");
}

@Test
Expand Down Expand Up @@ -1025,25 +964,15 @@ public void test_setImageILorg_eclipse_swt_graphics_Image() {
assertEquals(images[0], treeItem.getImage(0));

images[0].dispose();
try {
treeItem.setImage(0, images[0]);
treeItem.setImage(0, null);
fail("No exception thrown for disposed font");
} catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setImage(0, images[0]), "No exception thrown for disposed font");
}

@Test
public void test_setText$Ljava_lang_String() {
final String TestString = "test";
final String TestStrings[] = new String[] {TestString, TestString + "1", TestString + "2"};

try {
treeItem.setText((String []) null);
fail("No exception thrown for strings == null");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setText((String []) null), "No exception thrown for strings == null");

/*
* Test the getText/setText API with a Tree that has only
Expand Down Expand Up @@ -1131,19 +1060,9 @@ public void test_setTextILjava_lang_String(){
assertEquals(0, treeItem.getText(-1).length());


try {
treeItem.setText(-1, null);
fail("No exception thrown for string == null");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setText(-1, null), "No exception thrown for string == null");

try {
treeItem.setText(0, null);
fail("No exception thrown for string == null");
}
catch (IllegalArgumentException e) {
}
assertThrows(IllegalArgumentException.class, () -> treeItem.setText(0, null), "No exception thrown for string == null");

/*
* Test the getText/setText API with a small table that
Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse SWT Tests
Bundle-SymbolicName: org.eclipse.swt.tests
Bundle-Version: 3.107.1000.qualifier
Bundle-Version: 3.107.1100.qualifier
Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.swt.tests.junit,
org.eclipse.swt.tests.junit.performance
Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.swt.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<relativePath>../../local-build/local-build-parent/</relativePath>
</parent>
<artifactId>org.eclipse.swt.tests</artifactId>
<version>3.107.1000-SNAPSHOT</version>
<version>3.107.1100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<tycho.testArgLine></tycho.testArgLine>
Expand Down
Loading