Skip to content

Commit 94a88a8

Browse files
GOODBOY008GOODBOY008
authored
refactor: Replace FastExcel with FesodSheet in test classes (#698)
* refactor: replace FastExcel with FesodSheet in test classes * refactor: update comments to reflect Fesod usage in WriteTest
1 parent 2a945c0 commit 94a88a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+327
-321
lines changed

‎fesod-examples/src/test/java/org/apache/fesod/sheet/demo/write/WriteTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ public void handlerStyleWrite() {
523523
.sheet("模板")
524524
.doWrite(data());
525525

526-
// 方法2: 使用FastExcel的方式完全自己写 不太推荐 尽量使用已有策略
526+
// 方法2: 使用Fesod的方式完全自己写 不太推荐 尽量使用已有策略
527527
// @since 3.0.0-beta2
528528
fileName = TestFileUtil.getPath() + "handlerStyleWrite" + System.currentTimeMillis() + ".xlsx";
529529
FesodSheet.write(fileName, DemoData.class)

fesod/src/test/java/org/apache/fesod/sheet/FastExcelFactoryTest.java renamed to fesod/src/test/java/org/apache/fesod/sheet/FesodSheetFactoryTest.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
import org.mockito.junit.jupiter.MockitoExtension;
4646

4747
@ExtendWith(MockitoExtension.class)
48-
@DisplayName("FastExcelFactory Unit Tests")
49-
class FastExcelFactoryTest {
48+
@DisplayName("FesodSheetFactory Unit Tests")
49+
class FesodSheetFactoryTest {
5050

5151
@TempDir
5252
Path tempDir;
@@ -93,36 +93,36 @@ void setUp() {
9393

9494
@Test
9595
void testWrite_noArgs_shouldReturnBuilder() {
96-
ExcelWriterBuilder builder = FastExcelFactory.write();
96+
ExcelWriterBuilder builder = FesodSheetFactory.write();
9797
assertNotNull(builder);
9898
}
9999

100100
@Test
101101
void testWrite_withFile_shouldConfigureFile() {
102-
ExcelWriterBuilder builder = FastExcelFactory.write(tempFile);
102+
ExcelWriterBuilder builder = FesodSheetFactory.write(tempFile);
103103
assertNotNull(builder);
104104

105105
assertEquals(tempFile, writeWorkbook(builder).getFile());
106106
}
107107

108108
@Test
109109
void testWrite_withFileAndHead_shouldConfigureAll() {
110-
ExcelWriterBuilder builder = FastExcelFactory.write(tempFile, DemoData.class);
110+
ExcelWriterBuilder builder = FesodSheetFactory.write(tempFile, DemoData.class);
111111
assertNotNull(builder);
112112
assertEquals(tempFile, writeWorkbook(builder).getFile());
113113
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
114114
}
115115

116116
@Test
117117
void testWrite_withPathName_shouldConfigureFile() {
118-
ExcelWriterBuilder builder = FastExcelFactory.write(tempFilePath);
118+
ExcelWriterBuilder builder = FesodSheetFactory.write(tempFilePath);
119119
assertNotNull(builder);
120120
assertEquals(tempFilePath, writeWorkbook(builder).getFile().getAbsolutePath());
121121
}
122122

123123
@Test
124124
void testWrite_withPathNameAndHead_shouldConfigureAll() {
125-
ExcelWriterBuilder builder = FastExcelFactory.write(tempFilePath, DemoData.class);
125+
ExcelWriterBuilder builder = FesodSheetFactory.write(tempFilePath, DemoData.class);
126126
assertNotNull(builder);
127127
WriteWorkbook workbook = writeWorkbook(builder);
128128
assertEquals(tempFilePath, workbook.getFile().getAbsolutePath());
@@ -131,82 +131,82 @@ void testWrite_withPathNameAndHead_shouldConfigureAll() {
131131

132132
@Test
133133
void testWrite_withOutputStream_shouldConfigureStream() {
134-
ExcelWriterBuilder builder = FastExcelFactory.write(mockOutputStream);
134+
ExcelWriterBuilder builder = FesodSheetFactory.write(mockOutputStream);
135135
assertNotNull(builder);
136136
assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
137137
}
138138

139139
@Test
140140
void testWrite_withOutputStreamAndHead_shouldConfigureAll() {
141-
ExcelWriterBuilder builder = FastExcelFactory.write(mockOutputStream, DemoData.class);
141+
ExcelWriterBuilder builder = FesodSheetFactory.write(mockOutputStream, DemoData.class);
142142
assertNotNull(builder);
143143
assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
144144
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
145145
}
146146

147147
@Test
148148
void testWriterSheet_noArgs_shouldReturnBuilder() {
149-
ExcelWriterSheetBuilder builder = FastExcelFactory.writerSheet();
149+
ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet();
150150
assertNotNull(builder);
151151
}
152152

153153
@Test
154154
void testWriterSheet_withSheetNo_shouldReturnBuilder() {
155-
ExcelWriterSheetBuilder builder = FastExcelFactory.writerSheet(1);
155+
ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet(1);
156156
assertNotNull(builder);
157157
}
158158

159159
@Test
160160
void testWriterSheet_withSheetName_shouldReturnBuilder() {
161-
ExcelWriterSheetBuilder builder = FastExcelFactory.writerSheet("TestSheet");
161+
ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet("TestSheet");
162162
assertNotNull(builder);
163163
}
164164

165165
@Test
166166
void testWriterSheet_withSheetNoAndName_shouldReturnBuilder() {
167-
ExcelWriterSheetBuilder builder = FastExcelFactory.writerSheet(1, "TestSheet");
167+
ExcelWriterSheetBuilder builder = FesodSheetFactory.writerSheet(1, "TestSheet");
168168
assertNotNull(builder);
169169
}
170170

171171
@Test
172172
void testWriterTable_noArgs_shouldReturnBuilder() {
173-
ExcelWriterTableBuilder builder = FastExcelFactory.writerTable();
173+
ExcelWriterTableBuilder builder = FesodSheetFactory.writerTable();
174174
assertNotNull(builder);
175175
}
176176

177177
@Test
178178
void testWriterTable_withTableNo_shouldReturnBuilder() {
179-
ExcelWriterTableBuilder builder = FastExcelFactory.writerTable(1);
179+
ExcelWriterTableBuilder builder = FesodSheetFactory.writerTable(1);
180180
assertNotNull(builder);
181181
}
182182

183183
// --- Read Methods Tests ---
184184

185185
@Test
186186
void testRead_noArgs_shouldReturnBuilder() {
187-
ExcelReaderBuilder builder = FastExcelFactory.read();
187+
ExcelReaderBuilder builder = FesodSheetFactory.read();
188188
assertNotNull(builder);
189189
}
190190

191191
@Test
192192
void testRead_withFile_shouldConfigureFile() throws Exception {
193-
ExcelReaderBuilder builder = FastExcelFactory.read(tempFile);
193+
ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile);
194194
assertNotNull(builder);
195195
ReadWorkbook workbook = writeWorkbook(builder);
196196
assertEquals(tempFile, workbook.getFile());
197197
}
198198

199199
@Test
200200
void testRead_withFileAndListener_shouldConfigureAll() {
201-
ExcelReaderBuilder builder = FastExcelFactory.read(tempFile, mockReadListener);
201+
ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile, mockReadListener);
202202
assertNotNull(builder);
203203
assertEquals(tempFile, writeWorkbook(builder).getFile());
204204
assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
205205
}
206206

207207
@Test
208208
void testRead_withFileHeadAndListener_shouldConfigureAll() {
209-
ExcelReaderBuilder builder = FastExcelFactory.read(tempFile, DemoData.class, mockReadListener);
209+
ExcelReaderBuilder builder = FesodSheetFactory.read(tempFile, DemoData.class, mockReadListener);
210210
assertNotNull(builder);
211211
assertEquals(tempFile, writeWorkbook(builder).getFile());
212212
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -215,7 +215,7 @@ void testRead_withFileHeadAndListener_shouldConfigureAll() {
215215

216216
@Test
217217
void testRead_withInputStreamHeadAndListener_shouldConfigureAll() {
218-
ExcelReaderBuilder builder = FastExcelFactory.read(mockInputStream, DemoData.class, mockReadListener);
218+
ExcelReaderBuilder builder = FesodSheetFactory.read(mockInputStream, DemoData.class, mockReadListener);
219219
assertNotNull(builder);
220220
assertSame(mockInputStream, writeWorkbook(builder).getInputStream());
221221
assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
@@ -226,25 +226,25 @@ void testRead_withInputStreamHeadAndListener_shouldConfigureAll() {
226226

227227
@Test
228228
void testReadSheet_noArgs_shouldReturnBuilder() {
229-
ExcelReaderSheetBuilder builder = FastExcelFactory.readSheet();
229+
ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet();
230230
assertNotNull(builder);
231231
}
232232

233233
@Test
234234
void testReadSheet_withSheetNo_shouldReturnBuilder() {
235-
ExcelReaderSheetBuilder builder = FastExcelFactory.readSheet(0);
235+
ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet(0);
236236
assertNotNull(builder);
237237
}
238238

239239
@Test
240240
void testReadSheet_withSheetName_shouldReturnBuilder() {
241-
ExcelReaderSheetBuilder builder = FastExcelFactory.readSheet("DataSheet");
241+
ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet("DataSheet");
242242
assertNotNull(builder);
243243
}
244244

245245
@Test
246246
void testReadSheet_withAllParams_shouldReturnBuilder() {
247-
ExcelReaderSheetBuilder builder = FastExcelFactory.readSheet(0, "DataSheet", 100);
247+
ExcelReaderSheetBuilder builder = FesodSheetFactory.readSheet(0, "DataSheet", 100);
248248
assertNotNull(builder);
249249
}
250250
}

‎fesod/src/test/java/org/apache/fesod/sheet/annotation/AnnotationDataTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.File;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import org.apache.fesod.sheet.FastExcel;
25+
import org.apache.fesod.sheet.FesodSheet;
2626
import org.apache.fesod.sheet.util.DateUtils;
2727
import org.apache.fesod.sheet.util.StyleTestUtils;
2828
import org.apache.fesod.sheet.util.TestFileUtil;
@@ -84,7 +84,7 @@ public void t12Write03() throws Exception {
8484
}
8585

8686
private void writeStyle(File file) throws Exception {
87-
FastExcel.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle());
87+
FesodSheet.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle());
8888

8989
Workbook workbook = WorkbookFactory.create(file);
9090
Sheet sheet = workbook.getSheetAt(0);
@@ -112,7 +112,7 @@ private void writeStyle(File file) throws Exception {
112112
}
113113

114114
private void readAndWrite(File file) throws Exception {
115-
FastExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle());
115+
FesodSheet.write().file(file).head(AnnotationData.class).sheet().doWrite(dataStyle());
116116

117117
if (file == fileCsv) {
118118
return;

‎fesod/src/test/java/org/apache/fesod/sheet/annotation/AnnotationIndexAndNameDataTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.File;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import org.apache.fesod.sheet.FastExcel;
25+
import org.apache.fesod.sheet.FesodSheet;
2626
import org.apache.fesod.sheet.util.TestFileUtil;
2727
import org.junit.jupiter.api.BeforeAll;
2828
import org.junit.jupiter.api.MethodOrderer;
@@ -64,8 +64,8 @@ public void t03ReadAndWriteCsv() {
6464
}
6565

6666
private void readAndWrite(File file) {
67-
FastExcel.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data());
68-
FastExcel.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener())
67+
FesodSheet.write(file, AnnotationIndexAndNameData.class).sheet().doWrite(data());
68+
FesodSheet.read(file, AnnotationIndexAndNameData.class, new AnnotationIndexAndNameDataListener())
6969
.sheet()
7070
.doRead();
7171
}

‎fesod/src/test/java/org/apache/fesod/sheet/annotation/ExcelPropertyFormatTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.LinkedList;
3434
import java.util.List;
3535
import lombok.Data;
36-
import org.apache.fesod.sheet.FastExcel;
36+
import org.apache.fesod.sheet.FesodSheet;
3737
import org.apache.fesod.sheet.annotation.format.DateTimeFormat;
3838
import org.apache.fesod.sheet.context.AnalysisContext;
3939
import org.apache.fesod.sheet.read.listener.ReadListener;
@@ -65,7 +65,7 @@ public void testSingleFormatSampleWriteAndRead(@TempDir Path tempDir) throws IOE
6565
singleElementList.add(sample);
6666
String fileName =
6767
tempDir.resolve(System.currentTimeMillis() + "_single.xlsx").toString();
68-
FastExcel.write(fileName, FormatSample.class).sheet("UnitTest").doWrite(singleElementList);
68+
FesodSheet.write(fileName, FormatSample.class).sheet("UnitTest").doWrite(singleElementList);
6969
try (FileInputStream fis = new FileInputStream(fileName);
7070
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
7171
Row dataRow = workbook.getSheetAt(0).getRow(1);
@@ -94,7 +94,7 @@ public void testChinesePatternFormat(@TempDir Path tempDir) throws IOException {
9494
sample.setFullDate(new Date());
9595
sample.setLocalDate(LocalDate.of(2025, 1, 2));
9696
String fileName = tempDir.resolve("chinese_pattern.xlsx").toString();
97-
FastExcel.write(fileName, ChinesePatternSample.class)
97+
FesodSheet.write(fileName, ChinesePatternSample.class)
9898
.sheet("ChineseFormat")
9999
.doWrite(Collections.singletonList(sample));
100100
try (FileInputStream fis = new FileInputStream(fileName);
@@ -131,7 +131,7 @@ public void testMultiplePatternsPerRow(@TempDir Path tempDir) throws IOException
131131
s.setDateDash(LocalDate.of(2024, 12, 31));
132132
s.setDateTimeMinute(LocalDateTime.of(2025, 3, 4, 15, 20));
133133
String file = tempDir.resolve("multi_pattern.xlsx").toString();
134-
FastExcel.write(file, MultiPatternSample.class).sheet("MultiFormat").doWrite(Collections.singletonList(s));
134+
FesodSheet.write(file, MultiPatternSample.class).sheet("MultiFormat").doWrite(Collections.singletonList(s));
135135
try (FileInputStream fis = new FileInputStream(file);
136136
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
137137
Row row = workbook.getSheetAt(0).getRow(1);
@@ -188,7 +188,7 @@ static class NullDateSample {
188188
public void testNullDateFieldWritesBlank(@TempDir Path tempDir) throws IOException {
189189
NullDateSample sample = new NullDateSample();
190190
String file = tempDir.resolve("null_date.xlsx").toString();
191-
FastExcel.write(file, NullDateSample.class).sheet("Null").doWrite(Collections.singletonList(sample));
191+
FesodSheet.write(file, NullDateSample.class).sheet("Null").doWrite(Collections.singletonList(sample));
192192
try (FileInputStream fis = new FileInputStream(file);
193193
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
194194
Row row = workbook.getSheetAt(0).getRow(1);

‎fesod/src/test/java/org/apache/fesod/sheet/bom/BomDataTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.Map;
2727
import lombok.extern.slf4j.Slf4j;
2828
import org.apache.commons.compress.utils.Lists;
29-
import org.apache.fesod.sheet.FastExcel;
29+
import org.apache.fesod.sheet.FesodSheet;
3030
import org.apache.fesod.sheet.context.AnalysisContext;
3131
import org.apache.fesod.sheet.metadata.data.ReadCellData;
3232
import org.apache.fesod.sheet.read.listener.ReadListener;
@@ -72,14 +72,14 @@ private void readAndWriteCsv(File file, String charsetName, Boolean withBom) thr
7272
if (charsetName != null) {
7373
charset = Charset.forName(charsetName);
7474
}
75-
FastExcel.write(new FileOutputStream(file), BomData.class)
75+
FesodSheet.write(new FileOutputStream(file), BomData.class)
7676
.charset(charset)
7777
.withBom(withBom)
7878
.excelType(ExcelTypeEnum.CSV)
7979
.sheet()
8080
.doWrite(data());
8181

82-
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {
82+
FesodSheet.read(file, BomData.class, new ReadListener<BomData>() {
8383

8484
private final List<BomData> dataList = Lists.newArrayList();
8585

@@ -108,7 +108,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {
108108
}
109109

110110
private void readCsv(File file) {
111-
FastExcel.read(file, BomData.class, new ReadListener<BomData>() {
111+
FesodSheet.read(file, BomData.class, new ReadListener<BomData>() {
112112

113113
private final List<BomData> dataList = Lists.newArrayList();
114114

‎fesod/src/test/java/org/apache/fesod/sheet/cache/CacheDataTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.List;
2828
import java.util.Map;
2929
import lombok.extern.slf4j.Slf4j;
30-
import org.apache.fesod.sheet.FastExcel;
30+
import org.apache.fesod.sheet.FesodSheet;
3131
import org.apache.fesod.sheet.annotation.ExcelProperty;
3232
import org.apache.fesod.sheet.context.AnalysisContext;
3333
import org.apache.fesod.sheet.data.DemoData;
@@ -72,8 +72,8 @@ public void t01ReadAndWrite() throws Exception {
7272
ThreadLocal<Map<Class<?>, FieldCache>> fieldThreadLocal =
7373
(ThreadLocal<Map<Class<?>, FieldCache>>) field.get(ClassUtils.class.newInstance());
7474
Assertions.assertNull(fieldThreadLocal.get());
75-
FastExcel.write(file07, CacheData.class).sheet().doWrite(data());
76-
FastExcel.read(file07, CacheData.class, new PageReadListener<DemoData>(dataList -> {
75+
FesodSheet.write(file07, CacheData.class).sheet().doWrite(data());
76+
FesodSheet.read(file07, CacheData.class, new PageReadListener<DemoData>(dataList -> {
7777
Assertions.assertNotNull(fieldThreadLocal.get());
7878
}))
7979
.sheet()
@@ -83,8 +83,8 @@ public void t01ReadAndWrite() throws Exception {
8383

8484
@Test
8585
public void t02ReadAndWriteInvoke() throws Exception {
86-
FastExcel.write(fileCacheInvoke, CacheInvokeData.class).sheet().doWrite(dataInvoke());
87-
FastExcel.read(fileCacheInvoke, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {
86+
FesodSheet.write(fileCacheInvoke, CacheInvokeData.class).sheet().doWrite(dataInvoke());
87+
FesodSheet.read(fileCacheInvoke, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {
8888

8989
@Override
9090
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
@@ -110,8 +110,8 @@ public void doAfterAllAnalysed(AnalysisContext context) {}
110110
Map map = (Map) memberValues.get(invocationHandler);
111111
map.put("value", new String[] {"姓名2"});
112112

113-
FastExcel.write(fileCacheInvoke2, CacheInvokeData.class).sheet().doWrite(dataInvoke());
114-
FastExcel.read(fileCacheInvoke2, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {
113+
FesodSheet.write(fileCacheInvoke2, CacheInvokeData.class).sheet().doWrite(dataInvoke());
114+
FesodSheet.read(fileCacheInvoke2, CacheInvokeData.class, new AnalysisEventListener<CacheInvokeData>() {
115115

116116
@Override
117117
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
@@ -132,11 +132,11 @@ public void doAfterAllAnalysed(AnalysisContext context) {}
132132

133133
@Test
134134
public void t03ReadAndWriteInvokeMemory() throws Exception {
135-
FastExcel.write(fileCacheInvokeMemory, CacheInvokeMemoryData.class)
135+
FesodSheet.write(fileCacheInvokeMemory, CacheInvokeMemoryData.class)
136136
.filedCacheLocation(CacheLocationEnum.MEMORY)
137137
.sheet()
138138
.doWrite(dataInvokeMemory());
139-
FastExcel.read(
139+
FesodSheet.read(
140140
fileCacheInvokeMemory,
141141
CacheInvokeMemoryData.class,
142142
new AnalysisEventListener<CacheInvokeMemoryData>() {
@@ -166,11 +166,11 @@ public void doAfterAllAnalysed(AnalysisContext context) {}
166166
Map map = (Map) memberValues.get(invocationHandler);
167167
map.put("value", new String[] {"姓名2"});
168168

169-
FastExcel.write(fileCacheInvokeMemory2, CacheInvokeMemoryData.class)
169+
FesodSheet.write(fileCacheInvokeMemory2, CacheInvokeMemoryData.class)
170170
.filedCacheLocation(CacheLocationEnum.MEMORY)
171171
.sheet()
172172
.doWrite(dataInvokeMemory());
173-
FastExcel.read(
173+
FesodSheet.read(
174174
fileCacheInvokeMemory2,
175175
CacheInvokeMemoryData.class,
176176
new AnalysisEventListener<CacheInvokeMemoryData>() {

0 commit comments

Comments
 (0)