Skip to content

Commit 9aa6bc1

Browse files
GOODBOY008GOODBOY008
authored
test(core): improve assertion usage for better clarity and order (#685)
1 parent 8a5720f commit 9aa6bc1

26 files changed

+115
-113
lines changed

‎fesod/src/test/java/org/apache/fesod/sheet/analysis/ExcelAnalyserOldBiffTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ void chooseExecutor_shouldNoop_onOldBiffBytes_stream() {
5959
Assertions.assertEquals(
6060
ExcelTypeEnum.XLS,
6161
analyser.analysisContext().readWorkbookHolder().getExcelType());
62-
Assertions.assertTrue(
63-
analyser.excelExecutor() instanceof ExcelAnalyserImpl.NoopExcelReadExecutor,
62+
Assertions.assertInstanceOf(
63+
ExcelAnalyserImpl.NoopExcelReadExecutor.class,
64+
analyser.excelExecutor(),
6465
"Executor should be NoopExcelReadExecutor for old BIFF");
6566
}
6667

@@ -84,8 +85,9 @@ void chooseExecutor_shouldNoop_onOldBiffBytes_file(@TempDir Path tmp) throws Exc
8485
Assertions.assertEquals(
8586
ExcelTypeEnum.XLS,
8687
analyser.analysisContext().readWorkbookHolder().getExcelType());
87-
Assertions.assertTrue(
88-
analyser.excelExecutor() instanceof ExcelAnalyserImpl.NoopExcelReadExecutor,
88+
Assertions.assertInstanceOf(
89+
ExcelAnalyserImpl.NoopExcelReadExecutor.class,
90+
analyser.excelExecutor(),
8991
"Executor should be NoopExcelReadExecutor for old BIFF");
9092
}
9193
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ public void invoke(AnnotationData data, AnalysisContext context) {
4444

4545
@Override
4646
public void doAfterAllAnalysed(AnalysisContext context) {
47-
Assertions.assertEquals(list.size(), 1);
47+
Assertions.assertEquals(1, list.size());
4848
AnnotationData data = list.get(0);
4949
try {
5050
Assertions.assertEquals(data.getDate(), DateUtils.parseDate("2020-01-01 01:01:01"));
5151
} catch (ParseException e) {
5252
throw new ExcelCommonException("Test Exception", e);
5353
}
54-
Assertions.assertEquals(data.getNumber(), 99.99, 0.00);
54+
Assertions.assertEquals(99.99, data.getNumber(), 0.00);
5555
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
5656
}
5757
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void invoke(AnnotationIndexAndNameData data, AnalysisContext context) {
4242

4343
@Override
4444
public void doAfterAllAnalysed(AnalysisContext context) {
45-
Assertions.assertEquals(list.size(), 1);
45+
Assertions.assertEquals(1, list.size());
4646
AnnotationIndexAndNameData data = list.get(0);
47-
Assertions.assertEquals(data.getIndex0(), "第0个");
48-
Assertions.assertEquals(data.getIndex1(), "第1个");
49-
Assertions.assertEquals(data.getIndex2(), "第2个");
50-
Assertions.assertEquals(data.getIndex4(), "第4个");
47+
Assertions.assertEquals("第0个", data.getIndex0());
48+
Assertions.assertEquals("第1个", data.getIndex1());
49+
Assertions.assertEquals("第2个", data.getIndex2());
50+
Assertions.assertEquals("第4个", data.getIndex4());
5151
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
5252
}
5353
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void invoke(BomData data, AnalysisContext context) {
9696

9797
@Override
9898
public void doAfterAllAnalysed(AnalysisContext context) {
99-
Assertions.assertEquals(dataList.size(), 10);
99+
Assertions.assertEquals(10, dataList.size());
100100
BomData bomData = dataList.get(0);
101101
Assertions.assertEquals("姓名0", bomData.getName());
102102
Assertions.assertEquals(20, (long) bomData.getAge());
@@ -125,7 +125,7 @@ public void invoke(BomData data, AnalysisContext context) {
125125

126126
@Override
127127
public void doAfterAllAnalysed(AnalysisContext context) {
128-
Assertions.assertEquals(dataList.size(), 10);
128+
Assertions.assertEquals(10, dataList.size());
129129
BomData bomData = dataList.get(0);
130130
Assertions.assertEquals("姓名0", bomData.getName());
131131
Assertions.assertEquals(20L, (long) bomData.getAge());

‎fesod/src/test/java/org/apache/fesod/sheet/celldata/CellDataDataListener.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ public void invoke(CellDataReadData data, AnalysisContext context) {
4343

4444
@Override
4545
public void doAfterAllAnalysed(AnalysisContext context) {
46-
Assertions.assertEquals(list.size(), 1);
46+
Assertions.assertEquals(1, list.size());
4747
CellDataReadData cellDataData = list.get(0);
4848

4949
Assertions.assertEquals("2020年01月01日", cellDataData.getDate().getData());
50-
Assertions.assertEquals((long) cellDataData.getInteger1().getData(), 2L);
51-
Assertions.assertEquals((long) cellDataData.getInteger2(), 2L);
50+
Assertions.assertEquals(2L, (long) cellDataData.getInteger1().getData());
51+
Assertions.assertEquals(2L, (long) cellDataData.getInteger2());
5252
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
5353
Assertions.assertEquals(
54-
cellDataData.getFormulaValue().getFormulaData().getFormulaValue(), "B2+C2");
54+
"B2+C2", cellDataData.getFormulaValue().getFormulaData().getFormulaValue());
5555
} else {
5656
Assertions.assertNull(cellDataData.getFormulaValue().getData());
5757
}

‎fesod/src/test/java/org/apache/fesod/sheet/charset/CharsetDataTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void invoke(CharsetData data, AnalysisContext context) {
108108

109109
@Override
110110
public void doAfterAllAnalysed(AnalysisContext context) {
111-
Assertions.assertEquals(dataList.size(), 10);
111+
Assertions.assertEquals(10, dataList.size());
112112
CharsetData charsetData = dataList.get(0);
113113
Assertions.assertEquals("姓名0", charsetData.getName());
114114
Assertions.assertEquals(0, (long) charsetData.getAge());

‎fesod/src/test/java/org/apache/fesod/sheet/converter/ConverterDataListener.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,22 @@ public void invoke(ConverterReadData data, AnalysisContext context) {
4444

4545
@Override
4646
public void doAfterAllAnalysed(AnalysisContext context) {
47-
Assertions.assertEquals(list.size(), 1);
47+
Assertions.assertEquals(1, list.size());
4848
ConverterReadData data = list.get(0);
4949
Assertions.assertEquals(TestUtil.TEST_DATE, data.getDate());
5050
Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE, data.getLocalDate());
5151
Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE_TIME, data.getLocalDateTime());
52-
Assertions.assertEquals(data.getBooleanData(), Boolean.TRUE);
52+
Assertions.assertEquals(Boolean.TRUE, data.getBooleanData());
5353
Assertions.assertEquals(data.getBigDecimal().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
5454
Assertions.assertEquals(data.getBigInteger().intValue(), BigInteger.ONE.intValue(), 0.0);
55-
Assertions.assertEquals((long) data.getLongData(), 1L);
56-
Assertions.assertEquals((long) data.getIntegerData(), 1L);
57-
Assertions.assertEquals((long) data.getShortData(), 1L);
58-
Assertions.assertEquals((long) data.getByteData(), 1L);
59-
Assertions.assertEquals(data.getDoubleData(), 1.0, 0.0);
60-
Assertions.assertEquals(data.getFloatData(), (float) 1.0, 0.0);
61-
Assertions.assertEquals(data.getString(), "测试");
62-
Assertions.assertEquals(data.getCellData().getStringValue(), "自定义");
55+
Assertions.assertEquals(1L, (long) data.getLongData());
56+
Assertions.assertEquals(1L, (long) data.getIntegerData());
57+
Assertions.assertEquals(1L, (long) data.getShortData());
58+
Assertions.assertEquals(1L, (long) data.getByteData());
59+
Assertions.assertEquals(1.0, data.getDoubleData(), 0.0);
60+
Assertions.assertEquals((float) 1.0, data.getFloatData(), 0.0);
61+
Assertions.assertEquals("测试", data.getString());
62+
Assertions.assertEquals("自定义", data.getCellData().getStringValue());
6363
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
6464
}
6565
}

‎fesod/src/test/java/org/apache/fesod/sheet/converter/ReadAllConverterDataListener.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void invoke(ReadAllConverterData data, AnalysisContext context) {
4747

4848
@Override
4949
public void doAfterAllAnalysed(AnalysisContext context) {
50-
Assertions.assertEquals(list.size(), 1);
50+
Assertions.assertEquals(1, list.size());
5151
ReadAllConverterData data = list.get(0);
5252
Assertions.assertEquals(data.getBigDecimalBoolean().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
5353
Assertions.assertEquals(data.getBigDecimalNumber().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
@@ -58,9 +58,9 @@ public void doAfterAllAnalysed(AnalysisContext context) {
5858
Assertions.assertTrue(data.getBooleanBoolean());
5959
Assertions.assertTrue(data.getBooleanNumber());
6060
Assertions.assertTrue(data.getBooleanString());
61-
Assertions.assertEquals((long) data.getByteBoolean(), 1L);
62-
Assertions.assertEquals((long) data.getByteNumber(), 1L);
63-
Assertions.assertEquals((long) data.getByteString(), 1L);
61+
Assertions.assertEquals(1L, (long) data.getByteBoolean());
62+
Assertions.assertEquals(1L, (long) data.getByteNumber());
63+
Assertions.assertEquals(1L, (long) data.getByteString());
6464
try {
6565
Assertions.assertEquals(data.getDateNumber(), DateUtils.parseDate("2020-01-01 01:01:01"));
6666
Assertions.assertEquals(data.getDateString(), DateUtils.parseDate("2020-01-01 01:01:01"));
@@ -71,32 +71,32 @@ public void doAfterAllAnalysed(AnalysisContext context) {
7171
data.getLocalDateTimeNumber(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
7272
Assertions.assertEquals(
7373
data.getLocalDateTimeString(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
74-
Assertions.assertEquals(data.getDoubleBoolean(), 1.0, 0.0);
75-
Assertions.assertEquals(data.getDoubleNumber(), 1.0, 0.0);
76-
Assertions.assertEquals(data.getDoubleString(), 1.0, 0.0);
77-
Assertions.assertEquals(data.getFloatBoolean(), (float) 1.0, 0.0);
78-
Assertions.assertEquals(data.getFloatNumber(), (float) 1.0, 0.0);
79-
Assertions.assertEquals(data.getFloatString(), (float) 1.0, 0.0);
80-
Assertions.assertEquals((long) data.getIntegerBoolean(), 1L);
81-
Assertions.assertEquals((long) data.getIntegerNumber(), 1L);
82-
Assertions.assertEquals((long) data.getIntegerString(), 1L);
83-
Assertions.assertEquals((long) data.getLongBoolean(), 1L);
84-
Assertions.assertEquals((long) data.getLongNumber(), 1L);
85-
Assertions.assertEquals((long) data.getLongString(), 1L);
86-
Assertions.assertEquals((long) data.getShortBoolean(), 1L);
87-
Assertions.assertEquals((long) data.getShortNumber(), 1L);
88-
Assertions.assertEquals((long) data.getShortString(), 1L);
89-
Assertions.assertEquals(data.getStringBoolean().toLowerCase(), "true");
90-
Assertions.assertEquals(data.getStringString(), "测试");
91-
Assertions.assertEquals(data.getStringError(), "#VALUE!");
74+
Assertions.assertEquals(1.0, data.getDoubleBoolean(), 0.0);
75+
Assertions.assertEquals(1.0, data.getDoubleNumber(), 0.0);
76+
Assertions.assertEquals(1.0, data.getDoubleString(), 0.0);
77+
Assertions.assertEquals((float) 1.0, data.getFloatBoolean(), 0.0);
78+
Assertions.assertEquals((float) 1.0, data.getFloatNumber(), 0.0);
79+
Assertions.assertEquals((float) 1.0, data.getFloatString(), 0.0);
80+
Assertions.assertEquals(1L, (long) data.getIntegerBoolean());
81+
Assertions.assertEquals(1L, (long) data.getIntegerNumber());
82+
Assertions.assertEquals(1L, (long) data.getIntegerString());
83+
Assertions.assertEquals(1L, (long) data.getLongBoolean());
84+
Assertions.assertEquals(1L, (long) data.getLongNumber());
85+
Assertions.assertEquals(1L, (long) data.getLongString());
86+
Assertions.assertEquals(1L, (long) data.getShortBoolean());
87+
Assertions.assertEquals(1L, (long) data.getShortNumber());
88+
Assertions.assertEquals(1L, (long) data.getShortString());
89+
Assertions.assertEquals("true", data.getStringBoolean().toLowerCase());
90+
Assertions.assertEquals("测试", data.getStringString());
91+
Assertions.assertEquals("#VALUE!", data.getStringError());
9292
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
9393
Assertions.assertEquals("2020-1-1 1:01", data.getStringNumberDate());
9494
} else {
9595
Assertions.assertEquals("2020-01-01 01:01:01", data.getStringNumberDate());
9696
}
9797
double doubleStringFormulaNumber = new BigDecimal(data.getStringFormulaNumber()).doubleValue();
98-
Assertions.assertEquals(doubleStringFormulaNumber, 2.0, 0.0);
99-
Assertions.assertEquals(data.getStringFormulaString(), "1测试");
98+
Assertions.assertEquals(2.0, doubleStringFormulaNumber, 0.0);
99+
Assertions.assertEquals("1测试", data.getStringFormulaString());
100100
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
101101
}
102102
}

‎fesod/src/test/java/org/apache/fesod/sheet/encrypt/EncryptDataListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ public void invoke(EncryptData data, AnalysisContext context) {
4242

4343
@Override
4444
public void doAfterAllAnalysed(AnalysisContext context) {
45-
Assertions.assertEquals(list.size(), 10);
46-
Assertions.assertEquals(list.get(0).getName(), "Name0");
47-
Assertions.assertEquals((int) (context.readSheetHolder().getSheetNo()), 0);
45+
Assertions.assertEquals(10, list.size());
46+
Assertions.assertEquals("Name0", list.get(0).getName());
47+
Assertions.assertEquals(0, (int) (context.readSheetHolder().getSheetNo()));
4848
Assertions.assertEquals(
49+
"姓名",
4950
context.readSheetHolder()
5051
.getExcelReadHeadProperty()
5152
.getHeadMap()
5253
.get(0)
5354
.getHeadNameList()
54-
.get(0),
55-
"姓名");
55+
.get(0));
5656
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
5757
}
5858
}

‎fesod/src/test/java/org/apache/fesod/sheet/exception/ExceptionDataListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ public void invoke(ExceptionData data, AnalysisContext context) {
5454

5555
@Override
5656
public void doAfterAllAnalysed(AnalysisContext context) {
57-
Assertions.assertEquals(list.size(), 8);
58-
Assertions.assertEquals(list.get(0).getName(), "姓名0");
59-
Assertions.assertEquals((int) (context.readSheetHolder().getSheetNo()), 0);
57+
Assertions.assertEquals(8, list.size());
58+
Assertions.assertEquals("姓名0", list.get(0).getName());
59+
Assertions.assertEquals(0, (int) (context.readSheetHolder().getSheetNo()));
6060
Assertions.assertEquals(
61+
"姓名",
6162
context.readSheetHolder()
6263
.getExcelReadHeadProperty()
6364
.getHeadMap()
6465
.get(0)
6566
.getHeadNameList()
66-
.get(0),
67-
"姓名");
67+
.get(0));
6868
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
6969
}
7070
}

0 commit comments

Comments
 (0)