test: stop the TC instead of guessing there may be a ShutDownTask to …

…remove
JMRI · May 15, 2020 · 1d650af · 1d650af
1 parent c7a6e12
commit 1d650af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/java/test/jmri/jmrit/operations/rollingstock/engines/tools/NceConsistEnginesTest.java b/java/test/jmri/jmrit/operations/rollingstock/engines/tools/NceConsistEnginesTest.java
@@ -4,7 +4,8 @@
 import org.junit.Test;
 
 import jmri.jmrit.operations.OperationsTestCase;
-import jmri.util.JUnitOperationsUtil;
+import jmri.jmrix.nce.NceTrafficControlScaffold;
+import jmri.jmrix.nce.NceTrafficController;
 
 /**
  *
@@ -13,12 +14,11 @@
 public class NceConsistEnginesTest extends OperationsTestCase {
 
     @Test
-    public void testCTor(){
-       // this class currently requires an NCE traffic controller to function.
-       jmri.jmrix.nce.NceTrafficController tc = new jmri.jmrix.nce.NceTrafficControlScaffold();
-       Assert.assertNotNull("NceConsistEngines exists",new NceConsistEngines(tc));
-
-       JUnitOperationsUtil.checkNceShutDownTask();  // TODO need to fix this
-       //JUnitUtil.clearShutDownManager();  // TODO for now
+    public void testCTor() {
+        // this class currently requires an NCE traffic controller to function.
+        NceTrafficController tc = new NceTrafficControlScaffold();
+        Assert.assertNotNull("NceConsistEngines exists", new NceConsistEngines(tc));
+        // clean up behind the traffic controller
+        tc.terminateThreads();
     }
 }
diff --git a/java/test/jmri/util/JUnitOperationsUtil.java b/java/test/jmri/util/JUnitOperationsUtil.java
@@ -683,18 +683,6 @@ public static void checkOperationsShutDownTask() {
         Assert.assertNotNull(operationShutdownTask);
         sm.deregister(operationShutdownTask);
     }
-
-    /**
-     * Only the NCE traffic controller shutdown task is running
-     */
-    public static void checkNceShutDownTask() {
-        Assert.assertTrue(InstanceManager.containsDefault(ShutDownManager.class));
-        ShutDownManager sm = InstanceManager.getDefault(jmri.ShutDownManager.class);
-        List<ShutDownTask> list = sm.tasks();
-        ShutDownTask nceShutdownTask = list.get(0);
-        Assert.assertNotNull(nceShutdownTask);
-        sm.deregister(nceShutdownTask);
-    }
 
     // private final static Logger log = LoggerFactory.getLogger(JUnitOperationsUtil.class);
 }