Skip to content

Commit 179dca1

Browse files
authored
fix: fix repeat cases (#315)
1 parent 0e04f35 commit 179dca1

File tree

3 files changed

+69
-33
lines changed

3 files changed

+69
-33
lines changed
Lines changed: 69 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package cn.idev.excel.test.temp.simple;
22

3-
import java.io.FileInputStream;
4-
import java.io.IOException;
5-
63
import cn.idev.excel.EasyExcel;
74
import cn.idev.excel.ExcelReader;
85
import cn.idev.excel.read.metadata.ReadSheet;
96
import cn.idev.excel.test.temp.LockData;
10-
117
import org.junit.jupiter.api.Test;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
8+
9+
import java.io.IOException;
10+
import java.nio.file.Files;
11+
import java.nio.file.Paths;
1412

1513
/**
1614
* 测试poi
@@ -19,37 +17,75 @@
1917
**/
2018

2119
public class RepeatTest {
22-
private static final Logger LOGGER = LoggerFactory.getLogger(RepeatTest.class);
23-
20+
21+
2422
@Test
25-
public void hh() throws IOException {
26-
ExcelReader reader =
27-
EasyExcel.read(new FileInputStream("D:\\test\\hg2.xls"), LockData.class, new RepeatListener())
28-
.headRowNumber(0).build();
29-
ReadSheet r1 = EasyExcel.readSheet(0).build();
30-
ReadSheet r2 = EasyExcel.readSheet(2).build();
31-
reader.read(r1);
32-
reader.read(r2);
33-
reader.finish();
23+
public void xlsTest1() throws IOException {
24+
try (ExcelReader reader = EasyExcel.read(
25+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class,
26+
new RepeatListener()).headRowNumber(0).build()) {
27+
ReadSheet r1 = EasyExcel.readSheet(0).build();
28+
ReadSheet r2 = EasyExcel.readSheet(2).build();
29+
reader.read(r1);
30+
reader.read(r2);
31+
reader.finish();
32+
}
3433
}
35-
34+
3635
@Test
37-
public void hh2() throws IOException {
38-
ExcelReader reader =
39-
EasyExcel.read(new FileInputStream("D:\\test\\sheet.xls"), LockData.class, new RepeatListener())
40-
.headRowNumber(0).build();
41-
ReadSheet r2 = EasyExcel.readSheet(1).build();
42-
reader.read(r2);
43-
reader.finish();
36+
public void xlsTest2() throws IOException {
37+
try (ExcelReader reader = EasyExcel.read(
38+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class,
39+
new RepeatListener()).headRowNumber(0).build()) {
40+
ReadSheet r2 = EasyExcel.readSheet(1).build();
41+
reader.read(r2);
42+
reader.finish();
43+
}
4444
}
45-
45+
46+
@Test
47+
public void xlsTest3() throws IOException {
48+
try (ExcelReader reader = EasyExcel.read(
49+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xls")), LockData.class,
50+
new RepeatListener()).headRowNumber(0).build()) {
51+
ReadSheet r2 = EasyExcel.readSheet(0).build();
52+
reader.read(r2);
53+
reader.finish();
54+
}
55+
}
56+
57+
@Test
58+
public void xlsxTest1() throws IOException {
59+
try (ExcelReader reader = EasyExcel.read(
60+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class,
61+
new RepeatListener()).headRowNumber(0).build()) {
62+
ReadSheet r1 = EasyExcel.readSheet(0).build();
63+
ReadSheet r2 = EasyExcel.readSheet(2).build();
64+
reader.read(r1);
65+
reader.read(r2);
66+
reader.finish();
67+
}
68+
}
69+
70+
@Test
71+
public void xlsxTest2() throws IOException {
72+
try (ExcelReader reader = EasyExcel.read(
73+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class,
74+
new RepeatListener()).headRowNumber(0).build()) {
75+
ReadSheet r2 = EasyExcel.readSheet(1).build();
76+
reader.read(r2);
77+
reader.finish();
78+
}
79+
}
80+
4681
@Test
47-
public void hh1() throws IOException {
48-
ExcelReader reader =
49-
EasyExcel.read(new FileInputStream("D:\\test\\hg2.xls"), LockData.class, new RepeatListener())
50-
.headRowNumber(0).build();
51-
ReadSheet r2 = EasyExcel.readSheet(0).build();
52-
reader.read(r2);
53-
reader.finish();
82+
public void xlsxTest3() throws IOException {
83+
try (ExcelReader reader = EasyExcel.read(
84+
Files.newInputStream(Paths.get("src/test/resources/repeat/repeat.xlsx")), LockData.class,
85+
new RepeatListener()).headRowNumber(0).build()) {
86+
ReadSheet r2 = EasyExcel.readSheet(0).build();
87+
reader.read(r2);
88+
reader.finish();
89+
}
5490
}
5591
}
26.5 KB
Binary file not shown.
10.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)