TextFile and ConfigFile can now be initialised with a URI

Added basic unit test for TextFile

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

src/com/dmdirc/util/ConfigFile.java

@@ -24,6 +24,7 @@ package com.dmdirc.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -58,6 +59,15 @@ public class ConfigFile {
     public ConfigFile(final String file) {
         this.file = new TextFile(file);
     }
+    
+    /**
+     * Creates a new instance of ConfigFile.
+     * 
+     * @param uri The URI of the file to be loaded
+     */
+    public ConfigFile(final URI uri) {
+        this.file = new TextFile(uri);
+    }
 
     /**
      * Reads the data from the file.

src/com/dmdirc/util/TextFile.java

@@ -29,6 +29,7 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,6 +52,15 @@ public class TextFile {
         file = new File(filename);
     }
     
+    /**
+     * Creates a new instance of TextFile for the specified URI.
+     * 
+     * @param uri The URI of the file
+     */
+    public TextFile(final URI uri) {
+        file = new File(uri);
+    }
+    
     /**
      * Retrieves the contents of the file as a list of lines.
      * 

test/com/dmdirc/util/TextFileTest.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TextFileTest extends junit.framework.TestCase {
+
+    @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
+        }
+    }
+
+}

test/com/dmdirc/util/test1.txt

@@ -0,0 +1,7 @@
+Line 1
+Line 2
+Line 3
+Line 4
+Line 5
+Line 6
+Line 7

test/com/dmdirc/util/test2.txt

@@ -0,0 +1,21 @@
+# This is a DMDirc configuration file.
+# Written on: Mon Dec 17 23:32:19 GMT 2007
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+
+keysections:
+  section one
+
+section alpha:
+  line 1
+  line 2
+
+section one point one:
+  line 1
+
+section one:
+  1=one
+  2=two
+  3=three