Merge pull request #35 from greboid/master

Improve TextFile unit test, and remove unused ctor.

src/com/dmdirc/util/io/TextFile.java

@@ -22,7 +22,6 @@
 package com.dmdirc.util.io;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -55,18 +54,6 @@ public class TextFile {
      */
     private List<String> lines;
 
-    /**
-     * Creates a new instance of TextFile for the specified File, which is to be
-     * read using the specified charset.
-     *
-     * @param file The file to read
-     * @param charset The charset to read the file in
-     * @since 0.6.3m1
-     */
-    public TextFile(final File file, final Charset charset) {
-        this(file == null ? null : file.toPath(), charset);
-    }
-
     /**
      * Creates a new instance of TextFile for the specified Path, which is to be
      * read using the specified charset.

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

@@ -124,4 +124,18 @@ public class TextFileTest {
         assertFalse(Files.exists(temp));
     }
 
+    @Test
+    public void testIsWriteable_Stream() throws IOException {
+        final TextFile file = new TextFile(Files.newInputStream(test1), Charset.forName("UTF-8"));
+        assertFalse(file.isWritable());
+    }
+
+    @Test
+    public void testReadLine_Stream() throws IOException {
+        final TextFile file = new TextFile(Files.newInputStream(test1), Charset.forName("UTF-8"));
+        final List<String> lines = file.getLines();
+        assertEquals(7, lines.size());
+        assertEquals("Line 1", lines.get(0));
+    }
+
 }