Include VSMain test in default suite

2 files changed, 5 insertions, 0 deletions

diff --git a/pom.xml b/pom.xml
index d8d99e3..27069a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
                         <include>**/events/**/*Test.java</include>
                         <include>**/protocols/VSAbstractProtocolTest.java</include>
                         <include>**/protocols/implementations/VSPingPongProtocolTest.java</include>
+                        <include>**/simulator/VSMainTest.java</include>
                     </includes>
                     <excludes>
                         <!-- Exclude all GUI and headless simulation tests -->
diff --git a/src/test/java/simulator/VSMainTest.java b/src/test/java/simulator/VSMainTest.java
index 8f4bffc..42fd3ab 100644
--- a/src/test/java/simulator/VSMainTest.java
+++ b/src/test/java/simulator/VSMainTest.java
@@ -55,9 +55,12 @@ public class VSMainTest {
     void launchSimulatorFrameCreatesAndStartsOnSwingEdt() {
         VSPrefs prefs = VSDefaultPrefs.init();
         AtomicBoolean createdOnEdt = new AtomicBoolean(false);
+        AtomicBoolean openedOnEdt = new AtomicBoolean(false);
         AtomicReference<String> openedFilename = new AtomicReference<String>();
         VSSimulatorFrame frame = mock(VSSimulatorFrame.class);
         doAnswer(invocation -> {
+            openedOnEdt.set(javax.swing.SwingUtilities
+                            .isEventDispatchThread());
             openedFilename.set(invocation.getArgument(0, String.class));
             return null;
         }).when(frame).openAndStartSimulator("saved-simulations/raft.dat");
@@ -74,6 +77,7 @@ public class VSMainTest {
             });
 
         assertTrue(createdOnEdt.get());
+        assertTrue(openedOnEdt.get());
         assertNotNull(launchedFrame);
         assertSame(frame, launchedFrame);
         assertEquals("saved-simulations/raft.dat", openedFilename.get());