test: Initialize RosterConfigManager where needed

JMRI · Aug 6, 2019 · 4a2ec85 · 4a2ec85
1 parent 017a9df
commit 4a2ec85
Show file tree

Hide file tree

Showing 11 changed files with 322 additions and 327 deletions.
diff --git a/java/test/apps/gui3/dp3/DecoderPro3WindowTest.java b/java/test/apps/gui3/dp3/DecoderPro3WindowTest.java
@@ -6,7 +6,6 @@
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -23,14 +22,14 @@ public void testCTor() {
         JUnitUtil.dispose(t);
     }
 
-    // The minimal setup for log4J
     @Before
     public void setUp() {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.initDefaultUserMessagePreferences();
-        jmri.util.JUnitUtil.resetProfileManager();
-        jmri.util.JUnitUtil.initConnectionConfigManager();
-        jmri.util.JUnitUtil.initDebugProgrammerManager();
+        JUnitUtil.initDefaultUserMessagePreferences();
+        JUnitUtil.resetProfileManager();
+        JUnitUtil.initRosterConfigManager();
+        JUnitUtil.initConnectionConfigManager();
+        JUnitUtil.initDebugProgrammerManager();
         jmri.InstanceManager.setDefault(jmri.jmrit.symbolicprog.ProgrammerConfigManager.class,new jmri.jmrit.symbolicprog.ProgrammerConfigManager());
     }
 

diff --git a/java/test/jmri/jmrit/consisttool/ConsistToolFrameTest.java b/java/test/jmri/jmrit/consisttool/ConsistToolFrameTest.java
diff --git a/java/test/jmri/jmrit/dispatcher/DispatcherFrameTest.java b/java/test/jmri/jmrit/dispatcher/DispatcherFrameTest.java
@@ -2,7 +2,6 @@
 
 import java.awt.GraphicsEnvironment;
 import jmri.InstanceManager;
-import jmri.Scale;
 import jmri.util.JUnitUtil;
 import org.junit.After;
 import org.junit.Assert;
@@ -168,6 +167,7 @@ public void testCancelRestartButton() throws Exception {
     public void setUp() throws Exception {
         JUnitUtil.setUp();
         JUnitUtil.resetProfileManager();
+        JUnitUtil.initRosterConfigManager();
         JUnitUtil.initDebugThrottleManager();
     }
 

diff --git a/java/test/jmri/jmrit/symbolicprog/tabbedframe/PaneProgFrameTest.java b/java/test/jmri/jmrit/symbolicprog/tabbedframe/PaneProgFrameTest.java
@@ -34,12 +34,12 @@ public void testPane() {
         PaneProgFrame p = new PaneProgFrame(null, new RosterEntry(),
                 "test frame", "programmers/Basic.xml",
                 new jmri.progdebugger.ProgDebugger(), false) {
-                    // dummy implementations
-                    @Override
-                    protected JPanel getModePane() {
-                        return new JPanel();
-                    }
-                };
+            // dummy implementations
+            @Override
+            protected JPanel getModePane() {
+                return new JPanel();
+            }
+        };
 
         // invoke
         result = null;
@@ -60,12 +60,12 @@ public void testFrame() {
         PaneProgFrame p = new PaneProgFrame(null, new RosterEntry(),
                 "test frame", "programmers/Basic.xml",
                 new jmri.progdebugger.ProgDebugger(), false) {
-                    // dummy implementations
-                    @Override
-                    protected JPanel getModePane() {
-                        return null;
-                    }
-                };
+            // dummy implementations
+            @Override
+            protected JPanel getModePane() {
+                return null;
+            }
+        };
 
         // ugly, temporary way to load the decoder info
         jmri.jmrit.decoderdefn.DecoderFileTest t = new jmri.jmrit.decoderdefn.DecoderFileTest();
@@ -150,14 +150,13 @@ void setupDoc() {
                         )
                 )
         ); // end of adding contents
-
-        return;
     }
 
     @Before
     public void setUp() {
         JUnitUtil.setUp();
         JUnitUtil.resetProfileManager();
+        JUnitUtil.initRosterConfigManager();
     }
 
     @After