From da2da06d87ea1b28fd8354d1f1d27fd09971f51c Mon Sep 17 00:00:00 2001 From: wangmubiaoer <1975618740@qq.com> Date: Sat, 28 May 2022 16:00:42 +0800 Subject: [PATCH] add test1 and test2 for issue1926 --- .../easyexcel/test/demo/fill/TestData1.java | 24 +++++++++ .../easyexcel/test/demo/fill/TestData2.java | 23 +++++++++ .../test/demo/fill/TestDataFillTest.java | 46 ++++++++++++++++++ .../src/test/resources/fill/issue1926.xlsx | Bin 0 -> 10788 bytes 4 files changed, 93 insertions(+) create mode 100644 easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData1.java create mode 100644 easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData2.java create mode 100644 easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestDataFillTest.java create mode 100644 easyexcel-test/src/test/resources/fill/issue1926.xlsx diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData1.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData1.java new file mode 100644 index 00000000..89a0aeed --- /dev/null +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData1.java @@ -0,0 +1,24 @@ +package com.alibaba.easyexcel.test.demo.fill; + +import java.util.Date; + +import com.alibaba.excel.annotation.write.style.ContentFontStyle; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.apache.poi.ss.usermodel.Font; + +/** + * @author Jiaju Zhuang + */ +@Getter +@Setter +@EqualsAndHashCode +public class TestData1 { + @ContentFontStyle (underline = Font.U_SINGLE) + private String name; + @ContentFontStyle(underline = Font.U_SINGLE) + private double number; + private Date date; + +} diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData2.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData2.java new file mode 100644 index 00000000..9cd1a388 --- /dev/null +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestData2.java @@ -0,0 +1,23 @@ +package com.alibaba.easyexcel.test.demo.fill; + +import java.util.Date; + +import com.alibaba.excel.annotation.write.style.ContentFontStyle; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.apache.poi.ss.usermodel.Font; + +/** + * @author Jiaju Zhuang + */ +@Getter +@Setter +@EqualsAndHashCode +public class TestData2 { + @ContentFontStyle (color = Font.COLOR_RED) + private String name; + @ContentFontStyle(color = Font.COLOR_RED) + private double number; + private Date date; +} diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestDataFillTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestDataFillTest.java new file mode 100644 index 00000000..c0972f5a --- /dev/null +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/TestDataFillTest.java @@ -0,0 +1,46 @@ +package com.alibaba.easyexcel.test.demo.fill; + + +import java.io.File; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcel; + +import org.junit.Test; +public class TestDataFillTest { + + @Test + public void simpleFill1() { + + // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 + // String templateFileName = TestData1.class.getResource("/").getPath(); + String templateFileName = TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "issue1926.xlsx"; + // 方案1 根据对象填充 + String fileName = TestFileUtil.getPath() + "simpleFill" + "issue-1926_repair1 .xlsx"; + // 这里 会填充到第一个sheet， 然后文件流会自动关闭 + TestData1 fillData = new TestData1(); + + fillData.setName("张三"); + fillData.setNumber(5.2); + EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); + + + } + + @Test + public void simpleFill2() { + + // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 + String templateFileName = TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "issue1926.xlsx"; + // 方案1 根据对象填充 + String fileName = TestFileUtil.getPath() + "simpleFill" + "issue-1926_repair2 .xlsx"; + // 这里 会填充到第一个sheet， 然后文件流会自动关闭 + TestData2 fillData = new TestData2(); + + fillData.setName("张三"); + fillData.setNumber(5.2); + EasyExcel.write(fileName).withTemplate(templateFileName).sheet().doFill(fillData); + + + } +} diff --git a/easyexcel-test/src/test/resources/fill/issue1926.xlsx b/easyexcel-test/src/test/resources/fill/issue1926.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..688df02a242ed53acba68511700ce79908425985 GIT binary patch literal 10788 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 literal 0 HcmV?d00001