Implement ConfigFile.delete and TextFile.delete, and tests for them both

Added unit test for TextFile.writeLines
Fixes issue 1115, work on issue 1106

git-svn-id: http://svn.dmdirc.com/trunk@3853 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/util/ConfigFile.java

@@ -200,7 +200,7 @@ public class ConfigFile {
      * Deletes this config file.
      */
     public void delete() {
-        throw new UnsupportedOperationException("Not implemented yet");
+        file.delete();
     }
 
     /**

src/com/dmdirc/util/TextFile.java

@@ -138,6 +138,13 @@ public class TextFile {
         return file;
     }
     
-    
+    /**
+     * Deletes the file associated with this textfile, if there is one.
+     */
+    public void delete() {
+        if (file != null) {
+            file.delete();
+        }
+    }
 
 }

test/com/dmdirc/util/ConfigFileTest.java

@@ -222,6 +222,16 @@ public class ConfigFileTest extends junit.framework.TestCase {
     public void testUnescape() {
         final String input = "blah blah\\foo\r\nbar=:";
         assertEquals(input, ConfigFile.unescape(ConfigFile.escape(input)));
-    }    
+    }
+    
+    @Test
+    public void testDelete() throws IOException {
+        final File file = File.createTempFile("DMDirc_unittest", null);
+        ConfigFile config = new ConfigFile(new TextFile(file));
+        config.write();
+        assertTrue(file.exists());
+        config.delete();
+        assertFalse(file.exists());
+    }
 
 }

test/com/dmdirc/util/TextFileTest.java

@@ -22,50 +22,65 @@
 
 package com.dmdirc.util;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class TextFileTest extends junit.framework.TestCase {
+    
+    private static File tfile;
+
+    @Test
+    public void testGetLines() throws IOException {
+        final TextFile file =
+                new TextFile(getClass().getClassLoader().
+                getResource("com/dmdirc/util/test1.txt").openStream());
+        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().getClassLoader().
+                getResource("com/dmdirc/util/test1.txt").openStream());
+        final List<String> lines = file.getLines();
 
+        assertEquals(7, lines.size());
+        assertEquals("Line 1", lines.get(0));
+    }
+    
     @Test
-    public void testGetLines() {
-        try {
-            final TextFile file =
-                    new TextFile(getClass().getClassLoader().
-                    getResource("com/dmdirc/util/test1.txt").toURI());
-            final List<String> lines = file.getLines();
-            
-            assertEquals(7, lines.size());
-            assertEquals("Line 1", lines.get(0));
-        } catch (FileNotFoundException ex) {
-            assertFalse(true);
-        } catch (IOException ex) {
-            assertFalse(true);
-        } catch (URISyntaxException ex) {
-            // Do nothing
-        }
+    public void testWrite() throws IOException {
+        tfile = File.createTempFile("dmdirc_unit_test", null);
+        TextFile file = new TextFile(tfile);
+        
+        final List<String> lines = Arrays.asList(new String[]{
+            "hello", "this is a test", "meep"
+        });
+        
+        file.writeLines(lines);
+        
+        file = new TextFile(tfile);
+        final List<String> newLines = file.getLines();
+        
+        assertEquals(lines, newLines);
     }
     
     @Test
-    public void testGetLines2() {
-        try {
-            final TextFile file =
-                    new TextFile(getClass().getClassLoader().
-                    getResource("com/dmdirc/util/test1.txt").openStream());
-            final List<String> lines = file.getLines();
-            
-            assertEquals(7, lines.size());
-            assertEquals("Line 1", lines.get(0));
-        } catch (FileNotFoundException ex) {
-            assertFalse(true);
-        } catch (IOException ex) {
-            assertFalse(true);
-        }
-    }    
+    public void testDelete() {
+        assertTrue(tfile.exists());
+        TextFile file = new TextFile(tfile);
+        file.delete();
+        assertFalse(tfile.exists());
+    }
 
 }