Move all test cases into the folder

noahzark · Jun 3, 2016 · 1cddbd3 · 1cddbd3
1 parent 06bd561
commit 1cddbd3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/test/java/moe/imvery/utils/xlsx2json/ExcelParserMainTest.java b/src/test/java/moe/imvery/utils/xlsx2json/ExcelParserMainTest.java
@@ -17,13 +17,13 @@ public class ExcelParserMainTest {
 
     @Test
     public void main() throws Exception {
-        ExcelParserMain.main(new String[]{"test.xlsx", "map", "true"});
+        ExcelParserMain.main(new String[]{"testcases/test.xlsx", "map", "true"});
 
-        Path path = Paths.get("test.json");
+        Path path = Paths.get("testcases/test.json");
         BufferedReader reader = Files.newBufferedReader(path);
         String jsonText = reader.readLine();
 
-        path = Paths.get("test3.expected.json");
+        path = Paths.get("testcases/test3.expected.json");
         reader = Files.newBufferedReader(path);
         String expected = reader.readLine();
 
@@ -32,13 +32,13 @@ public void main() throws Exception {
 
     @Test
     public void mainMultisheets() throws Exception {
-        ExcelParserMain.main(new String[]{"test.xlsx", "weaponStuffs skillStuffs essenceStuffs", "true"});
+        ExcelParserMain.main(new String[]{"testcases/test.xlsx", "weaponStuffs skillStuffs essenceStuffs", "true"});
 
-        Path path = Paths.get("test.json");
+        Path path = Paths.get("testcases/test.json");
         BufferedReader reader = Files.newBufferedReader(path);
         String jsonText = reader.readLine();
 
-        path = Paths.get("test4.expected.json");
+        path = Paths.get("testcases/test4.expected.json");
         reader = Files.newBufferedReader(path);
         String expected = reader.readLine();
 
@@ -47,13 +47,13 @@ public void mainMultisheets() throws Exception {
 
     @Test
     public void mainHideSheetName() throws Exception {
-        ExcelParserMain.main(new String[]{"test.xlsx", "map", "false"});
+        ExcelParserMain.main(new String[]{"testcases/test.xlsx", "map", "false"});
 
-        Path path = Paths.get("test.json");
+        Path path = Paths.get("testcases/test.json");
         BufferedReader reader = Files.newBufferedReader(path);
         String jsonText = reader.readLine();
 
-        path = Paths.get("test5.expected.json");
+        path = Paths.get("testcases/test5.expected.json");
         reader = Files.newBufferedReader(path);
         String expected = reader.readLine();
 
@@ -62,13 +62,13 @@ public void mainHideSheetName() throws Exception {
 
     @Test
     public void mainMultiSheetsAndHideSheetName() throws Exception {
-        ExcelParserMain.main(new String[]{"test.xlsx", "map monster", "false"});
+        ExcelParserMain.main(new String[]{"testcases/test.xlsx", "map monster", "false"});
 
-        Path path = Paths.get("test.json");
+        Path path = Paths.get("testcases/test.json");
         BufferedReader reader = Files.newBufferedReader(path);
         String jsonText = reader.readLine();
 
-        path = Paths.get("test6.expected.json");
+        path = Paths.get("testcases/test6.expected.json");
         reader = Files.newBufferedReader(path);
         String expected = reader.readLine();
 

diff --git a/src/test/java/moe/imvery/utils/xlsx2json/ExcelParserTest.java b/src/test/java/moe/imvery/utils/xlsx2json/ExcelParserTest.java
@@ -21,7 +21,7 @@ public class ExcelParserTest {
 
     @Test
     public void parseSheetWithAllBasicTypes() throws Exception {
-        String fileName = "test";
+        String fileName = "testcases/test";
         File excelFile = new File(fileName + ".xlsx");
 
         try(FileInputStream inp = new FileInputStream( excelFile )) {
@@ -47,7 +47,7 @@ public void parseSheetWithAllBasicTypes() throws Exception {
 
     @Test
     public void parseSheetWithArrays() throws Exception {
-        String fileName = "test";
+        String fileName = "testcases/test";
         File excelFile = new File(fileName + ".xlsx");
 
         try(FileInputStream inp = new FileInputStream( excelFile )) {
@@ -73,7 +73,7 @@ public void parseSheetWithArrays() throws Exception {
 
     @Test
     public void parseSheetWithObjectAndReference() throws Exception {
-        String fileName = "test";
+        String fileName = "testcases/test";
         File excelFile = new File(fileName + ".xlsx");
 
         try(FileInputStream inp = new FileInputStream( excelFile )) {

diff --git a/test.xlsx → testcases/test.xlsx b/test.xlsx → testcases/test.xlsx
diff --git a/test1.expected.json → testcases/test1.expected.json b/test1.expected.json → testcases/test1.expected.json
diff --git a/test2.expected.json → testcases/test2.expected.json b/test2.expected.json → testcases/test2.expected.json
diff --git a/test3.expected.json → testcases/test3.expected.json b/test3.expected.json → testcases/test3.expected.json
diff --git a/test4.expected.json → testcases/test4.expected.json b/test4.expected.json → testcases/test4.expected.json
diff --git a/test5.expected.json → testcases/test5.expected.json b/test5.expected.json → testcases/test5.expected.json
diff --git a/test6.expected.json → testcases/test6.expected.json b/test6.expected.json → testcases/test6.expected.json