Merge pull request #42 from ukubuka/feature/UkubukaParser

Updated Parser/Reader

Author: agrawroh

src/main/java/com/ukubuka/core/reader/UkubukaReader.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,10 +47,10 @@ public List<String> readFile(final SupportedSource source,
         LOGGER.info("Reading File - Source: " + source + " | Location: "
                 + completeFileName + " | Encoding: " + fileEncoding
                 + " | Delimiter: " + endLineDelimiter);
-        return new ArrayList<>(
-                Arrays.asList(readFileAsString(source, completeFileName,
-                        fileEncoding)
-                        .split(StringUtils.isEmpty(endLineDelimiter) ? Constants.DEFAULT_FILE_END_LINE_DELIMITER
+        return new ArrayList<>(Arrays
+                .asList(readFileAsString(source, completeFileName, fileEncoding)
+                        .split(StringUtils.isEmpty(endLineDelimiter)
+                                ? Constants.DEFAULT_FILE_END_LINE_DELIMITER
                                 : endLineDelimiter)));
     }
 
@@ -68,12 +69,15 @@ public String readFileAsString(final SupportedSource source,
         try {
             return FileUtils
                     .readFileToString(
-                            source == SupportedSource.URL ? FileUtils
-                                    .toFile(new URL(completeFileName))
+                            source == SupportedSource.URL
+                                    ? new File(
+                                            new URL(completeFileName).toURI())
                                     : new File(completeFileName),
-                            StringUtils.isEmpty(fileEncoding) ? Constants.DEFAULT_FILE_ENCODING
+                            StringUtils.isEmpty(fileEncoding)
+                                    ? Constants.DEFAULT_FILE_ENCODING
                                     : fileEncoding);
-        } catch (IOException ex) {
+        } catch (IOException | URISyntaxException
+                | IllegalArgumentException ex) {
             throw new ReaderException(ex);
         }
     }

src/test/java/com/ukubuka/core/reader/UkubukaReaderTest.java

@@ -3,6 +3,7 @@
 import org.junit.Test;
 
 import com.ukubuka.core.exception.ReaderException;
+import com.ukubuka.core.model.SupportedSource;
 
 /**
  * Ukubuka Reader Test
@@ -12,11 +13,71 @@
  */
 public class UkubukaReaderTest {
 
-    private UkubukaReader ukubukaReader;
+    private UkubukaReader ukubukaReader = new UkubukaReader();
 
     /******************************** Test(s) ********************************/
-    @Test(expected = NullPointerException.class)
-    public void test_readFile_success() throws ReaderException {
-        ukubukaReader.readFile(null, null, null, null);
+    @Test
+    public void test_readFile_withDelim_success() throws ReaderException {
+        ukubukaReader.readFile(
+                SupportedSource.FILE, this.getClass().getClassLoader()
+                        .getResource("test-dataset.csv").getFile(),
+                "UTF-8", "\n");
+    }
+
+    @Test
+    public void test_readFile_withoutDelim_success() throws ReaderException {
+        ukubukaReader.readFile(
+                SupportedSource.FILE, this.getClass().getClassLoader()
+                        .getResource("test-dataset.csv").getFile(),
+                "UTF-8", null);
+    }
+
+    @Test
+    public void test_readFileAsString_file_withEncoding_success()
+            throws ReaderException {
+        ukubukaReader
+                .readFileAsString(SupportedSource.FILE,
+                        this.getClass().getClassLoader()
+                                .getResource("test-dataset.csv").getFile(),
+                        "UTF-8");
+    }
+
+    @Test
+    public void test_readFileAsString_file_withoutEncoding_success()
+            throws ReaderException {
+        System.out.println(this.getClass().getClassLoader()
+                .getResource("test-dataset.csv"));
+        ukubukaReader
+                .readFileAsString(SupportedSource.FILE,
+                        this.getClass().getClassLoader()
+                                .getResource("test-dataset.csv").getFile(),
+                        null);
+    }
+
+    @Test
+    public void test_readFileAsString_url_withEncoding_success()
+            throws ReaderException {
+        ukubukaReader.readFileAsString(SupportedSource.URL,
+                this.getClass().getClassLoader().getResource("test-dataset.csv")
+                        .toString().replace("file:/", "file:///"),
+                "UTF-8");
+    }
+
+    @Test
+    public void test_readFileAsString_url_withoutEncoding_success()
+            throws ReaderException {
+        ukubukaReader.readFileAsString(SupportedSource.URL,
+                this.getClass().getClassLoader().getResource("test-dataset.csv")
+                        .toString().replace("file:/", "file:///"),
+                null);
+    }
+
+    @Test(expected = ReaderException.class)
+    public void test_readFileAsString_url_withoutEncoding_failure()
+            throws ReaderException {
+        ukubukaReader.readFileAsString(SupportedSource.URL,
+                this.getClass().getClassLoader().getResource("test-dataset.csv")
+                        .toString().replace("file:/", "file://"),
+                null);
     }
 }

src/test/resources/test-dataset.csv

@@ -0,0 +1,3 @@
+col_1,col_2,col_3
+1,foo,1.01
+2,bar,1.02