Fix thread queue and test cleanup

JMRI · Dec 18, 2018 · 1d86743 · 1d86743
1 parent 4a4963d
commit 1d86743
Show file tree

Hide file tree

Showing 343 changed files with 544 additions and 5,115 deletions.
diff --git a/java/src/jmri/jmrit/operations/rollingstock/engines/EngineModels.java b/java/src/jmri/jmrit/operations/rollingstock/engines/EngineModels.java
@@ -94,7 +94,6 @@ public void dispose() {
         _engineWeightHashTable.clear();
         _engineBunitHashTable.clear();
         super.dispose();
-        loadDefaults();
     }
 
     @Override

diff --git a/java/test/jmri/jmrit/operations/CommonConductorYardmasterPanelTest.java b/java/test/jmri/jmrit/operations/CommonConductorYardmasterPanelTest.java
@@ -1,7 +1,5 @@
 package jmri.jmrit.operations;
 
-import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -11,7 +9,7 @@
  *
  * @author Paul Bender Copyright (C) 2017
  */
-public class CommonConductorYardmasterPanelTest {
+public class CommonConductorYardmasterPanelTest extends OperationsTestCase {
 
     protected CommonConductorYardmasterPanel p = null;
 
@@ -20,19 +18,15 @@ public void testCtor() {
         Assert.assertNotNull("exists", p);
     }
 
+    @Override
     @Before
     public void setUp() {
-        JUnitUtil.setUp();
+        super.setUp();
         p = new CommonConductorYardmasterPanel() {
             @Override
             public void update() {
             }
         };
     }
 
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
-    }
-
 }
diff --git a/java/test/jmri/jmrit/operations/OperationsFrameTest.java b/java/test/jmri/jmrit/operations/OperationsFrameTest.java
@@ -2,17 +2,15 @@
 
 import java.awt.GraphicsEnvironment;
 import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
  * @author Paul Bender Copyright (C) 2017	
  */
-public class OperationsFrameTest {
+public class OperationsFrameTest extends OperationsTestCase {
 
     @Test
     public void testCTor() {
@@ -22,18 +20,6 @@ public void testCTor() {
         JUnitUtil.dispose(t);
     }
 
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();
-        JUnitUtil.resetProfileManager();
-    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
-    }
-
     // private final static Logger log = LoggerFactory.getLogger(OperationsFrameTest.class);
 
 }
diff --git a/java/test/jmri/jmrit/operations/OperationsManagerTest.java b/java/test/jmri/jmrit/operations/OperationsManagerTest.java
@@ -1,32 +1,19 @@
 package jmri.jmrit.operations;
 
 import jmri.InstanceManager;
-import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
- * @author Paul Bender Copyright (C) 2017	
+ * @author Paul Bender Copyright (C) 2017
  */
-public class OperationsManagerTest {
+public class OperationsManagerTest extends OperationsTestCase {
 
     @Test
     public void testGetInstance() {
         OperationsManager t = InstanceManager.getDefault(OperationsManager.class);
-        Assert.assertNotNull("exists",t);
-    }
-
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
+        Assert.assertNotNull("exists", t);
     }
 
     // private final static Logger log = LoggerFactory.getLogger(OperationsManagerTest.class);

diff --git a/java/test/jmri/jmrit/operations/OperationsMenuTest.java b/java/test/jmri/jmrit/operations/OperationsMenuTest.java
@@ -1,33 +1,20 @@
 package jmri.jmrit.operations;
 
-import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
  * @author Paul Bender Copyright (C) 2017	
  */
-public class OperationsMenuTest {
+public class OperationsMenuTest extends OperationsTestCase {
 
     @Test
     public void testCTor() {
         OperationsMenu t = new OperationsMenu();
         Assert.assertNotNull("exists",t);
     }
 
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
-    }
-
     // private final static Logger log = LoggerFactory.getLogger(OperationsMenuTest.class);
 
 }
diff --git a/java/test/jmri/jmrit/operations/OperationsPanelTest.java b/java/test/jmri/jmrit/operations/OperationsPanelTest.java
@@ -1,31 +1,18 @@
 package jmri.jmrit.operations;
 
-import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
- * @author Paul Bender Copyright (C) 2017	
+ * @author Paul Bender Copyright (C) 2017
  */
-public class OperationsPanelTest {
+public class OperationsPanelTest extends OperationsTestCase {
 
     @Test
     public void testCTor() {
         OperationsPanel t = new OperationsPanel();
-        Assert.assertNotNull("exists",t);
-    }
-
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
+        Assert.assertNotNull("exists", t);
     }
 
     // private final static Logger log = LoggerFactory.getLogger(OperationsPanelTest.class);

diff --git a/java/test/jmri/jmrit/operations/OperationsTestCase.java b/java/test/jmri/jmrit/operations/OperationsTestCase.java
@@ -1,9 +1,13 @@
 package jmri.jmrit.operations;
 
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import jmri.util.JUnitOperationsUtil;
 import jmri.util.JUnitUtil;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
+import org.netbeans.jemmy.QueueTool;
 
 /**
  * Common setup and tear down for operation tests.
@@ -30,9 +34,29 @@ public void setUp() {
 
         JUnitOperationsUtil.resetOperationsManager();
     }
+
+    private final boolean testThreadRunning = false;
 
     @After
     public void tearDown() {
+        if (testThreadRunning) {
+            final Semaphore sem = new Semaphore(0);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    new QueueTool().waitEmpty(250);
+                    sem.release();
+                }
+            }).start();
+            try {
+                if (!sem.tryAcquire(2000, TimeUnit.MILLISECONDS)) {
+                    System.err.println("Jemmy exit wait failed for test " + this.getClass().getName());
+                    Assert.fail("Jemmy is not empty after this test");
+                }
+            } catch (InterruptedException e) {
+                // ignore.
+            }
+        }
         JUnitUtil.tearDown();
     }
 }
diff --git a/java/test/jmri/jmrit/operations/OpsPropertyChangeListenerTest.java b/java/test/jmri/jmrit/operations/OpsPropertyChangeListenerTest.java
@@ -1,33 +1,20 @@
 package jmri.jmrit.operations;
 
-import jmri.util.JUnitUtil;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
  * @author Paul Bender Copyright (C) 2017	
  */
-public class OpsPropertyChangeListenerTest {
+public class OpsPropertyChangeListenerTest extends OperationsTestCase {
 
     @Test
     public void testCTor() {
         OpsPropertyChangeListener t = new OpsPropertyChangeListener();
         Assert.assertNotNull("exists",t);
     }
 
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
-    }
-
     // private final static Logger log = LoggerFactory.getLogger(OpsPropertyChangeListenerTest.class);
 
 }
diff --git a/java/test/jmri/jmrit/operations/automation/AutomationCopyActionTest.java b/java/test/jmri/jmrit/operations/automation/AutomationCopyActionTest.java
@@ -1,33 +1,21 @@
 package jmri.jmrit.operations.automation;
 
-import jmri.util.JUnitUtil;
-import org.junit.After;
+import jmri.jmrit.operations.OperationsTestCase;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  *
  * @author Paul Bender Copyright (C) 2017	
  */
-public class AutomationCopyActionTest {
+public class AutomationCopyActionTest extends OperationsTestCase {
 
     @Test
     public void testCTor() {
         AutomationCopyAction t = new AutomationCopyAction();
         Assert.assertNotNull("exists",t);
     }
 
-    // The minimal setup for log4J
-    @Before
-    public void setUp() {
-        JUnitUtil.setUp();    }
-
-    @After
-    public void tearDown() {
-        JUnitUtil.tearDown();
-    }
-
     // private final static Logger log = LoggerFactory.getLogger(AutomationCopyActionTest.class);
 
 }
diff --git a/java/test/jmri/jmrit/operations/automation/AutomationCopyFrameTest.java b/java/test/jmri/jmrit/operations/automation/AutomationCopyFrameTest.java
@@ -6,10 +6,8 @@
 import jmri.util.JUnitUtil;
 import jmri.util.JmriJFrame;
 import jmri.util.swing.JemmyUtil;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.Test;
 
 public class AutomationCopyFrameTest extends OperationsTestCase {
@@ -89,18 +87,4 @@ public void testFrameCreationWithAutomation() {
         JUnitUtil.dispose(editAutomationFrame);
         JUnitUtil.dispose(copyFrame);
     }
-
-    // Ensure minimal setup for log4J
-    @Override
-    @Before
-    public void setUp() {
-        super.setUp();
-    }
-
-    // The minimal setup for log4J
-    @Override
-    @After
-    public void tearDown() {
-        super.tearDown();
-    }
 }
diff --git a/java/test/jmri/jmrit/operations/automation/AutomationItemTest.java b/java/test/jmri/jmrit/operations/automation/AutomationItemTest.java
@@ -13,9 +13,7 @@
 import jmri.jmrit.operations.trains.Train;
 import jmri.jmrit.operations.trains.schedules.TrainSchedule;
 import jmri.jmrit.operations.trains.schedules.TrainScheduleManager;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class AutomationItemTest extends OperationsTestCase {
@@ -154,16 +152,4 @@ public void testTrainSchedule() {
         automationItem.setOther(trainSchedule);
         Assert.assertEquals(trainSchedule, automationItem.getTrainSchedule());
     }
-
-    @Override
-    @Before
-    public void setUp() {
-        super.setUp();
-    }
-
-    @Override
-    @After
-    public void tearDown() {
-        super.tearDown();
-    }
 }
diff --git a/java/test/jmri/jmrit/operations/automation/AutomationManagerTest.java b/java/test/jmri/jmrit/operations/automation/AutomationManagerTest.java
@@ -5,9 +5,7 @@
 import jmri.jmrit.operations.OperationsTestCase;
 import jmri.jmrit.operations.trains.TrainManagerXml;
 import jmri.util.JUnitOperationsUtil;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class AutomationManagerTest extends OperationsTestCase {
@@ -190,18 +188,4 @@ public void testXmlReadWrite() {
         // confirm two automations restored
         Assert.assertEquals("number of automations", 2,  automationManager.getSize());
     }
-
-
-
-    @Override
-    @Before
-    public void setUp() {
-        super.setUp();
-    }
-
-    @Override
-    @After
-    public void tearDown() {
-        super.tearDown();
-    }
 }