Skip to content

test(core): improve assertion usage for better clarity and order #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
delei merged 1 commit into from
Nov 12, 2025
Merged

test(core): improve assertion usage for better clarity and order #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions fesod/src/test/java/org/apache/fesod/sheet/analysis/ExcelAnalyserOldBiffTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ void chooseExecutor_shouldNoop_onOldBiffBytes_stream() {
Assertions.assertEquals(
ExcelTypeEnum.XLS,
analyser.analysisContext().readWorkbookHolder().getExcelType());
Assertions.assertTrue(
analyser.excelExecutor() instanceof ExcelAnalyserImpl.NoopExcelReadExecutor,
Assertions.assertInstanceOf(
ExcelAnalyserImpl.NoopExcelReadExecutor.class,
analyser.excelExecutor(),
"Executor should be NoopExcelReadExecutor for old BIFF");
}

Expand All @@ -84,8 +85,9 @@ void chooseExecutor_shouldNoop_onOldBiffBytes_file(@TempDir Path tmp) throws Exc
Assertions.assertEquals(
ExcelTypeEnum.XLS,
analyser.analysisContext().readWorkbookHolder().getExcelType());
Assertions.assertTrue(
analyser.excelExecutor() instanceof ExcelAnalyserImpl.NoopExcelReadExecutor,
Assertions.assertInstanceOf(
ExcelAnalyserImpl.NoopExcelReadExecutor.class,
analyser.excelExecutor(),
"Executor should be NoopExcelReadExecutor for old BIFF");
}
}
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/annotation/AnnotationDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public void invoke(AnnotationData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
AnnotationData data = list.get(0);
try {
Assertions.assertEquals(data.getDate(), DateUtils.parseDate("2020-01-01 01:01:01"));
} catch (ParseException e) {
throw new ExcelCommonException("Test Exception", e);
}
Assertions.assertEquals(data.getNumber(), 99.99, 0.00);
Assertions.assertEquals(99.99, data.getNumber(), 0.00);
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
10 changes: 5 additions & 5 deletions ...d/src/test/java/org/apache/fesod/sheet/annotation/AnnotationIndexAndNameDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public void invoke(AnnotationIndexAndNameData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
AnnotationIndexAndNameData data = list.get(0);
Assertions.assertEquals(data.getIndex0(), "第0个");
Assertions.assertEquals(data.getIndex1(), "第1个");
Assertions.assertEquals(data.getIndex2(), "第2个");
Assertions.assertEquals(data.getIndex4(), "第4个");
Assertions.assertEquals("第0个", data.getIndex0());
Assertions.assertEquals("第1个", data.getIndex1());
Assertions.assertEquals("第2个", data.getIndex2());
Assertions.assertEquals("第4个", data.getIndex4());
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/bom/BomDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void invoke(BomData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(dataList.size(), 10);
Assertions.assertEquals(10, dataList.size());
BomData bomData = dataList.get(0);
Assertions.assertEquals("姓名0", bomData.getName());
Assertions.assertEquals(20, (long) bomData.getAge());
Expand Down Expand Up @@ -125,7 +125,7 @@ public void invoke(BomData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(dataList.size(), 10);
Assertions.assertEquals(10, dataList.size());
BomData bomData = dataList.get(0);
Assertions.assertEquals("姓名0", bomData.getName());
Assertions.assertEquals(20L, (long) bomData.getAge());
Expand Down
8 changes: 4 additions & 4 deletions fesod/src/test/java/org/apache/fesod/sheet/celldata/CellDataDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ public void invoke(CellDataReadData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
CellDataReadData cellDataData = list.get(0);

Assertions.assertEquals("2020年01月01日", cellDataData.getDate().getData());
Assertions.assertEquals((long) cellDataData.getInteger1().getData(), 2L);
Assertions.assertEquals((long) cellDataData.getInteger2(), 2L);
Assertions.assertEquals(2L, (long) cellDataData.getInteger1().getData());
Assertions.assertEquals(2L, (long) cellDataData.getInteger2());
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
Assertions.assertEquals(
cellDataData.getFormulaValue().getFormulaData().getFormulaValue(), "B2+C2");
"B2+C2", cellDataData.getFormulaValue().getFormulaData().getFormulaValue());
} else {
Assertions.assertNull(cellDataData.getFormulaValue().getData());
}
Expand Down
2 changes: 1 addition & 1 deletion fesod/src/test/java/org/apache/fesod/sheet/charset/CharsetDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void invoke(CharsetData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(dataList.size(), 10);
Assertions.assertEquals(10, dataList.size());
CharsetData charsetData = dataList.get(0);
Assertions.assertEquals("姓名0", charsetData.getName());
Assertions.assertEquals(0, (long) charsetData.getAge());
Expand Down
20 changes: 10 additions & 10 deletions fesod/src/test/java/org/apache/fesod/sheet/converter/ConverterDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ public void invoke(ConverterReadData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
ConverterReadData data = list.get(0);
Assertions.assertEquals(TestUtil.TEST_DATE, data.getDate());
Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE, data.getLocalDate());
Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE_TIME, data.getLocalDateTime());
Assertions.assertEquals(data.getBooleanData(), Boolean.TRUE);
Assertions.assertEquals(Boolean.TRUE, data.getBooleanData());
Assertions.assertEquals(data.getBigDecimal().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
Assertions.assertEquals(data.getBigInteger().intValue(), BigInteger.ONE.intValue(), 0.0);
Assertions.assertEquals((long) data.getLongData(), 1L);
Assertions.assertEquals((long) data.getIntegerData(), 1L);
Assertions.assertEquals((long) data.getShortData(), 1L);
Assertions.assertEquals((long) data.getByteData(), 1L);
Assertions.assertEquals(data.getDoubleData(), 1.0, 0.0);
Assertions.assertEquals(data.getFloatData(), (float) 1.0, 0.0);
Assertions.assertEquals(data.getString(), "测试");
Assertions.assertEquals(data.getCellData().getStringValue(), "自定义");
Assertions.assertEquals(1L, (long) data.getLongData());
Assertions.assertEquals(1L, (long) data.getIntegerData());
Assertions.assertEquals(1L, (long) data.getShortData());
Assertions.assertEquals(1L, (long) data.getByteData());
Assertions.assertEquals(1.0, data.getDoubleData(), 0.0);
Assertions.assertEquals((float) 1.0, data.getFloatData(), 0.0);
Assertions.assertEquals("测试", data.getString());
Assertions.assertEquals("自定义", data.getCellData().getStringValue());
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
48 changes: 24 additions & 24 deletions fesod/src/test/java/org/apache/fesod/sheet/converter/ReadAllConverterDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void invoke(ReadAllConverterData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
ReadAllConverterData data = list.get(0);
Assertions.assertEquals(data.getBigDecimalBoolean().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
Assertions.assertEquals(data.getBigDecimalNumber().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
Expand All @@ -58,9 +58,9 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertTrue(data.getBooleanBoolean());
Assertions.assertTrue(data.getBooleanNumber());
Assertions.assertTrue(data.getBooleanString());
Assertions.assertEquals((long) data.getByteBoolean(), 1L);
Assertions.assertEquals((long) data.getByteNumber(), 1L);
Assertions.assertEquals((long) data.getByteString(), 1L);
Assertions.assertEquals(1L, (long) data.getByteBoolean());
Assertions.assertEquals(1L, (long) data.getByteNumber());
Assertions.assertEquals(1L, (long) data.getByteString());
try {
Assertions.assertEquals(data.getDateNumber(), DateUtils.parseDate("2020-01-01 01:01:01"));
Assertions.assertEquals(data.getDateString(), DateUtils.parseDate("2020-01-01 01:01:01"));
Expand All @@ -71,32 +71,32 @@ public void doAfterAllAnalysed(AnalysisContext context) {
data.getLocalDateTimeNumber(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
Assertions.assertEquals(
data.getLocalDateTimeString(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
Assertions.assertEquals(data.getDoubleBoolean(), 1.0, 0.0);
Assertions.assertEquals(data.getDoubleNumber(), 1.0, 0.0);
Assertions.assertEquals(data.getDoubleString(), 1.0, 0.0);
Assertions.assertEquals(data.getFloatBoolean(), (float) 1.0, 0.0);
Assertions.assertEquals(data.getFloatNumber(), (float) 1.0, 0.0);
Assertions.assertEquals(data.getFloatString(), (float) 1.0, 0.0);
Assertions.assertEquals((long) data.getIntegerBoolean(), 1L);
Assertions.assertEquals((long) data.getIntegerNumber(), 1L);
Assertions.assertEquals((long) data.getIntegerString(), 1L);
Assertions.assertEquals((long) data.getLongBoolean(), 1L);
Assertions.assertEquals((long) data.getLongNumber(), 1L);
Assertions.assertEquals((long) data.getLongString(), 1L);
Assertions.assertEquals((long) data.getShortBoolean(), 1L);
Assertions.assertEquals((long) data.getShortNumber(), 1L);
Assertions.assertEquals((long) data.getShortString(), 1L);
Assertions.assertEquals(data.getStringBoolean().toLowerCase(), "true");
Assertions.assertEquals(data.getStringString(), "测试");
Assertions.assertEquals(data.getStringError(), "#VALUE!");
Assertions.assertEquals(1.0, data.getDoubleBoolean(), 0.0);
Assertions.assertEquals(1.0, data.getDoubleNumber(), 0.0);
Assertions.assertEquals(1.0, data.getDoubleString(), 0.0);
Assertions.assertEquals((float) 1.0, data.getFloatBoolean(), 0.0);
Assertions.assertEquals((float) 1.0, data.getFloatNumber(), 0.0);
Assertions.assertEquals((float) 1.0, data.getFloatString(), 0.0);
Assertions.assertEquals(1L, (long) data.getIntegerBoolean());
Assertions.assertEquals(1L, (long) data.getIntegerNumber());
Assertions.assertEquals(1L, (long) data.getIntegerString());
Assertions.assertEquals(1L, (long) data.getLongBoolean());
Assertions.assertEquals(1L, (long) data.getLongNumber());
Assertions.assertEquals(1L, (long) data.getLongString());
Assertions.assertEquals(1L, (long) data.getShortBoolean());
Assertions.assertEquals(1L, (long) data.getShortNumber());
Assertions.assertEquals(1L, (long) data.getShortString());
Assertions.assertEquals("true", data.getStringBoolean().toLowerCase());
Assertions.assertEquals("测试", data.getStringString());
Assertions.assertEquals("#VALUE!", data.getStringError());
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
Assertions.assertEquals("2020-1-1 1:01", data.getStringNumberDate());
} else {
Assertions.assertEquals("2020-01-01 01:01:01", data.getStringNumberDate());
}
double doubleStringFormulaNumber = new BigDecimal(data.getStringFormulaNumber()).doubleValue();
Assertions.assertEquals(doubleStringFormulaNumber, 2.0, 0.0);
Assertions.assertEquals(data.getStringFormulaString(), "1测试");
Assertions.assertEquals(2.0, doubleStringFormulaNumber, 0.0);
Assertions.assertEquals("1测试", data.getStringFormulaString());
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
10 changes: 5 additions & 5 deletions fesod/src/test/java/org/apache/fesod/sheet/encrypt/EncryptDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ public void invoke(EncryptData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 10);
Assertions.assertEquals(list.get(0).getName(), "Name0");
Assertions.assertEquals((int) (context.readSheetHolder().getSheetNo()), 0);
Assertions.assertEquals(10, list.size());
Assertions.assertEquals("Name0", list.get(0).getName());
Assertions.assertEquals(0, (int) (context.readSheetHolder().getSheetNo()));
Assertions.assertEquals(
"姓名",
context.readSheetHolder()
.getExcelReadHeadProperty()
.getHeadMap()
.get(0)
.getHeadNameList()
.get(0),
"姓名");
.get(0));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
10 changes: 5 additions & 5 deletions fesod/src/test/java/org/apache/fesod/sheet/exception/ExceptionDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ public void invoke(ExceptionData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 8);
Assertions.assertEquals(list.get(0).getName(), "姓名0");
Assertions.assertEquals((int) (context.readSheetHolder().getSheetNo()), 0);
Assertions.assertEquals(8, list.size());
Assertions.assertEquals("姓名0", list.get(0).getName());
Assertions.assertEquals(0, (int) (context.readSheetHolder().getSheetNo()));
Assertions.assertEquals(
"姓名",
context.readSheetHolder()
.getExcelReadHeadProperty()
.getHeadMap()
.get(0)
.getHeadNameList()
.get(0),
"姓名");
.get(0));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/fill/FillDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private void horizontalFill(File file, File template) {
}

List<Object> list = FastExcel.read(file).sheet().headRowNumber(0).doReadSync();
Assertions.assertEquals(list.size(), 5L);
Assertions.assertEquals(5L, list.size());
Map<String, String> map0 = (Map<String, String>) list.get(0);
Assertions.assertEquals("Zhang San", map0.get(2));
}
Expand All @@ -230,7 +230,7 @@ private void complexFill(File file, File template) {
excelWriter.fill(map, writeSheet);
}
List<Object> list = FastExcel.read(file).sheet().headRowNumber(3).doReadSync();
Assertions.assertEquals(list.size(), 21L);
Assertions.assertEquals(21L, list.size());
Map<String, String> map19 = (Map<String, String>) list.get(19);
Assertions.assertEquals("Zhang San", map19.get(0));
}
Expand Down
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/fill/annotation/FillAnnotationDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private void readAndWrite(File file, File fileTemplate) throws Exception {
XSSFSheet xssfSheet = (XSSFSheet) sheet;
List<XSSFShape> shapeList = xssfSheet.getDrawingPatriarch().getShapes();
XSSFShape shape0 = shapeList.get(0);
Assertions.assertTrue(shape0 instanceof XSSFPicture);
Assertions.assertInstanceOf(XSSFPicture.class, shape0);
XSSFPicture picture0 = (XSSFPicture) shape0;
CTMarker ctMarker0 = picture0.getPreferredSize().getFrom();
Assertions.assertEquals(1, ctMarker0.getRow());
Expand All @@ -119,7 +119,7 @@ private void readAndWrite(File file, File fileTemplate) throws Exception {
HSSFSheet hssfSheet = (HSSFSheet) sheet;
List<HSSFShape> shapeList = hssfSheet.getDrawingPatriarch().getChildren();
HSSFShape shape0 = shapeList.get(0);
Assertions.assertTrue(shape0 instanceof HSSFPicture);
Assertions.assertInstanceOf(HSSFPicture.class, shape0);
HSSFPicture picture0 = (HSSFPicture) shape0;
HSSFClientAnchor anchor = (HSSFClientAnchor) picture0.getAnchor();
Assertions.assertEquals(1, anchor.getRow1());
Expand Down
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/head/ComplexDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public void invoke(ComplexHeadData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
ComplexHeadData data = list.get(0);
Assertions.assertEquals(data.getString4(), "字符串4");
Assertions.assertEquals("字符串4", data.getString4());
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
2 changes: 1 addition & 1 deletion fesod/src/test/java/org/apache/fesod/sheet/head/ListHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void invoke(Map<Integer, String> data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
Map<Integer, String> data = list.get(0);
Assertions.assertEquals("字符串0", data.get(0));
Assertions.assertEquals("1", data.get(1));
Expand Down
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/head/NoHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public void invoke(NoHeadData data, AnalysisContext context) {

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
Assertions.assertEquals(1, list.size());
NoHeadData data = list.get(0);
Assertions.assertEquals(data.getString(), "字符串0");
Assertions.assertEquals("字符串0", data.getString());
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
4 changes: 2 additions & 2 deletions fesod/src/test/java/org/apache/fesod/sheet/large/LargeDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ public void invoke(LargeData data, AnalysisContext context) {
public void doAfterAllAnalysed(AnalysisContext context) {
log.info("Large row count:{}", count);
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
Assertions.assertEquals(count, 464509);
Assertions.assertEquals(464509, count);
} else {
Assertions.assertEquals(count, 499999);
Assertions.assertEquals(499999, count);
}
}
}
2 changes: 1 addition & 1 deletion fesod/src/test/java/org/apache/fesod/sheet/multiplesheets/MultipleSheetsListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void invoke(MultipleSheetsData data, AnalysisContext context) {
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
log.debug("A form is read finished.");
Assertions.assertEquals(list.get(0).getTitle(), "表1数据");
Assertions.assertEquals("表1数据", list.get(0).getTitle());
log.debug("All row:{}", JSON.toJSONString(list));
}

Expand Down
Loading
Loading