- File tmpConfig = File.createTempFile("fanfix-config_", ".test");
- File tmpCache = File.createTempFile("fanfix-cache_", ".test");
- tmpConfig.delete();
- tmpConfig.mkdir();
- tmpCache.delete();
- tmpCache.mkdir();
-
- FileOutputStream out = new FileOutputStream(new File(tmpConfig,
- "config.properties"));
- Properties props = new Properties();
- props.setProperty("CACHE_DIR", tmpCache.getAbsolutePath());
- props.store(out, null);
- out.close();
-
- ConfigBundle config = new ConfigBundle();
- Bundles.setDirectory(tmpConfig.getAbsolutePath());
- config.updateFile(tmpConfig.getPath());
-
- System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
-
- int result = new Test(args).launch();
-
- IOUtils.deltree(tmpConfig);
- IOUtils.deltree(tmpCache);
+ int result = 0;
+ tempFiles = new TempFiles("fanfix-test");
+ try {
+ File tmpConfig = tempFiles.createTempDir("fanfix-config");
+ File tmpCache = tempFiles.createTempDir("fanfix-cache");
+
+ FileOutputStream out = null;
+ try {
+ out = new FileOutputStream(new File(tmpConfig,
+ "config.properties"));
+ Properties props = new Properties();
+ props.setProperty("CACHE_DIR", tmpCache.getAbsolutePath());
+ props.store(out, null);
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+
+ ConfigBundle config = new ConfigBundle();
+ Bundles.setDirectory(tmpConfig.getAbsolutePath());
+ config.updateFile(tmpConfig.getPath());
+
+ System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
+
+ result = new Test(args).launch();
+
+ IOUtils.deltree(tmpConfig);
+ IOUtils.deltree(tmpCache);
+ } finally {
+ // Test temp files
+ tempFiles.close();
+
+ // This is usually done in Fanfix.Main:
+ Instance.getTempFiles().close();
+ }