Run gui stuff on gui thread

JMRI · Apr 14, 2020 · ef556b2 · ef556b2
1 parent 4aa81eb
commit ef556b2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/java/test/jmri/jmrix/AbstractConnectionConfigTestBase.java b/java/test/jmri/jmrix/AbstractConnectionConfigTestBase.java
@@ -2,6 +2,7 @@
 
 import org.junit.*;
 import javax.swing.JPanel;
+import jmri.util.ThreadingUtil;
 
 /**
  * Base tests for ConnectionConfig objects.
@@ -19,8 +20,10 @@ public void testCtor(){
 
     @Test
     public void testLoadDetails(){
-        // verify no exceptions thrown
-        cc.loadDetails(new JPanel());
+        ThreadingUtil.runOnGUI(() -> {
+            // verify no exceptions thrown
+            cc.loadDetails(new JPanel());
+        });
     }
 
     @Test

diff --git a/java/test/jmri/jmrix/AbstractSerialConnectionConfigTestBase.java b/java/test/jmri/jmrix/AbstractSerialConnectionConfigTestBase.java
@@ -2,6 +2,7 @@
 
 import org.junit.*;
 import javax.swing.JPanel;
+import jmri.util.ThreadingUtil;
 
 /**
  * Base tests for SerialConnectionConfig objects.
@@ -13,9 +14,11 @@ abstract public class AbstractSerialConnectionConfigTestBase extends jmri.jmrix.
     @Test
     @Override
     public void testLoadDetails(){
-        // verify no exceptions thrown
-        cc.loadDetails(new JPanel());
-        // load details MAY produce an error message if no ports are found.
-        jmri.util.JUnitAppender.suppressErrorMessage("No usable ports returned");
+        ThreadingUtil.runOnGUI(() -> {
+            // verify no exceptions thrown
+            cc.loadDetails(new JPanel());
+            // load details MAY produce an error message if no ports are found.
+            jmri.util.JUnitAppender.suppressErrorMessage("No usable ports returned");
+        });
     }
 }
diff --git a/java/test/jmri/jmrix/AbstractStreamConnectionConfigTestBase.java b/java/test/jmri/jmrix/AbstractStreamConnectionConfigTestBase.java
@@ -1,7 +1,7 @@
 package jmri.jmrix;
 
-import jmri.util.junit.annotations.*;
-import org.junit.*;
+// import jmri.util.junit.annotations.*;
+// import org.junit.*;
 
 /**
  * Base tests for StreamConnectionConfig objects.
@@ -10,10 +10,10 @@
  */
 abstract public class AbstractStreamConnectionConfigTestBase extends jmri.jmrix.AbstractConnectionConfigTestBase {
 
-    @Test
-    @Ignore("Stream connections don't (currently) load details")
-    @ToDo("modify Stream port Connections so they load details, then remove this test so parent class test can run or re-implement the test here")
-    @Override
-    public void testLoadDetails(){
-    }
+//    @Test
+//    @Ignore("Stream connections don't (currently) load details")
+//    @ToDo("modify Stream port Connections so they load details, then remove this test so parent class test can run or re-implement the test here")
+//    @Override
+//    public void testLoadDetails(){
+//    }
 }