terminate threads ->shutdown items, now seen because tearDown fixed

JMRI · Apr 22, 2020 · decd9ca · decd9ca
1 parent 28b2d84
commit decd9ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/java/test/jmri/jmrix/jmriclient/swing/JMRIClientComponentFactoryTest.java b/java/test/jmri/jmrix/jmriclient/swing/JMRIClientComponentFactoryTest.java
@@ -37,6 +37,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
+        m.getJMRIClientTrafficController().terminateThreads();
         JUnitUtil.tearDown();
     }
 }
diff --git a/java/test/jmri/jmrix/nce/NceTurnoutTest.java b/java/test/jmri/jmrix/nce/NceTurnoutTest.java
@@ -2,9 +2,7 @@
 
 import jmri.Turnout;
 import jmri.implementation.AbstractTurnoutTestBase;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  * Tests for the jmri.jmrix.nce.NceTurnout class
@@ -18,13 +16,21 @@ public class NceTurnoutTest extends AbstractTurnoutTestBase {
     @Before
     @Override
     public void setUp() {
-        jmri.util.JUnitUtil.setUp();
+        super.setUp();
         // prepare an interface
         tcis = new NceTrafficControlScaffold();
 
         t = new NceTurnout(tcis, "NT", 4);
     }
 
+    @After
+    @Override
+    public void tearDown() {
+        // prepare an interface
+        if (tcis !=null ) tcis.terminateThreads();
+        super.tearDown();
+    }
+
     @Override
     public int numListeners() {
         return tcis.numListeners();
@@ -41,7 +47,8 @@ public void testLockCoding() {
 
     @Test
     public void testCanLockModes() {
-        // prepare an interface
+        // prepare an interface, dropping old one
+        if (tcis !=null ) tcis.terminateThreads();
         tcis = new NceTrafficControlScaffold() {
             @Override
             public int getUsbSystem() { return NceTrafficController.USB_SYSTEM_NONE; }