Skip to content

Commit d4adb81

Browse files
committed
Simplify Spinner test
* Use assertThrows * Do not override parent test method so it actually gets executed
1 parent a106143 commit d4adb81

File tree

1 file changed

+10
-27
lines changed

1 file changed

+10
-27
lines changed

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Spinner.java

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2016 Red Hat, Inc. and others.
2+
* Copyright (c) 2000, 2025 Red Hat, Inc. and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -15,7 +15,7 @@
1515
package org.eclipse.swt.tests.junit;
1616

1717
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.fail;
18+
import static org.junit.Assert.assertThrows;
1919

2020
import org.eclipse.swt.SWT;
2121
import org.eclipse.swt.widgets.Spinner;
@@ -37,23 +37,13 @@ public void setUp() {
3737
@Override
3838
@Test
3939
public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
40-
try {
41-
spinner = new Spinner(null, 0);
42-
fail("No exception thrown for parent == null");
43-
}
44-
catch (IllegalArgumentException e) {
45-
}
46-
int[] cases = {0, SWT.READ_ONLY, SWT.WRAP};
40+
assertThrows("No exception thrown for parent == null", IllegalArgumentException.class,
41+
() -> new Spinner(null, 0));
42+
int[] cases = { 0, SWT.READ_ONLY, SWT.WRAP };
4743
for (int style : cases)
4844
spinner = new Spinner(shell, style);
4945
}
5046

51-
@Override
52-
@Test
53-
public void test_computeSizeIIZ() {
54-
// super class test is sufficient
55-
}
56-
5747
@Test
5848
public void test_getIncrement() {
5949
int [] cases = {5,100,1000,1};
@@ -72,13 +62,9 @@ public void test_getDigits() {
7262
spinner.setDigits(digits);
7363
assertEquals(digits, spinner.getDigits());
7464
}
75-
try{
76-
spinner.setDigits(-1);
77-
fail("setDigits should have failed with illegal Argument");
78-
}
79-
catch(IllegalArgumentException e){
80-
assertEquals(cases[cases.length-1], spinner.getDigits());
81-
}
65+
assertThrows("setDigits should have failed with illegal Argument", IllegalArgumentException.class,
66+
() -> spinner.setDigits(-1));
67+
assertEquals(cases[cases.length-1], spinner.getDigits());
8268
}
8369

8470
@Test
@@ -132,11 +118,8 @@ public void test_getTextLimit() {
132118
spinner.setTextLimit(value);
133119
assertEquals(value, spinner.getTextLimit());
134120
}
135-
try {
136-
spinner.setTextLimit(0);
137-
fail("setTextLimit should have caused an expection with value 0");
138-
} catch (Exception e) {
139-
}
121+
assertThrows("setTextLimit should have caused an expection with value 0", IllegalArgumentException.class,
122+
() -> spinner.setTextLimit(0));
140123
}
141124

142125
@Test

0 commit comments

Comments
 (0)