Clean up stages before each test

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/ButtonAssertTest.java

@@ -19,6 +19,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -46,6 +47,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void isCancelButton() {
         // given:

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/ComboBoxAssertTest.java

@@ -20,6 +20,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -50,6 +51,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasExactlyNumItems() {
         assertThat(comboBox).hasExactlyNumItems(4);

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/ListViewAssertTest.java

@@ -21,6 +21,7 @@
 import javafx.scene.control.ListView;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -52,6 +53,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasListCell() {
         assertThat(listView).hasListCell("alice");

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/NodeAssertTest.java

@@ -26,6 +26,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.testfx.api.FxRobot;
@@ -48,6 +49,11 @@ public static void setupSpec() throws Exception {
         FxToolkit.registerPrimaryStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasText_with_button() throws Exception {
         // given:

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/ParentAssertTest.java

@@ -20,6 +20,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.testfx.api.FxRobot;
@@ -35,6 +36,11 @@ public static void setupSpec() throws Exception {
         FxToolkit.registerPrimaryStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasAnyChild() throws Exception {
         // given (a StackPane with children which is-a Parent):

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/StyleableAssertTest.java

@@ -20,6 +20,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.testfx.api.FxRobot;
@@ -34,6 +35,11 @@ public static void setupSpec() throws Exception {
         FxToolkit.registerPrimaryStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasId() throws Exception {
         // given (a Button which is-a Styleable):

subprojects/testfx-core/src/test/java/org/testfx/assertions/api/TableViewAssertTest.java

@@ -26,6 +26,7 @@
 import javafx.scene.control.cell.MapValueFactory;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -80,6 +81,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasTableCell() {
         assertThat(tableView).hasTableCell("alice");

subprojects/testfx-core/src/test/java/org/testfx/cases/acceptance/NodeAndPointQueryTest.java

@@ -29,6 +29,7 @@
 import javafx.scene.layout.VBox;
 
 import org.assertj.core.api.Assertions;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -82,6 +83,11 @@ public void setup() throws Exception {
         });
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void node_queryFirst_returns_node() {
         // when:

subprojects/testfx-core/src/test/java/org/testfx/cases/integration/SimpleLabelTest.java

@@ -21,17 +21,23 @@
 import javafx.scene.layout.StackPane;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.testfx.TestFXRule;
+import org.testfx.api.FxRobot;
 import org.testfx.api.FxToolkit;
-import org.testfx.cases.TestCaseBase;
 
-public class SimpleLabelTest extends TestCaseBase {
+public class SimpleLabelTest extends FxRobot {
 
     @Rule
     public TestFXRule testFXRule = new TestFXRule();
 
+    @BeforeClass
+    public static void setupSpec() throws Exception {
+        FxToolkit.registerPrimaryStage();
+    }
+
     @Before
     public void setup() throws Exception {
         FxToolkit.setupStage(stage -> {

subprojects/testfx-core/src/test/java/org/testfx/matcher/control/ButtonMatchersTest.java

@@ -19,6 +19,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -56,6 +57,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void isCancelButton() {
         // given:

subprojects/testfx-core/src/test/java/org/testfx/matcher/control/ComboBoxMatchersTest.java

@@ -20,6 +20,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -56,6 +57,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasItems() {
         assertThat(comboBox, ComboBoxMatchers.hasItems(4));

subprojects/testfx-core/src/test/java/org/testfx/matcher/control/ListViewMatchersTest.java

@@ -21,6 +21,7 @@
 import javafx.scene.control.ListView;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -58,6 +59,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasListCell() {
         assertThat(listView, ListViewMatchers.hasListCell("alice"));

subprojects/testfx-core/src/test/java/org/testfx/matcher/control/TableViewMatchersTest.java

@@ -35,6 +35,7 @@
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.StackPane;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -101,6 +102,11 @@ public void setup() throws Exception {
         FxToolkit.showStage();
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void hasTableCell() {
         assertThat(tableView, TableViewMatchers.hasTableCell("alice"));

subprojects/testfx-core/src/test/java/org/testfx/robot/impl/ShortcutKeyTest.java

@@ -112,9 +112,10 @@ public void setup() throws TimeoutException {
     }
 
     @After
-    public void cleanup() {
+    public final void tearDown() throws Throwable {
         // prevent hanging if test fails
         release(new KeyCode[0]);
+        FxToolkit.cleanupStages();
     }
 
     /**

subprojects/testfx-core/src/test/java/org/testfx/robot/impl/WriteRobotImplTest.java

@@ -21,6 +21,7 @@
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -66,6 +67,11 @@ public void setup() throws Exception {
         writeRobot = new WriteRobotImpl(baseRobot, sleepRobot, windowFinder);
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void write_char() {
         // given:

subprojects/testfx-core/src/test/java/org/testfx/service/adapter/impl/GlassRobotAdapterTest.java

@@ -103,9 +103,10 @@ public void setup() throws Exception {
     }
 
     @After
-    public void cleanup() {
+    public final void tearDown() throws Throwable {
         robotAdapter.keyRelease(KeyCode.A);
         robotAdapter.mouseRelease(MouseButton.PRIMARY);
+        FxToolkit.cleanupStages();
     }
 
     @Test

subprojects/testfx-core/src/test/java/org/testfx/service/adapter/impl/JavafxRobotAdapterTest.java

@@ -109,9 +109,10 @@ public void setup() throws Exception {
     }
 
     @After
-    public void cleanup() {
+    public final void tearDown() throws Throwable {
         robotAdapter.keyRelease(KeyCode.A);
         robotAdapter.mouseRelease(MouseButton.PRIMARY);
+        FxToolkit.cleanupStages();
     }
 
     @Test

subprojects/testfx-core/src/test/java/org/testfx/service/finder/impl/NodeFinderImplTest.java

@@ -78,7 +78,7 @@ public class NodeFinderImplTest {
 
     @After
     public void cleanup() throws TimeoutException {
-        FxToolkit.setupFixture(this::cleanupStages);
+        FxToolkit.cleanupStages();
     }
 
     @Before

subprojects/testfx-core/src/test/java/org/testfx/service/locator/impl/BoundsLocatorImplTest.java

@@ -83,6 +83,7 @@ public class BoundsLocatorImplTest {
     @After
     public void cleanupSpec() throws TimeoutException {
         FxToolkit.setupFixture(() -> primaryWindow.close());
+        FxToolkit.cleanupStages();
     }
 
     @Before

subprojects/testfx-core/src/test/java/org/testfx/service/support/impl/CaptureSupportImplTest.java

@@ -33,6 +33,7 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -87,6 +88,11 @@ public void setup() throws Exception {
         FxToolkit.setupApplication(LoginDialog.class);
     }
 
+    @After
+    public final void tearDown() throws Throwable {
+        FxToolkit.cleanupStages();
+    }
+
     @Test
     public void capture_node() {
         // given: