cleanup test setup/teardown

JMRI · Apr 12, 2018 · 19d081d · 19d081d
1 parent 5790dd7
commit 19d081d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/java/test/jmri/jmrix/oaktree/SerialAddressTest.java b/java/test/jmri/jmrix/oaktree/SerialAddressTest.java
@@ -207,9 +207,9 @@ public static Test suite() {
     // The minimal setup for log4J
     @Override
     protected void setUp() {
+        JUnitUtil.setUp();
         memo = new OakTreeSystemConnectionMemo();
         memo.setTrafficController(new SerialTrafficControlScaffold(memo)); // important for successful getTrafficController()
-        JUnitUtil.setUp();
     }
 
     @Override

diff --git a/java/test/jmri/jmrix/oaktree/SerialTurnoutManagerTest.java b/java/test/jmri/jmrix/oaktree/SerialTurnoutManagerTest.java
@@ -60,7 +60,7 @@ public void testAsAbstractFactory() {
     @Before
     @Override
     public void setUp() {
-        apps.tests.Log4JFixture.setUp();
+        JUnitUtil.setUp();
         memo = new OakTreeSystemConnectionMemo("O", "Oak Tree");
         SerialTrafficController t = new SerialTrafficControlScaffold(memo);
         memo.setTrafficController(t); // important for successful getTrafficController()

diff --git a/java/test/jmri/jmrix/oaktree/SerialTurnoutTest.java b/java/test/jmri/jmrix/oaktree/SerialTurnoutTest.java
@@ -1,6 +1,7 @@
 package jmri.jmrix.oaktree;
 
 import jmri.implementation.AbstractTurnoutTestBase;
+import jmri.util.JUnitUtil;
 import org.junit.After;
 import org.junit.Before;
 
@@ -34,6 +35,7 @@ public void checkClosedMsgSent() {
     @Before
     @Override
     public void setUp() {
+        JUnitUtil.setUp();
         // prepare an interface
         _memo = new OakTreeSystemConnectionMemo("O", "Oaktree");
         tcis = new SerialTrafficControlScaffold(_memo);
@@ -42,13 +44,12 @@ public void setUp() {
         t = new SerialTurnout("OT0104", "t4", _memo);
     }
 
-    // OK to used this for class clean up?
     @After
     public void tearDown() {
         tcis = null;
         _memo.dispose();
         t = null;
-        // JUnitUtil.tearDown() clean up is done through the AbstractTurnoutTestBase
+        JUnitUtil.tearDown();
     }
 
 }