eliminate data files left behind by TimeTable tests.

JMRI · Feb 28, 2019 · e2f8b00 · e2f8b00
1 parent 756cf65
commit e2f8b00
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 15 deletions.
diff --git a/java/src/jmri/jmrit/timetable/configurexml/TimeTableXml.java b/java/src/jmri/jmrit/timetable/configurexml/TimeTableXml.java
@@ -433,8 +433,7 @@ public static boolean doLoad() {
     }
 
 
-
-    private static class TimeTableXmlFile extends XmlFile {
+    public static class TimeTableXmlFile extends XmlFile {
         private static String fileLocation = FileUtil.getUserFilesPath() + "timetable/";  // NOI18N
         private static String demoLocation = FileUtil.getProgramPath() + "xml/demoTimetable/";  // NOI18N
         private static String baseFileName = "TimeTableData.xml";  // NOI18N
@@ -477,6 +476,9 @@ public File getFile(boolean store) {
         }
 
         public static String getFileName() {
+            if(baseFileName == null) {
+               baseFileName = "TimeTableData.xml";  // NOI18N
+            }
             return baseFileName;
         }
 
@@ -486,6 +488,9 @@ public static String getFileName() {
          * @return path to location
          */
         public static String getFileLocation() {
+            if(fileLocation==null){
+               fileLocation = FileUtil.getUserFilesPath() + "timetable/";  // NOI18N
+            }
             return fileLocation;
         }
     }

diff --git a/java/test/jmri/jmrit/timetable/StopTest.java b/java/test/jmri/jmrit/timetable/StopTest.java
@@ -11,6 +11,9 @@
  */
 public class StopTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         try {
@@ -85,11 +88,24 @@ public void setUp() {
         jmri.util.JUnitUtil.setUp();
 
         JUnitUtil.resetInstanceManager();
-        JUnitUtil.resetProfileManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
 }
diff --git a/java/test/jmri/jmrit/timetable/TimeTableCsvExportTest.java b/java/test/jmri/jmrit/timetable/TimeTableCsvExportTest.java
@@ -14,6 +14,9 @@
  */
 public class TimeTableCsvExportTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testExport() {
         TimeTableDataManager dm = new TimeTableDataManager(true);
@@ -74,11 +77,24 @@ public void setUp() {
         jmri.util.JUnitUtil.setUp();
 
         JUnitUtil.resetInstanceManager();
-        JUnitUtil.resetProfileManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
 

diff --git a/java/test/jmri/jmrit/timetable/TimeTableCsvImportTest.java b/java/test/jmri/jmrit/timetable/TimeTableCsvImportTest.java
@@ -18,6 +18,9 @@
  */
 public class TimeTableCsvImportTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testImport() {
         TimeTableDataManager dm = new TimeTableDataManager(false);
@@ -161,11 +164,24 @@ public void setUp() {
         jmri.util.JUnitUtil.setUp();
 
         JUnitUtil.resetInstanceManager();
-        JUnitUtil.resetProfileManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
     private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TimeTableCsvImportTest.class);

diff --git a/java/test/jmri/jmrit/timetable/TimeTableDataManagerTest.java b/java/test/jmri/jmrit/timetable/TimeTableDataManagerTest.java
@@ -8,6 +8,9 @@
  */
 public class TimeTableDataManagerTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         TimeTableDataManager dx = new TimeTableDataManager(false);
@@ -82,12 +85,26 @@ public void testExercise() {
     @Before
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        try {
+            jmri.util.JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
 
 //     private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TimeTableDataManagerTest.class);
-}
+}
diff --git a/java/test/jmri/jmrit/timetable/TimeTableImportTest.java b/java/test/jmri/jmrit/timetable/TimeTableImportTest.java
@@ -12,6 +12,9 @@
  */
 public class TimeTableImportTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         new TimeTableImport();
@@ -53,11 +56,25 @@ public void testImport() {
     @Before
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        try {
+            jmri.util.JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
     private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TimeTableImportTest.class);
-}
+}
diff --git a/java/test/jmri/jmrit/timetable/TrainTest.java b/java/test/jmri/jmrit/timetable/TrainTest.java
@@ -1,5 +1,6 @@
 package jmri.jmrit.timetable;
 
+import jmri.util.JUnitUtil;
 import org.junit.*;
 
 /**
@@ -8,6 +9,9 @@
  */
 public class TrainTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         try {
@@ -70,10 +74,25 @@ public void testSettersAndGetters() {
     @Before
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        JUnitUtil.resetInstanceManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
-}
+}
diff --git a/java/test/jmri/jmrit/timetable/TrainTypeTest.java b/java/test/jmri/jmrit/timetable/TrainTypeTest.java
@@ -1,5 +1,6 @@
 package jmri.jmrit.timetable;
 
+import jmri.util.JUnitUtil;
 import org.junit.*;
 
 /*
@@ -8,6 +9,9 @@
  */
 public class TrainTypeTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         try {
@@ -32,10 +36,24 @@ public void testSettersAndGetters() {
     @Before
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
-}
+}
diff --git a/java/test/jmri/jmrit/timetable/configurexml/TimeTableXmlTest.java b/java/test/jmri/jmrit/timetable/configurexml/TimeTableXmlTest.java
@@ -12,6 +12,9 @@
  */
 public class TimeTableXmlTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Test
     public void testCreate() {
         new TimeTableXml();
@@ -33,11 +36,24 @@ public void setUp() {
         jmri.util.JUnitUtil.setUp();
 
         JUnitUtil.resetInstanceManager();
-        JUnitUtil.resetProfileManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
-}
+}
diff --git a/java/test/jmri/jmrit/timetable/swing/TimeTableActionTest.java b/java/test/jmri/jmrit/timetable/swing/TimeTableActionTest.java
@@ -1,6 +1,7 @@
 package jmri.jmrit.timetable.swing;
 
 import java.awt.GraphicsEnvironment;
+import jmri.util.JUnitUtil;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 
@@ -10,6 +11,9 @@
  */
 public class TimeTableActionTest {
 
+    @Rule
+    public org.junit.rules.TemporaryFolder folder = new org.junit.rules.TemporaryFolder();
+
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
@@ -36,10 +40,25 @@ public void testMakePanel() {
     @Before
     public void setUp() {
         jmri.util.JUnitUtil.setUp();
+        JUnitUtil.resetInstanceManager();
+        try {
+            JUnitUtil.resetProfileManager(new jmri.profile.NullProfile(folder.newFolder(jmri.profile.Profile.PROFILE)));
+        } catch(java.io.IOException ioe){
+          Assert.fail("failed to setup profile for test");
+        }
     }
 
     @After
     public void tearDown() {
+       // use reflection to reset the static file location.
+       try {
+            Class<?> c = jmri.jmrit.timetable.configurexml.TimeTableXml.TimeTableXmlFile.class;
+            java.lang.reflect.Field f = c.getDeclaredField("fileLocation");
+            f.setAccessible(true);
+            f.set(new String(), null);
+        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException x) {
+            Assert.fail("Failed to reset TimeTableXml static fileLocation " + x);
+        }
         jmri.util.JUnitUtil.tearDown();
     }
-}
+}