some house keeping

Author: wumpz

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.select;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.*;
 import net.sf.jsqlparser.*;
 import net.sf.jsqlparser.expression.*;
@@ -19,7 +20,7 @@
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.*;
 import static net.sf.jsqlparser.test.TestUtils.*;
-import org.apache.commons.io.*;
+import org.apache.commons.io.IOUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -2206,7 +2207,8 @@ public void testLateral1() throws JSQLParserException {
     @Test
     public void testLateralComplex1() throws IOException, JSQLParserException {
         String stmt = IOUtils.toString(SelectTest.class.
-                getResourceAsStream("complex-lateral-select-request.txt"));
+                getResourceAsStream("complex-lateral-select-request.txt"), 
+                Charset.forName("UTF-8"));
         Select select = (Select) parserManager.parse(new StringReader(stmt));
         assertEquals("SELECT O.ORDERID, O.CUSTNAME, OL.LINETOTAL, OC.ORDCHGTOTAL, OT.TAXTOTAL FROM ORDERS O, LATERAL(SELECT SUM(NETAMT) AS LINETOTAL FROM ORDERLINES LINES WHERE LINES.ORDERID = O.ORDERID) AS OL, LATERAL(SELECT SUM(CHGAMT) AS ORDCHGTOTAL FROM ORDERCHARGES CHARGES WHERE LINES.ORDERID = O.ORDERID) AS OC, LATERAL(SELECT SUM(TAXAMT) AS TAXTOTAL FROM ORDERTAXES TAXES WHERE TAXES.ORDERID = O.ORDERID) AS OT", select.
                 toString());
@@ -3061,7 +3063,8 @@ public void testSpeedTestIssue235() throws JSQLParserException {
     @Test
     public void testSpeedTestIssue235_2() throws IOException, JSQLParserException {
         String stmt = IOUtils.toString(SelectTest.class.
-                getResourceAsStream("large-sql-issue-235.txt"));
+                getResourceAsStream("large-sql-issue-235.txt"),
+                Charset.forName("UTF-8"));
         assertSqlCanBeParsedAndDeparsed(stmt, true);
     }
 
@@ -3119,7 +3122,8 @@ public void testUniqueInsteadOfDistinctIssue299() throws JSQLParserException {
     @Test
     public void testProblemSqlIssue265() throws IOException, JSQLParserException {
         String sqls = IOUtils.toString(SelectTest.class.
-                getResourceAsStream("large-sql-with-issue-265.txt"));
+                getResourceAsStream("large-sql-with-issue-265.txt"),
+                Charset.forName("UTF-8"));
         Statements stmts = CCJSqlParserUtil.parseStatements(sqls);
         assertEquals(2, stmts.getStatements().size());
     }
@@ -3356,7 +3360,8 @@ public void testIssue572TaskReplacement() throws JSQLParserException {
 
     @Test
     public void testIssue566LargeView() throws IOException, JSQLParserException {
-        String stmt = IOUtils.toString(SelectTest.class.getResourceAsStream("large-sql-issue-566.txt"));
+        String stmt = IOUtils.toString(SelectTest.class.getResourceAsStream("large-sql-issue-566.txt"), 
+                Charset.forName("UTF-8"));
         assertSqlCanBeParsedAndDeparsed(stmt, true);
     }
 

src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java

@@ -11,6 +11,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -214,7 +215,7 @@ public void testAllSqlsParseDeparse() throws IOException {
             if (file.isFile()) {
                 count++;
                 LOG.log(Level.INFO, "testing {0}", file.getName());
-                String sql = FileUtils.readFileToString(file);
+                String sql = FileUtils.readFileToString(file, Charset.forName("UTF-8"));
                 boolean parsed = false;
                 try {
                     assertSqlCanBeParsedAndDeparsed(sql, true);
@@ -251,7 +252,7 @@ public void testAllSqlsOnlyParse() throws IOException {
         List<String> regressionFiles = new LinkedList<>();
         for (File file : sqlTestFiles) {
             LOG.log(Level.INFO, "testing {0}", file.getName());
-            String sql = FileUtils.readFileToString(file);
+            String sql = FileUtils.readFileToString(file, Charset.forName("UTF-8"));
             try {
                 CCJSqlParserUtil.parse(sql);