Skip to content

Commit 364e027

Browse files
tmlx1990tmlx1990
authored
refactor: Update the project's fill test demo. (#249)
1 parent 48a8c2b commit 364e027

29 files changed

+175
-162
lines changed

‎fastexcel-support/README_EN.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# easyexcel-support
2+
3+
External dependencies: Currently, there is only one dependency, cglib. Since cglib does not support higher versions of the JDK, a separate copy has been made.

‎fastexcel-test/src/test/java/cn/idev/excel/test/core/fill/FillDataTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void t10CompositeFill03() {
136136

137137
private void byNameFill(File file, File template) {
138138
FillData fillData = new FillData();
139-
fillData.setName("张三");
139+
fillData.setName("Zhang San");
140140
fillData.setNumber(5.2);
141141
EasyExcel.write(file, FillData.class).withTemplate(template).sheet("Sheet2").doFill(fillData);
142142
}
@@ -153,17 +153,17 @@ private void compositeFill(File file, File template) {
153153
excelWriter.fill(new FillWrapper("data3", data()), writeSheet);
154154
excelWriter.fill(new FillWrapper("data3", data()), writeSheet);
155155
Map<String, Object> map = new HashMap<String, Object>();
156-
map.put("date", "2019年10月9日13:28:28");
156+
map.put("date", "2019-10-09 13:28:28");
157157
excelWriter.fill(map, writeSheet);
158158
}
159159

160160
List<Object> list = EasyExcel.read(file).ignoreEmptyRow(false).sheet().headRowNumber(0).doReadSync();
161161
Map<String, String> map0 = (Map<String, String>)list.get(0);
162-
Assertions.assertEquals("张三", map0.get(21));
162+
Assertions.assertEquals("Zhang San", map0.get(21));
163163
Map<String, String> map27 = (Map<String, String>)list.get(27);
164-
Assertions.assertEquals("张三", map27.get(0));
164+
Assertions.assertEquals("Zhang San", map27.get(0));
165165
Map<String, String> map29 = (Map<String, String>)list.get(29);
166-
Assertions.assertEquals("张三", map29.get(3));
166+
Assertions.assertEquals("Zhang San", map29.get(3));
167167
}
168168

169169
private void horizontalFill(File file, File template) {
@@ -173,15 +173,15 @@ private void horizontalFill(File file, File template) {
173173
excelWriter.fill(data(), fillConfig, writeSheet);
174174
excelWriter.fill(data(), fillConfig, writeSheet);
175175
Map<String, Object> map = new HashMap<String, Object>();
176-
map.put("date", "2019年10月9日13:28:28");
176+
map.put("date", "2019-10-09 13:28:28");
177177
excelWriter.fill(map, writeSheet);
178178
excelWriter.finish();
179179
}
180180

181181
List<Object> list = EasyExcel.read(file).sheet().headRowNumber(0).doReadSync();
182182
Assertions.assertEquals(list.size(), 5L);
183183
Map<String, String> map0 = (Map<String, String>)list.get(0);
184-
Assertions.assertEquals("张三", map0.get(2));
184+
Assertions.assertEquals("Zhang San", map0.get(2));
185185
}
186186

187187
private void complexFill(File file, File template) {
@@ -191,19 +191,19 @@ private void complexFill(File file, File template) {
191191
excelWriter.fill(data(), fillConfig, writeSheet);
192192
excelWriter.fill(data(), fillConfig, writeSheet);
193193
Map<String, Object> map = new HashMap<String, Object>();
194-
map.put("date", "2019年10月9日13:28:28");
194+
map.put("date", "2019-10-09 13:28:28");
195195
map.put("total", 1000);
196196
excelWriter.fill(map, writeSheet);
197197
}
198198
List<Object> list = EasyExcel.read(file).sheet().headRowNumber(3).doReadSync();
199199
Assertions.assertEquals(list.size(), 21L);
200200
Map<String, String> map19 = (Map<String, String>)list.get(19);
201-
Assertions.assertEquals("张三", map19.get(0));
201+
Assertions.assertEquals("Zhang San", map19.get(0));
202202
}
203203

204204
private void fill(File file, File template) {
205205
FillData fillData = new FillData();
206-
fillData.setName("张三");
206+
fillData.setName("Zhang San");
207207
fillData.setNumber(5.2);
208208
EasyExcel.write(file, FillData.class).withTemplate(template).sheet().doFill(fillData);
209209
}
@@ -213,7 +213,7 @@ private List<FillData> data() {
213213
for (int i = 0; i < 10; i++) {
214214
FillData fillData = new FillData();
215215
list.add(fillData);
216-
fillData.setName("张三");
216+
fillData.setName("Zhang San");
217217
fillData.setNumber(5.2);
218218
if (i == 5) {
219219
fillData.setName(null);

‎fastexcel-test/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationData.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
@EqualsAndHashCode
2222
@ContentRowHeight(100)
2323
public class FillAnnotationData {
24-
@ExcelProperty("日期")
25-
@DateTimeFormat("yyyy年MM月dd日HH时mm分ss秒")
24+
@ExcelProperty("Date")
25+
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
2626
private Date date;
2727

28-
@ExcelProperty(value = "数字")
28+
@ExcelProperty(value = "Number")
2929
@NumberFormat("#.##%")
3030
private Double number;
3131

3232
@ContentLoopMerge(columnExtend = 2)
33-
@ExcelProperty("字符串1")
33+
@ExcelProperty("String 1")
3434
private String string1;
35-
@ExcelProperty("字符串2")
35+
@ExcelProperty("String 2")
3636
private String string2;
37-
@ExcelProperty(value = "图片", converter = StringImageConverter.class)
37+
@ExcelProperty(value = "Image", converter = StringImageConverter.class)
3838
private String image;
3939
}

‎fastexcel-test/src/test/java/cn/idev/excel/test/core/fill/annotation/FillAnnotationDataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void readAndWrite(File file, File fileTemplate) throws Exception {
7070
Date date = cell10.getDateCellValue();
7171
Assertions.assertEquals(DateUtils.parseDate("2020-01-01 01:01:01").getTime(), date.getTime());
7272
String dataFormatString = cell10.getCellStyle().getDataFormatString();
73-
Assertions.assertEquals("yyyy年MM月dd日HH时mm分ss秒", dataFormatString);
73+
Assertions.assertEquals("yyyy-MM-dd HH:mm:ss", dataFormatString);
7474
Cell cell11 = row1.getCell(1);
7575
Assertions.assertEquals(99.99, cell11.getNumericCellValue(), 2);
7676
boolean hasMerge = false;

‎fastexcel-test/src/test/java/cn/idev/excel/test/core/fill/style/FillStyleAnnotatedTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void t01Fill07() throws Exception {
6161

6262
private void t01Fill07check(XSSFRow row) {
6363
XSSFCell cell0 = row.getCell(0);
64-
Assertions.assertEquals("张三", cell0.getStringCellValue());
64+
Assertions.assertEquals("Zhang San", cell0.getStringCellValue());
6565
Assertions.assertEquals(49, cell0.getCellStyle().getDataFormat());
6666
Assertions.assertEquals("FFFFFF00", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex());
6767
Assertions.assertEquals("FF808000", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex());
@@ -83,21 +83,21 @@ private void t01Fill07check(XSSFRow row) {
8383
Assertions.assertTrue(cell2.getCellStyle().getFont().getBold());
8484

8585
XSSFCell cell3 = row.getCell(3);
86-
Assertions.assertEquals("张三今年5.2岁了", cell3.getStringCellValue());
86+
Assertions.assertEquals("Zhang San is 5.2 years old this year", cell3.getStringCellValue());
8787
Assertions.assertEquals(0, cell3.getCellStyle().getDataFormat());
8888
Assertions.assertEquals("FFFF0000", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex());
8989
Assertions.assertEquals("FFEEECE1", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex());
9090
Assertions.assertTrue(cell3.getCellStyle().getFont().getBold());
9191

9292
XSSFCell cell4 = row.getCell(4);
93-
Assertions.assertEquals("{.name}忽略，张三", cell4.getStringCellValue());
93+
Assertions.assertEquals("{.name} ignored，Zhang San", cell4.getStringCellValue());
9494
Assertions.assertEquals(0, cell4.getCellStyle().getDataFormat());
9595
Assertions.assertEquals("FFC00000", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex());
9696
Assertions.assertEquals("FF000000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex());
9797
Assertions.assertFalse(cell4.getCellStyle().getFont().getBold());
9898

9999
XSSFCell cell5 = row.getCell(5);
100-
Assertions.assertEquals("空", cell5.getStringCellValue());
100+
Assertions.assertEquals("Empty", cell5.getStringCellValue());
101101
Assertions.assertEquals(0, cell5.getCellStyle().getDataFormat());
102102
Assertions.assertEquals("FFF79646", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex());
103103
Assertions.assertEquals("FF8064A2", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex());
@@ -115,7 +115,7 @@ public void t02Fill03() throws Exception {
115115

116116
private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) {
117117
HSSFCell cell0 = row.getCell(0);
118-
Assertions.assertEquals("张三", cell0.getStringCellValue());
118+
Assertions.assertEquals("Zhang San", cell0.getStringCellValue());
119119
Assertions.assertEquals(49, cell0.getCellStyle().getDataFormat());
120120
Assertions.assertEquals("FFFF:FFFF:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString());
121121
Assertions.assertEquals("8080:8080:0", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook)
@@ -140,23 +140,23 @@ private void t02Fill03check(HSSFWorkbook workbook, HSSFRow row) {
140140
Assertions.assertTrue(cell2.getCellStyle().getFont(workbook).getBold());
141141

142142
HSSFCell cell3 = row.getCell(3);
143-
Assertions.assertEquals("张三今年5.2岁了", cell3.getStringCellValue());
143+
Assertions.assertEquals("Zhang San is 5.2 years old this year", cell3.getStringCellValue());
144144
Assertions.assertEquals(0, cell3.getCellStyle().getDataFormat());
145145
Assertions.assertEquals("FFFF:0:0", cell3.getCellStyle().getFillForegroundColorColor().getHexString());
146146
Assertions.assertEquals("FFFF:FFFF:9999", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook)
147147
.getHexString());
148148
Assertions.assertTrue(cell3.getCellStyle().getFont(workbook).getBold());
149149

150150
HSSFCell cell4 = row.getCell(4);
151-
Assertions.assertEquals("{.name}忽略，张三", cell4.getStringCellValue());
151+
Assertions.assertEquals("{.name} ignored，Zhang San", cell4.getStringCellValue());
152152
Assertions.assertEquals(0, cell4.getCellStyle().getDataFormat());
153153
Assertions.assertEquals("9999:3333:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString());
154154
Assertions.assertEquals("3333:3333:3333", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook)
155155
.getHexString());
156156
Assertions.assertFalse(cell4.getCellStyle().getFont(workbook).getBold());
157157

158158
HSSFCell cell5 = row.getCell(5);
159-
Assertions.assertEquals("空", cell5.getStringCellValue());
159+
Assertions.assertEquals("Empty", cell5.getStringCellValue());
160160
Assertions.assertEquals(0, cell5.getCellStyle().getDataFormat());
161161
Assertions.assertEquals("9999:3333:0", cell5.getCellStyle().getFillForegroundColorColor().getHexString());
162162
Assertions.assertEquals("CCCC:9999:FFFF", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook)
@@ -170,7 +170,7 @@ private void fill(File file, File template) throws Exception {
170170

171171
private void t11FillStyleHandler07check(XSSFRow row) {
172172
XSSFCell cell0 = row.getCell(0);
173-
Assertions.assertEquals("张三", cell0.getStringCellValue());
173+
Assertions.assertEquals("Zhang San", cell0.getStringCellValue());
174174
Assertions.assertEquals(49, cell0.getCellStyle().getDataFormat());
175175
Assertions.assertEquals("FFFFFF00", cell0.getCellStyle().getFillForegroundColorColor().getARGBHex());
176176
Assertions.assertEquals("FF808000", cell0.getCellStyle().getFont().getXSSFColor().getARGBHex());
@@ -192,21 +192,21 @@ private void t11FillStyleHandler07check(XSSFRow row) {
192192
Assertions.assertTrue(cell2.getCellStyle().getFont().getBold());
193193

194194
XSSFCell cell3 = row.getCell(3);
195-
Assertions.assertEquals("张三今年5岁了", cell3.getStringCellValue());
195+
Assertions.assertEquals("Zhang San is 5 years old this year", cell3.getStringCellValue());
196196
Assertions.assertEquals(0, cell3.getCellStyle().getDataFormat());
197197
Assertions.assertEquals("FF0000FF", cell3.getCellStyle().getFillForegroundColorColor().getARGBHex());
198198
Assertions.assertEquals("FF000080", cell3.getCellStyle().getFont().getXSSFColor().getARGBHex());
199199
Assertions.assertTrue(cell3.getCellStyle().getFont().getBold());
200200

201201
XSSFCell cell4 = row.getCell(4);
202-
Assertions.assertEquals("{.name}忽略，张三", cell4.getStringCellValue());
202+
Assertions.assertEquals("{.name} ignored，Zhang San", cell4.getStringCellValue());
203203
Assertions.assertEquals(0, cell4.getCellStyle().getDataFormat());
204204
Assertions.assertEquals("FFFFFF00", cell4.getCellStyle().getFillForegroundColorColor().getARGBHex());
205205
Assertions.assertEquals("FF808000", cell4.getCellStyle().getFont().getXSSFColor().getARGBHex());
206206
Assertions.assertTrue(cell4.getCellStyle().getFont().getBold());
207207

208208
XSSFCell cell5 = row.getCell(5);
209-
Assertions.assertEquals("空", cell5.getStringCellValue());
209+
Assertions.assertEquals("Empty", cell5.getStringCellValue());
210210
Assertions.assertEquals(0, cell5.getCellStyle().getDataFormat());
211211
Assertions.assertEquals("FF008080", cell5.getCellStyle().getFillForegroundColorColor().getARGBHex());
212212
Assertions.assertEquals("FF003366", cell5.getCellStyle().getFont().getXSSFColor().getARGBHex());
@@ -215,7 +215,7 @@ private void t11FillStyleHandler07check(XSSFRow row) {
215215

216216
private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) {
217217
HSSFCell cell0 = row.getCell(0);
218-
Assertions.assertEquals("张三", cell0.getStringCellValue());
218+
Assertions.assertEquals("Zhang San", cell0.getStringCellValue());
219219
Assertions.assertEquals(49, cell0.getCellStyle().getDataFormat());
220220
Assertions.assertEquals("FFFF:FFFF:0", cell0.getCellStyle().getFillForegroundColorColor().getHexString());
221221
Assertions.assertEquals("8080:8080:0", cell0.getCellStyle().getFont(workbook).getHSSFColor(workbook)
@@ -240,23 +240,23 @@ private void t12FillStyleHandler03check(HSSFWorkbook workbook, HSSFRow row) {
240240
Assertions.assertTrue(cell2.getCellStyle().getFont(workbook).getBold());
241241

242242
HSSFCell cell3 = row.getCell(3);
243-
Assertions.assertEquals("张三今年5岁了", cell3.getStringCellValue());
243+
Assertions.assertEquals("Zhang San is 5 years old this year", cell3.getStringCellValue());
244244
Assertions.assertEquals(0, cell3.getCellStyle().getDataFormat());
245245
Assertions.assertEquals("0:0:FFFF", cell3.getCellStyle().getFillForegroundColorColor().getHexString());
246246
Assertions.assertEquals("0:0:8080", cell3.getCellStyle().getFont(workbook).getHSSFColor(workbook)
247247
.getHexString());
248248
Assertions.assertTrue(cell3.getCellStyle().getFont(workbook).getBold());
249249

250250
HSSFCell cell4 = row.getCell(4);
251-
Assertions.assertEquals("{.name}忽略，张三", cell4.getStringCellValue());
251+
Assertions.assertEquals("{.name} ignored，Zhang San", cell4.getStringCellValue());
252252
Assertions.assertEquals(0, cell4.getCellStyle().getDataFormat());
253253
Assertions.assertEquals("FFFF:FFFF:0", cell4.getCellStyle().getFillForegroundColorColor().getHexString());
254254
Assertions.assertEquals("8080:8080:0", cell4.getCellStyle().getFont(workbook).getHSSFColor(workbook)
255255
.getHexString());
256256
Assertions.assertTrue(cell4.getCellStyle().getFont(workbook).getBold());
257257

258258
HSSFCell cell5 = row.getCell(5);
259-
Assertions.assertEquals("空", cell5.getStringCellValue());
259+
Assertions.assertEquals("Empty", cell5.getStringCellValue());
260260
Assertions.assertEquals(0, cell5.getCellStyle().getDataFormat());
261261
Assertions.assertEquals("0:8080:8080", cell5.getCellStyle().getFillForegroundColorColor().getHexString());
262262
Assertions.assertEquals("0:3333:6666", cell5.getCellStyle().getFont(workbook).getHSSFColor(workbook)
@@ -316,7 +316,7 @@ private List<FillStyleAnnotatedData> data() throws Exception {
316316
for (int i = 0; i < 10; i++) {
317317
FillStyleAnnotatedData fillData = new FillStyleAnnotatedData();
318318
list.add(fillData);
319-
fillData.setName("张三");
319+
fillData.setName("Zhang San");
320320
fillData.setNumber(5.2);
321321
fillData.setDate(DateUtils.parseDate("2020-01-01 01:01:01"));
322322
if (i == 5) {

0 commit comments

Comments
 (0)