Mark temp files as deleteOnExit.

Fixes-Issue: CLIENT-453
Change-Id: Ia88e231381da2d1907c78ecccb5f7456e71adb16
Reviewed-on: http://gerrit.dmdirc.com/3195
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

test/com/dmdirc/util/io/ConfigFileTest.java

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.util.io;
 
 import java.io.File;
@@ -30,7 +29,9 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class ConfigFileTest {
 
@@ -46,7 +47,7 @@ public class ConfigFileTest {
         cf.read();
     }
 
-    @Test(expected=UnsupportedOperationException.class)
+    @Test(expected = UnsupportedOperationException.class)
     public void testWrite() throws IOException {
         cf.write();
     }
@@ -99,6 +100,7 @@ public class ConfigFileTest {
     @Test
     public void testColons() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<>();
         data.put("test1", "hello");
@@ -120,6 +122,7 @@ public class ConfigFileTest {
     @Test
     public void testEquals() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<>();
         data.put("test1", "hello");
@@ -141,6 +144,7 @@ public class ConfigFileTest {
     @Test
     public void testNewlines() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<>();
         data.put("test1", "hello");
@@ -164,6 +168,7 @@ public class ConfigFileTest {
     @Test
     public void testBackslash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<>();
         data.put("test1", "hello\\");
@@ -185,6 +190,7 @@ public class ConfigFileTest {
     @Test
     public void testHash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<>();
         data.put("test1#", "hello");
@@ -219,6 +225,7 @@ public class ConfigFileTest {
     @Test
     public void testDelete() throws IOException {
         final File file = File.createTempFile("DMDirc_unittest", null);
+        file.deleteOnExit();
         ConfigFile config = new ConfigFile(file);
         config.write();
         assertTrue(file.exists());
@@ -236,10 +243,10 @@ public class ConfigFileTest {
         assertTrue(file.isFlatDomain("section one point one"));
     }
 
-    @Test(expected=InvalidConfigFileException.class)
+    @Test(expected = InvalidConfigFileException.class)
     public void testInvalidLine() throws IOException, InvalidConfigFileException {
         final ConfigFile file = new ConfigFile(getClass().getResourceAsStream("test1.txt"));
         file.read();
     }
 
-}
+}

test/com/dmdirc/util/io/TextFileTest.java

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.util.io;
 
 import java.io.File;
@@ -28,71 +27,82 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class TextFileTest {
-    
-    private static File tfile;
 
     @Test
     public void testGetLines() throws IOException {
-        final TextFile file =
-                new TextFile(getClass().getResourceAsStream("test1.txt"));
+        final TextFile file
+                = new TextFile(getClass().getResourceAsStream("test1.txt"));
         final List<String> lines = file.getLines();
 
         assertEquals(7, lines.size());
         assertEquals("Line 1", lines.get(0));
     }
-    
+
     @Test
     public void testGetLines2() throws IOException {
-        final TextFile file =
-                new TextFile(getClass().getResourceAsStream("test1.txt"));
+        final TextFile file
+                = new TextFile(getClass().getResourceAsStream("test1.txt"));
         final List<String> lines = file.getLines();
 
         assertEquals(7, lines.size());
         assertEquals("Line 1", lines.get(0));
     }
-    
+
     @Test
     public void testWrite() throws IOException {
-        tfile = File.createTempFile("dmdirc_unit_test", null);
-        TextFile file = new TextFile(tfile);
-        
+        File tempFile = File.createTempFile("dmdirc_unit_test", null);
+        TextFile file = new TextFile(tempFile);
+
         final List<String> lines = Arrays.asList(new String[]{
             "hello", "this is a test", "meep"
         });
-        
+
         file.writeLines(lines);
-        
-        file = new TextFile(tfile);
+
+        file = new TextFile(tempFile);
         final List<String> newLines = file.getLines();
-        
+
         assertEquals(lines, newLines);
+        tempFile.deleteOnExit();
     }
-    
-    @Test(expected=UnsupportedOperationException.class)
+
+    @Test(expected = UnsupportedOperationException.class)
     public void testIllegalWrite() throws IOException {
-        final TextFile file =
-                new TextFile(getClass().getResourceAsStream("test1.txt"));
+        final TextFile file
+                = new TextFile(getClass().getResourceAsStream("test1.txt"));
         file.writeLines(Arrays.asList(new String[]{
             "hello", "this is a test", "meep"
         }));
     }
-    
-    @Test(expected=UnsupportedOperationException.class)
+
+    @Test(expected = UnsupportedOperationException.class)
     public void testIllegalDelete() throws IOException {
-        final TextFile file =
-                new TextFile(getClass().getResourceAsStream("test1.txt"));
+        final TextFile file
+                = new TextFile(getClass().getResourceAsStream("test1.txt"));
         file.delete();
     }
-    
+
     @Test
-    public void testDelete() {
-        assertTrue(tfile.exists());
-        TextFile file = new TextFile(tfile);
+    public void testDelete() throws IOException {
+        File tempFile = File.createTempFile("dmdirc_unit_test", "de;ete");
+        TextFile file = new TextFile(tempFile);
+
+        final List<String> lines = Arrays.asList(new String[]{
+            "hello", "this is a test", "meep"
+        });
+
+        file.writeLines(lines);
+
+        assertTrue(tempFile.exists());
+        file = new TextFile(tempFile);
         file.delete();
-        assertFalse(tfile.exists());
+        assertFalse(tempFile.exists());
     }
-    
-}
+
+}