Skip to content

Commit 611eee2

Browse files
committed
UIServiceTest: extract context setup/teardown
1 parent 640782f commit 611eee2

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/test/java/org/scijava/ui/UIServiceTest.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import static org.junit.Assert.assertFalse;
3535
import static org.junit.Assert.assertTrue;
3636

37+
import org.junit.After;
38+
import org.junit.Before;
3739
import org.junit.Test;
3840
import org.scijava.Context;
3941
import org.scijava.display.Display;
@@ -44,14 +46,26 @@
4446
* Tests for {@link DefaultUIService}.
4547
*
4648
* @author Richard Domander (Royal Veterinary College, London)
49+
* @author Curtis Rueden
4750
*/
4851
public class UIServiceTest {
4952

53+
private Context context;
54+
private UIService uiService;
55+
56+
@Before
57+
public void setUp() {
58+
context = new Context(UIService.class);
59+
uiService = context.service(UIService.class);
60+
}
61+
62+
@After
63+
public void tearDown() {
64+
context.dispose();
65+
}
66+
5067
@Test
5168
public void testHeadlessUI() {
52-
final Context context = new Context(UIService.class);
53-
final UIService uiService = context.service(UIService.class);
54-
5569
final MockUserInterface mockUI = new MockUserInterface();
5670
uiService.setDefaultUI(mockUI);
5771

@@ -65,8 +79,6 @@ public void testHeadlessUI() {
6579
assertTrue(uiService.isHeadless());
6680
assertTrue("UIService should return HeadlessUI when running \"headless\"",
6781
uiService.getDefaultUI() instanceof HeadlessUI);
68-
69-
context.dispose();
7082
}
7183

7284
private static final class MockUserInterface extends AbstractUserInterface {

0 commit comments

Comments
 (0)