update test setup;

JMRI · Aug 1, 2019 · 2ea28f1 · 2ea28f1
1 parent 06f5e2b
commit 2ea28f1
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 8 deletions.
diff --git a/java/test/jmri/jmrit/consisttool/ConsistFileTest.java b/java/test/jmri/jmrit/consisttool/ConsistFileTest.java
@@ -69,9 +69,11 @@ public void testWriteDefaultFile() throws java.io.IOException {
     @Before
     public void setUp() throws java.io.IOException {
         JUnitUtil.setUp();
-        JUnitUtil.resetProfileManager( new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        jmri.profile.Profile profile = new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE));
+        JUnitUtil.resetProfileManager(profile );
         Roster.getDefault().setRosterLocation("");
-	InstanceManager.setDefault(ConsistManager.class, new TestConsistManager());
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
+        InstanceManager.setDefault(ConsistManager.class, new TestConsistManager());
     }
 
     @After

diff --git a/java/test/jmri/jmrit/consisttool/ConsistToolFrameTest.java b/java/test/jmri/jmrit/consisttool/ConsistToolFrameTest.java
@@ -249,8 +249,10 @@ public void testScanRosterWithConsists() throws IOException,FileNotFoundExceptio
     @Before
     public void setUp() throws java.io.IOException {
         JUnitUtil.setUp();
-        JUnitUtil.resetProfileManager( new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        jmri.profile.Profile profile = new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE));
+        JUnitUtil.resetProfileManager(profile );
         InstanceManager.setDefault(ConsistManager.class, new TestConsistManager());
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         JUnitUtil.initDebugThrottleManager();
     }
 

diff --git a/java/test/jmri/jmrit/consisttool/ConsistToolPrefsPanelTest.java b/java/test/jmri/jmrit/consisttool/ConsistToolPrefsPanelTest.java
@@ -1,10 +1,9 @@
 package jmri.jmrit.consisttool;
 
+import jmri.InstanceManager;
+import jmri.ConsistManager;
 import jmri.util.JUnitUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  * Test simple functioning of ConsistToolPrefsPanel 
@@ -22,12 +21,14 @@ public void testCtor() {
     @Before
     public void setUp() throws Exception {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.resetProfileManager();
+        JUnitUtil.resetProfileManager();
         JUnitUtil.initInternalTurnoutManager();
         JUnitUtil.initInternalLightManager();
         JUnitUtil.initInternalSensorManager();
         JUnitUtil.initDebugThrottleManager();
         JUnitUtil.initStartupActionsManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
+        InstanceManager.setDefault(ConsistManager.class, new TestConsistManager());
     }
 
     @After

diff --git a/java/test/jmri/jmrit/withrottle/WiFiConsistTest.java b/java/test/jmri/jmrit/withrottle/WiFiConsistTest.java
@@ -1,6 +1,8 @@
 package jmri.jmrit.withrottle;
 
 import jmri.util.JUnitUtil;
+import jmri.InstanceManager;
+import jmri.jmrit.consisttool.ConsistPreferencesManager;
 import org.junit.After;
 import org.junit.Before;
 
@@ -15,6 +17,8 @@ public class WiFiConsistTest extends jmri.implementation.AbstractConsistTestBase
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         jmri.util.JUnitUtil.initDebugCommandStation();
         jmri.DccLocoAddress addr = new jmri.DccLocoAddress(1234, true);
         c = new WiFiConsist(addr);

diff --git a/java/test/jmri/jmrix/easydcc/EasyDccConsistTest.java b/java/test/jmri/jmrix/easydcc/EasyDccConsistTest.java
@@ -2,6 +2,8 @@
 
 import jmri.DccLocoAddress;
 import jmri.util.JUnitUtil;
+import jmri.InstanceManager;
+import jmri.jmrit.consisttool.ConsistPreferencesManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -71,6 +73,8 @@ public class EasyDccConsistTest extends jmri.implementation.AbstractConsistTestB
     @Override
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         _memo = new EasyDccSystemConnectionMemo("E", "EasyDCC Test");
         _memo.setEasyDccTrafficController(new EasyDccTrafficControlScaffold(_memo));
         jmri.InstanceManager.setDefault(jmri.CommandStation.class, new EasyDccCommandStation(_memo));

diff --git a/java/test/jmri/jmrix/lenz/XNetConsistTest.java b/java/test/jmri/jmrix/lenz/XNetConsistTest.java
@@ -1,5 +1,7 @@
 package jmri.jmrix.lenz;
 
+import jmri.InstanceManager;
+import jmri.jmrit.consisttool.ConsistPreferencesManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -96,6 +98,8 @@ public void checkDisposeMethod(){
     @Override
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        jmri.util.JUnitUtil.resetProfileManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         tc = new XNetInterfaceScaffold(new LenzCommandStation());
         memo = new XNetSystemConnectionMemo(tc);
         c = new XNetConsist(5, tc, memo);

diff --git a/java/test/jmri/jmrix/loconet/LocoNetConsistTest.java b/java/test/jmri/jmrix/loconet/LocoNetConsistTest.java
@@ -1,6 +1,8 @@
 package jmri.jmrix.loconet;
 
 import jmri.DccLocoAddress;
+import jmri.InstanceManager;
+import jmri.jmrit.consisttool.ConsistPreferencesManager;
 import jmri.util.JUnitUtil;
 import org.junit.*;
 
@@ -108,6 +110,8 @@ public void testSetConsistTypeCS(){
     @Override
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         // prepare an interface
         lnis = new LocoNetInterfaceScaffold();
         slotmanager = new SlotManager(lnis);

diff --git a/java/test/jmri/jmrix/nce/NceConsistTest.java b/java/test/jmri/jmrix/nce/NceConsistTest.java
@@ -2,6 +2,8 @@
 
 import jmri.DccLocoAddress;
 import jmri.util.JUnitUtil;
+import jmri.InstanceManager;
+import jmri.jmrit.consisttool.ConsistPreferencesManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -81,6 +83,8 @@ void killConsist(int address, boolean isLong){
     @Override
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
+        InstanceManager.setDefault(ConsistPreferencesManager.class,new ConsistPreferencesManager());
         // prepare an interface
         nnis = new NceInterfaceScaffold();
         memo = new NceSystemConnectionMemo();