I've gotten tired of the plethora of directories /tmp/mrtg-tempNNNNN
that get created, so I tweaked the sipXconfig tests to eliminate them.
(See the attached diff.) I'm not much of a Java programmer, but the
change seems to be straightforward. This would be merged into main
after the 4.2 release.
Comments?
Dale
Index: sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java
===================================================================
--- sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java (revision 17993)
+++ sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MRTGConfigTest.java (working copy)
@@ -22,13 +22,14 @@
public class MRTGConfigTest extends TestCase {
private MRTGConfig m_mrtgConfig;
+ private File m_mrtgTempDir;
private File m_mrtgConfigFile;
protected void setUp() throws Exception {
- File mrtgTempDir = TestUtil.createTempDir("mrtg-temp");
+ m_mrtgTempDir = TestUtil.createTempDir("mrtg-temp");
FileInputStream mrtgCfgStream = new FileInputStream(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg.cfg");
- TestHelper.copyStreamToDirectory(mrtgCfgStream, mrtgTempDir.getAbsolutePath(), "mrtg.cfg");
- m_mrtgConfigFile = new File(mrtgTempDir, "mrtg.cfg");
+ TestHelper.copyStreamToDirectory(mrtgCfgStream, m_mrtgTempDir.getAbsolutePath(), "mrtg.cfg");
+ m_mrtgConfigFile = new File(m_mrtgTempDir, "mrtg.cfg");
m_mrtgConfig = new MRTGConfig(m_mrtgConfigFile.toString());
try {
@@ -39,6 +40,11 @@
}
}
+ protected void tearDown() throws Exception {
+ m_mrtgConfigFile.delete();
+ m_mrtgTempDir.delete();
+ }
+
public void testGetMRTGConfigTargets() {
assertEquals(m_mrtgConfigFile.toString(), m_mrtgConfig
.getFilename());
Index: sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java
===================================================================
--- sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java (revision 17993)
+++ sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/admin/monitoring/MonitoringContextImplTest.java (working copy)
@@ -29,6 +29,8 @@
private LocationsManager m_locationsManager;
private MRTGConfig m_mrtgConfig;
private MRTGConfig m_mrtgTemplateConfig;
+ private File m_mrtgTempDir;
+ private File m_mrtgConfigFile;
@Override
protected void setUp() throws Exception {
@@ -48,10 +50,11 @@
m_monitoringContextImpl.setLocationsManager(m_locationsManager);
- File mrtgTempDir = TestUtil.createTempDir("mrtg-temp");
+ m_mrtgTempDir = TestUtil.createTempDir("mrtg-temp");
FileInputStream mrtgCfgStream = new FileInputStream(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg.cfg");
- TestHelper.copyStreamToDirectory(mrtgCfgStream, mrtgTempDir.getAbsolutePath(), "mrtg.cfg");
- m_mrtgConfig = new MRTGConfig(new File(mrtgTempDir, "mrtg.cfg").toString());
+ TestHelper.copyStreamToDirectory(mrtgCfgStream, m_mrtgTempDir.getAbsolutePath(), "mrtg.cfg");
+ m_mrtgConfigFile = new File(m_mrtgTempDir, "mrtg.cfg");
+ m_mrtgConfig = new MRTGConfig(m_mrtgConfigFile.toString());
m_mrtgTemplateConfig = new MRTGConfig(TestUtil.getTestSourceDirectory(getClass()) + "/" + "mrtg-t.cfg");
m_monitoringContextImpl.setMrtgConfig(m_mrtgConfig);
@@ -63,6 +66,11 @@
}
}
+ protected void tearDown() throws Exception {
+ m_mrtgConfigFile.delete();
+ m_mrtgTempDir.delete();
+ }
+
public void testGetAvailableHosts() {
List<String> availableHosts = m_monitoringContextImpl.getAvailableHosts();
assertEquals(2, availableHosts.size());
_______________________________________________
sipx-dev mailing list [email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
sipXecs IP PBX -- http://www.sipfoundry.org/
