修改测试目录

easyexcel-test/README.md

@@ -0,0 +1,3 @@
+# easyexcel-test
+
+测试案例

easyexcel-test/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.alibaba</groupId>
+        <artifactId>easyexcel-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <packaging>jar</packaging>
+    <artifactId>easyexcel-test</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java

@@ -61,17 +61,17 @@ public class ConverterDataTest {
 
     @Test
     public void t11ReadAllConverter07() {
-        readAllConverter("converter" + File.separator + "converter07.xlsx");
+        readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converter07.xlsx");
     }
 
     @Test
     public void t12ReadAllConverter03() {
-        readAllConverter("converter" + File.separator + "converter03.xls");
+        readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converter03.xls");
     }
 
     @Test
     public void t13ReadAllConverterCsv() {
-        readAllConverter("converter" + File.separator + "converterCsv.csv");
+        readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converterCsv.csv");
     }
 
     @Test
@@ -90,7 +90,7 @@ public class ConverterDataTest {
             List<ImageData> list = new ArrayList<>();
             ImageData imageData = new ImageData();
             list.add(imageData);
-            String imagePath = TestFileUtil.getPath() + "converter" + File.separator + "img.jpg";
+            String imagePath = TestFileUtil.getPath() + "easyexcel-test/test/resources/converter" + File.separator + "img.jpg";
             imageData.setByteArray(FileUtils.readFileToByteArray(new File(imagePath)));
             imageData.setFile(new File(imagePath));
             imageData.setString(imagePath);

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java

@@ -26,8 +26,8 @@ public class DateFormatTest {
 
     @BeforeClass
     public static void init() {
-        file07 = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xlsx");
-        file03 = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xls");
+        file07 = TestFileUtil.readFile("easyexcel-test/test/resources/dataformat" + File.separator + "dataformat.xlsx");
+        file03 = TestFileUtil.readFile("easyexcel-test/test/resources/dataformat" + File.separator + "dataformat.xls");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java

@@ -22,8 +22,8 @@ public class ExtraDataTest {
 
     @BeforeClass
     public static void init() {
-        file03 = TestFileUtil.readFile("extra" + File.separator + "extra.xls");
-        file07 = TestFileUtil.readFile("extra" + File.separator + "extra.xlsx");
+        file03 = TestFileUtil.readFile("easyexcel-test/test/resources/extra" + File.separator + "extra.xls");
+        file07 = TestFileUtil.readFile("easyexcel-test/test/resources/extra" + File.separator + "extra.xlsx");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java

@@ -56,25 +56,25 @@ public class FillDataTest {
         file07 = TestFileUtil.createNewFile("fill07.xlsx");
         file03 = TestFileUtil.createNewFile("fill03.xls");
         fileCsv = TestFileUtil.createNewFile("fill.csv");
-        simpleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "simple.xlsx");
-        simpleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "simple.xls");
-        simpleTemplateCsv = TestFileUtil.readFile("fill" + File.separator + "simple.csv");
+        simpleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx");
+        simpleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.xls");
+        simpleTemplateCsv = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.csv");
         fileComplex07 = TestFileUtil.createNewFile("fillComplex07.xlsx");
-        complexFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "complex.xlsx");
+        complexFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "complex.xlsx");
         fileComplex03 = TestFileUtil.createNewFile("fillComplex03.xls");
-        complexFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "complex.xls");
+        complexFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "complex.xls");
         fileHorizontal07 = TestFileUtil.createNewFile("fillHorizontal07.xlsx");
-        horizontalFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "horizontal.xlsx");
+        horizontalFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "horizontal.xlsx");
         fileHorizontal03 = TestFileUtil.createNewFile("fillHorizontal03.xls");
-        horizontalFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "horizontal.xls");
+        horizontalFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "horizontal.xls");
         byName07 = TestFileUtil.createNewFile("byName07.xlsx");
-        byNameTemplate07 = TestFileUtil.readFile("fill" + File.separator + "byName.xlsx");
+        byNameTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "byName.xlsx");
         byName03 = TestFileUtil.createNewFile("byName03.xls");
-        byNameTemplate03 = TestFileUtil.readFile("fill" + File.separator + "byName.xls");
+        byNameTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "byName.xls");
         fileComposite07 = TestFileUtil.createNewFile("fileComposite07.xlsx");
-        compositeFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "composite.xlsx");
+        compositeFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "composite.xlsx");
         fileComposite03 = TestFileUtil.createNewFile("fileComposite03.xls");
-        compositeFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "composite.xls");
+        compositeFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "composite.xls");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java

@@ -46,8 +46,8 @@ public class FillAnnotationDataTest {
     public static void init() {
         file07 = TestFileUtil.createNewFile("fillAnnotation07.xlsx");
         file03 = TestFileUtil.createNewFile("fillAnnotation03.xls");
-        fileTemplate07 = TestFileUtil.readFile("fill" + File.separator + "annotation.xlsx");
-        fileTemplate03 = TestFileUtil.readFile("fill" + File.separator + "annotation.xls");
+        fileTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "annotation.xlsx");
+        fileTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "annotation.xls");
     }
 
     @Test
@@ -112,7 +112,7 @@ public class FillAnnotationDataTest {
         data.setNumber(99.99);
         data.setString1("string1");
         data.setString2("string2");
-        data.setImage(TestFileUtil.getPath() + "converter" + File.separator + "img.jpg");
+        data.setImage(TestFileUtil.getPath() + "easyexcel-test/test/resources/converter" + File.separator + "img.jpg");
         list.add(data);
         list.add(data);
         list.add(data);

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java

@@ -46,8 +46,8 @@ public class FillStyleAnnotatedTest {
     public static void init() {
         FillStyleAnnotated07 = TestFileUtil.createNewFile("FillStyleAnnotated07.xlsx");
         FillStyleAnnotated03 = TestFileUtil.createNewFile("FillStyleAnnotated03.xls");
-        fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx");
-        fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls");
+        fileStyleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xlsx");
+        fileStyleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xls");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java

@@ -49,8 +49,8 @@ public class FillStyleDataTest {
         fileStyle03 = TestFileUtil.createNewFile("fileStyle03.xls");
         fileStyleHandler07 = TestFileUtil.createNewFile("fileStyleHandler07.xlsx");
         fileStyleHandler03 = TestFileUtil.createNewFile("fileStyleHandler03.xls");
-        fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx");
-        fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls");
+        fileStyleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xlsx");
+        fileStyleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xls");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java

@@ -40,17 +40,17 @@ public class LargeDataTest {
     @BeforeClass
     public static void init() {
         fileFill07 = TestFileUtil.createNewFile("largefill07.xlsx");
-        fileWrite07 = TestFileUtil.createNewFile("large" + File.separator + "fileWrite07.xlsx");
-        fileWriteTemp07 = TestFileUtil.createNewFile("large" + File.separator + "fileWriteTemp07.xlsx");
-        fileWritePoi07 = TestFileUtil.createNewFile("large" + File.separator + "fileWritePoi07.xlsx");
-        template07 = TestFileUtil.readFile("large" + File.separator + "fill.xlsx");
+        fileWrite07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWrite07.xlsx");
+        fileWriteTemp07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWriteTemp07.xlsx");
+        fileWritePoi07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWritePoi07.xlsx");
+        template07 = TestFileUtil.readFile("easyexcel-test/test/resources/large" + File.separator + "fill.xlsx");
         fileCsv = TestFileUtil.createNewFile("largefileCsv.csv");
     }
 
     @Test
     public void t01Read() throws Exception {
         long start = System.currentTimeMillis();
-        EasyExcel.read(TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx", LargeData.class,
+        EasyExcel.read(TestFileUtil.getPath() + "easyexcel-test/test/resources/large" + File.separator + "large07.xlsx", LargeData.class,
             new LargeDataListener()).headRowNumber(2).sheet().doRead();
         LOGGER.info("Large data total time spent:{}", System.currentTimeMillis() - start);
     }

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java

@@ -26,8 +26,8 @@ public class MultipleSheetsDataTest {
 
     @BeforeClass
     public static void init() {
-        file07 = TestFileUtil.readFile("multiplesheets" + File.separator + "multiplesheets.xlsx");
-        file03 = TestFileUtil.readFile("multiplesheets" + File.separator + "multiplesheets.xls");
+        file07 = TestFileUtil.readFile("easyexcel-test/test/resources/multiplesheets" + File.separator + "multiplesheets.xlsx");
+        file03 = TestFileUtil.readFile("easyexcel-test/test/resources/multiplesheets" + File.separator + "multiplesheets.xls");
     }
 
     @Test

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java

@@ -92,8 +92,8 @@ public class SimpleDataTest {
 
     @Test
     public void t21SheetNameRead07() {
-        EasyExcel.read(TestFileUtil.readFile("simple" + File.separator + "simple07.xlsx"), SimpleData.class,
-            new SimpleDataSheetNameListener()).sheet("simple").doRead();
+        EasyExcel.read(TestFileUtil.readFile("easyexcel-test/test/resources/simple" + File.separator + "simple07.xlsx"), SimpleData.class,
+            new SimpleDataSheetNameListener()).sheet("easyexcel-test/test/resources/simple").doRead();
     }
 
     private void synchronousRead(File file) {

easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java

@@ -41,14 +41,14 @@ public class TemplateDataTest {
 
     private void readAndWrite07(File file) {
         EasyExcel.write(file, TemplateData.class)
-            .withTemplate(TestFileUtil.readFile("template" + File.separator + "template07.xlsx")).sheet()
+            .withTemplate(TestFileUtil.readFile("easyexcel-test/test/resources/template" + File.separator + "template07.xlsx")).sheet()
             .doWrite(data());
         EasyExcel.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(3).sheet().doRead();
     }
 
     private void readAndWrite03(File file) {
         EasyExcel.write(file, TemplateData.class)
-            .withTemplate(TestFileUtil.readFile("template" + File.separator + "template03.xls")).sheet()
+            .withTemplate(TestFileUtil.readFile("easyexcel-test/test/resources/template" + File.separator + "template03.xls")).sheet()
             .doWrite(data());
         EasyExcel.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(3).sheet().doRead();
     }

easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java

@@ -36,7 +36,7 @@ public class FillTest {
     public void simpleFill() {
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "simple.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "simple.xlsx";
 
         // 方案1 根据对象填充
         String fileName = TestFileUtil.getPath() + "simpleFill" + System.currentTimeMillis() + ".xlsx";
@@ -65,7 +65,7 @@ public class FillTest {
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         // 填充list 的时候还要注意 模板中{.} 多了个点 表示list
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "list.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "list.xlsx";
 
         // 方案1 一下子全部放到内存里面 并填充
         String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx";
@@ -103,7 +103,7 @@ public class FillTest {
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         // {} 代表普通变量 {.} 代表是list的变量
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complex.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complex.xlsx";
 
         String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx";
         ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();
@@ -135,7 +135,7 @@ public class FillTest {
         // {} 代表普通变量 {.} 代表是list的变量
         // 这里模板 删除了list以后的数据，也就是统计的这一行
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx";
 
         String fileName = TestFileUtil.getPath() + "complexFillWithTable" + System.currentTimeMillis() + ".xlsx";
         ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();
@@ -176,7 +176,7 @@ public class FillTest {
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         // {} 代表普通变量 {.} 代表是list的变量
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "horizontal.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "horizontal.xlsx";
 
         String fileName = TestFileUtil.getPath() + "horizontalFill" + System.currentTimeMillis() + ".xlsx";
         ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();
@@ -203,7 +203,7 @@ public class FillTest {
         // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
         // {} 代表普通变量 {.} 代表是list的变量 {前缀.} 前缀可以区分不同的list
         String templateFileName =
-            TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "composite.xlsx";
+            TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "composite.xlsx";
 
         String fileName = TestFileUtil.getPath() + "compositeFill" + System.currentTimeMillis() + ".xlsx";
         ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build();