Merge pull request #5614 from bobjacobsen/more-profile-test

Improve ability of tests to run separately
JMRI · Aug 6, 2018 · 336c062 · 336c062
2 parents 6719c10 + 8f2850a
commit 336c062
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 2 deletions.
diff --git a/java/test/jmri/configurexml/BlockManagerXmlTest.java b/java/test/jmri/configurexml/BlockManagerXmlTest.java
@@ -444,6 +444,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override

diff --git a/java/test/jmri/configurexml/ConfigXmlManagerTest.java b/java/test/jmri/configurexml/ConfigXmlManagerTest.java
@@ -179,6 +179,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override

diff --git a/java/test/jmri/configurexml/DccLocoAddressXmlTest.java b/java/test/jmri/configurexml/DccLocoAddressXmlTest.java
@@ -24,6 +24,7 @@ public void testCtor(){
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/DefaultClassMigrationTest.java b/java/test/jmri/configurexml/DefaultClassMigrationTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java b/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java
@@ -77,6 +77,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override

diff --git a/java/test/jmri/configurexml/ErrorHandlerTest.java b/java/test/jmri/configurexml/ErrorHandlerTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/ErrorMemoTest.java b/java/test/jmri/configurexml/ErrorMemoTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java b/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java
@@ -27,6 +27,7 @@ public void StringConstructorTest(){
    @Before
    public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
 
         jmri.util.JUnitUtil.initDefaultUserMessagePreferences();
    }

diff --git a/java/test/jmri/configurexml/LoadXmlConfigActionTest.java b/java/test/jmri/configurexml/LoadXmlConfigActionTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/LoadXmlUserActionTest.java b/java/test/jmri/configurexml/LoadXmlUserActionTest.java
@@ -21,6 +21,7 @@ public void testCTor() {
     // The minimal setup for log4J
     @Before
     public void setUp() {
+        JUnitUtil.resetProfileManager();
         JUnitUtil.setUp();
     }
 

diff --git a/java/test/jmri/configurexml/SchemaTestBase.java b/java/test/jmri/configurexml/SchemaTestBase.java
@@ -113,6 +113,7 @@ public static Collection<Object[]> getDirectories(File directory, boolean recurs
     @Before
     public void setUp() throws Exception {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
         this.validate = XmlFile.getDefaultValidate();
     }
 

diff --git a/java/test/jmri/configurexml/SectionManagerXmlTest.java b/java/test/jmri/configurexml/SectionManagerXmlTest.java
@@ -551,6 +551,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override

diff --git a/java/test/jmri/configurexml/StoreXmlAllActionTest.java b/java/test/jmri/configurexml/StoreXmlAllActionTest.java
@@ -22,7 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.resetProfileManager();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/StoreXmlConfigActionTest.java b/java/test/jmri/configurexml/StoreXmlConfigActionTest.java
@@ -22,7 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.resetProfileManager();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/StoreXmlUserActionTest.java b/java/test/jmri/configurexml/StoreXmlUserActionTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After

diff --git a/java/test/jmri/configurexml/TransitManagerXmlTest.java b/java/test/jmri/configurexml/TransitManagerXmlTest.java
@@ -51,6 +51,7 @@ public void StoreOneTransitTest() throws Exception {
    @Before
    public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
 
         jmri.util.JUnitUtil.initDefaultUserMessagePreferences();
    }

diff --git a/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java b/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After