You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fesod.apache.org by ps...@apache.org on 2026/06/30 13:56:26 UTC
(fesod) branch main updated: chore(test): remove wildcard imports (#938)
This is an automated email from the ASF dual-hosted git repository.
psxjoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fesod.git
The following commit(s) were added to refs/heads/main by this push:
new 38f16e37 chore(test): remove wildcard imports (#938)
38f16e37 is described below
commit 38f16e37966adfac65a8d4425d7f08e845918a40
Author: Bengbengbalabalabeng <70...@users.noreply.github.com>
AuthorDate: Tue Jun 30 21:56:21 2026 +0800
chore(test): remove wildcard imports (#938)
---
.../org/apache/fesod/sheet/FesodSheetTest.java | 85 ++++++++-------
.../fesod/sheet/converter/CellDataDataTest.java | 16 +--
.../fesod/sheet/converter/ConverterDataTest.java | 117 +++++++++++----------
.../sheet/converter/ExcludeOrIncludeDataTest.java | 54 +++++-----
.../fesod/sheet/converter/ExtraDataTest.java | 41 ++++----
.../apache/fesod/sheet/converter/SortDataTest.java | 58 +++++-----
.../sheet/core/ClassUtilsFieldOverrideTest.java | 27 +++--
.../apache/fesod/sheet/core/NoModelDataTest.java | 42 ++++----
.../fesod/sheet/core/RepetitionDataTest.java | 14 +--
.../apache/fesod/sheet/core/SimpleDataTest.java | 16 ++-
.../org/apache/fesod/sheet/core/SkipDataTest.java | 15 ++-
.../apache/fesod/sheet/core/UnCamelDataTest.java | 30 +++---
.../org/apache/fesod/sheet/format/BomDataTest.java | 14 +--
.../apache/fesod/sheet/format/CharsetDataTest.java | 8 +-
.../fesod/sheet/format/CompatibilityTest.java | 42 ++++----
.../sheet/format/CsvBenignErrorToleranceTest.java | 9 +-
.../apache/fesod/sheet/format/DateFormatTest.java | 25 +++--
.../fesod/sheet/head/ComplexHeadDataTest.java | 10 +-
.../sheet/head/ImmutableListHeadDataTest.java | 12 +--
.../apache/fesod/sheet/head/ListHeadDataTest.java | 12 +--
.../apache/fesod/sheet/head/NoHeadDataTest.java | 6 +-
.../sheet/readwrite/AutoStripParameterTest.java | 24 +++--
.../fesod/sheet/readwrite/CacheDataTest.java | 18 ++--
.../fesod/sheet/readwrite/DateWindowingTest.java | 4 +-
.../fesod/sheet/readwrite/EncryptDataTest.java | 7 +-
.../fesod/sheet/readwrite/ExceptionDataTest.java | 25 ++---
.../fesod/sheet/readwrite/ParameterDataTest.java | 6 +-
.../XlsxSaxAnalyserReadOpcPackageTest.java | 33 +++---
.../apache/fesod/sheet/sheet/HiddenSheetsTest.java | 17 +--
.../fesod/sheet/sheet/MultipleSheetsDataTest.java | 4 +-
.../apache/fesod/sheet/sheet/WriteSheetTest.java | 20 ++--
.../fesod/sheet/style/AnnotationDataTest.java | 4 +-
.../style/AnnotationIndexAndNameDataTest.java | 12 +--
.../fesod/sheet/style/ExcelPropertyFormatTest.java | 26 ++---
.../org/apache/fesod/sheet/style/FillDataTest.java | 32 +++---
.../apache/fesod/sheet/style/StyleDataTest.java | 8 +-
.../fesod/sheet/template/TemplateDataTest.java | 12 +--
.../testkit/assertions/ExcelAssertionsTest.java | 20 ++--
.../testkit/builders/TestDataBuilderTest.java | 87 +++++++--------
.../fesod/sheet/testkit/enums/ExcelFormatTest.java | 53 +++++-----
.../sheet/testkit/helpers/RoundTripHelperTest.java | 39 ++++---
.../listeners/CollectingReadListenerTest.java | 41 ++++----
.../impl/DimensionWorkbookWriteHandlerTest.java | 15 ++-
43 files changed, 580 insertions(+), 580 deletions(-)
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
index 04b3f1c0..44a8bee9 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/FesodSheetTest.java
@@ -19,10 +19,6 @@
package org.apache.fesod.sheet;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
@@ -37,6 +33,7 @@ import org.apache.fesod.sheet.write.builder.ExcelWriterBuilder;
import org.apache.fesod.sheet.write.builder.ExcelWriterSheetBuilder;
import org.apache.fesod.sheet.write.builder.ExcelWriterTableBuilder;
import org.apache.fesod.sheet.write.metadata.WriteWorkbook;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Tag;
@@ -97,90 +94,90 @@ class FesodSheetTest {
@Test
void testWrite_noArgs_shouldReturnBuilder() {
ExcelWriterBuilder builder = FesodSheet.write();
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWrite_withFile_shouldConfigureFile() {
ExcelWriterBuilder builder = FesodSheet.write(tempFile);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
- assertEquals(tempFile, writeWorkbook(builder).getFile());
+ Assertions.assertEquals(tempFile, writeWorkbook(builder).getFile());
}
@Test
void testWrite_withFileAndHead_shouldConfigureAll() {
ExcelWriterBuilder builder = FesodSheet.write(tempFile, DemoData.class);
- assertNotNull(builder);
- assertEquals(tempFile, writeWorkbook(builder).getFile());
- assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
+ Assertions.assertNotNull(builder);
+ Assertions.assertEquals(tempFile, writeWorkbook(builder).getFile());
+ Assertions.assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
}
@Test
void testWrite_withPathName_shouldConfigureFile() {
ExcelWriterBuilder builder = FesodSheet.write(tempFilePath);
- assertNotNull(builder);
- assertEquals(tempFilePath, writeWorkbook(builder).getFile().getAbsolutePath());
+ Assertions.assertNotNull(builder);
+ Assertions.assertEquals(tempFilePath, writeWorkbook(builder).getFile().getAbsolutePath());
}
@Test
void testWrite_withPathNameAndHead_shouldConfigureAll() {
ExcelWriterBuilder builder = FesodSheet.write(tempFilePath, DemoData.class);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
WriteWorkbook workbook = writeWorkbook(builder);
- assertEquals(tempFilePath, workbook.getFile().getAbsolutePath());
- assertEquals(DemoData.class, workbook.getClazz());
+ Assertions.assertEquals(tempFilePath, workbook.getFile().getAbsolutePath());
+ Assertions.assertEquals(DemoData.class, workbook.getClazz());
}
@Test
void testWrite_withOutputStream_shouldConfigureStream() {
ExcelWriterBuilder builder = FesodSheet.write(mockOutputStream);
- assertNotNull(builder);
- assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
+ Assertions.assertNotNull(builder);
+ Assertions.assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
}
@Test
void testWrite_withOutputStreamAndHead_shouldConfigureAll() {
ExcelWriterBuilder builder = FesodSheet.write(mockOutputStream, DemoData.class);
- assertNotNull(builder);
- assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
- assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
+ Assertions.assertNotNull(builder);
+ Assertions.assertSame(mockOutputStream, writeWorkbook(builder).getOutputStream());
+ Assertions.assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
}
@Test
void testWriterSheet_noArgs_shouldReturnBuilder() {
ExcelWriterSheetBuilder builder = FesodSheet.writerSheet();
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetNo_shouldReturnBuilder() {
ExcelWriterSheetBuilder builder = FesodSheet.writerSheet(1);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetName_shouldReturnBuilder() {
ExcelWriterSheetBuilder builder = FesodSheet.writerSheet("TestSheet");
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWriterSheet_withSheetNoAndName_shouldReturnBuilder() {
ExcelWriterSheetBuilder builder = FesodSheet.writerSheet(1, "TestSheet");
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWriterTable_noArgs_shouldReturnBuilder() {
ExcelWriterTableBuilder builder = FesodSheet.writerTable();
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testWriterTable_withTableNo_shouldReturnBuilder() {
ExcelWriterTableBuilder builder = FesodSheet.writerTable(1);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
// --- Read Methods Tests ---
@@ -188,41 +185,41 @@ class FesodSheetTest {
@Test
void testRead_noArgs_shouldReturnBuilder() {
ExcelReaderBuilder builder = FesodSheet.read();
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testRead_withFile_shouldConfigureFile() {
ExcelReaderBuilder builder = FesodSheet.read(tempFile);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
ReadWorkbook workbook = writeWorkbook(builder);
- assertEquals(tempFile, workbook.getFile());
+ Assertions.assertEquals(tempFile, workbook.getFile());
}
@Test
void testRead_withFileAndListener_shouldConfigureAll() {
ExcelReaderBuilder builder = FesodSheet.read(tempFile, mockReadListener);
- assertNotNull(builder);
- assertEquals(tempFile, writeWorkbook(builder).getFile());
- assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
+ Assertions.assertNotNull(builder);
+ Assertions.assertEquals(tempFile, writeWorkbook(builder).getFile());
+ Assertions.assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
}
@Test
void testRead_withFileHeadAndListener_shouldConfigureAll() {
ExcelReaderBuilder builder = FesodSheet.read(tempFile, DemoData.class, mockReadListener);
- assertNotNull(builder);
- assertEquals(tempFile, writeWorkbook(builder).getFile());
- assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
- assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
+ Assertions.assertNotNull(builder);
+ Assertions.assertEquals(tempFile, writeWorkbook(builder).getFile());
+ Assertions.assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
+ Assertions.assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
}
@Test
void testRead_withInputStreamHeadAndListener_shouldConfigureAll() {
ExcelReaderBuilder builder = FesodSheet.read(mockInputStream, DemoData.class, mockReadListener);
- assertNotNull(builder);
- assertSame(mockInputStream, writeWorkbook(builder).getInputStream());
- assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
- assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
+ Assertions.assertNotNull(builder);
+ Assertions.assertSame(mockInputStream, writeWorkbook(builder).getInputStream());
+ Assertions.assertEquals(DemoData.class, writeWorkbook(builder).getClazz());
+ Assertions.assertTrue(writeWorkbook(builder).getCustomReadListenerList().contains(mockReadListener));
}
// --- ReadSheet Methods Tests ---
@@ -230,24 +227,24 @@ class FesodSheetTest {
@Test
void testReadSheet_noArgs_shouldReturnBuilder() {
ExcelReaderSheetBuilder builder = FesodSheet.readSheet();
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testReadSheet_withSheetNo_shouldReturnBuilder() {
ExcelReaderSheetBuilder builder = FesodSheet.readSheet(0);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testReadSheet_withSheetName_shouldReturnBuilder() {
ExcelReaderSheetBuilder builder = FesodSheet.readSheet("DataSheet");
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
@Test
void testReadSheet_withAllParams_shouldReturnBuilder() {
ExcelReaderSheetBuilder builder = FesodSheet.readSheet(0, "DataSheet", 100);
- assertNotNull(builder);
+ Assertions.assertNotNull(builder);
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/CellDataDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/CellDataDataTest.java
index f19846eb..5f778dc4 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/CellDataDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/CellDataDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.converter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
import org.apache.fesod.sheet.FesodSheet;
import org.apache.fesod.sheet.support.ExcelTypeEnum;
@@ -36,6 +34,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -54,16 +53,17 @@ public class CellDataDataTest extends AbstractExcelTest {
CollectingReadListener<CellDataReadData> listener = new CollectingReadListener<>();
FesodSheet.read(file, CellDataReadData.class, listener).sheet().doRead();
- assertEquals(1, listener.getRowCount());
+ Assertions.assertEquals(1, listener.getRowCount());
CellDataReadData row = listener.getFirstRow();
- assertEquals("2020年01月01日", row.getDate().getData());
- assertEquals(2L, (long) row.getInteger1().getData());
- assertEquals(2L, (long) row.getInteger2());
+ Assertions.assertEquals("2020年01月01日", row.getDate().getData());
+ Assertions.assertEquals(2L, (long) row.getInteger1().getData());
+ Assertions.assertEquals(2L, (long) row.getInteger2());
if (format.toExcelTypeEnum() != ExcelTypeEnum.CSV) {
- assertEquals("B2+C2", row.getFormulaValue().getFormulaData().getFormulaValue());
+ Assertions.assertEquals(
+ "B2+C2", row.getFormulaValue().getFormulaData().getFormulaValue());
} else {
- assertNull(row.getFormulaValue().getData());
+ Assertions.assertNull(row.getFormulaValue().getData());
}
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ConverterDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ConverterDataTest.java
index dd8c1363..1222641a 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ConverterDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ConverterDataTest.java
@@ -25,9 +25,6 @@
package org.apache.fesod.sheet.converter;
-import static org.apache.fesod.sheet.testkit.params.FormatCapability.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -41,9 +38,11 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.helpers.RoundTripHelper;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.apache.fesod.sheet.testkit.params.FormatCapability;
import org.apache.fesod.sheet.util.DateUtils;
import org.apache.fesod.sheet.util.FileUtils;
import org.apache.fesod.sheet.util.TestUtil;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -62,22 +61,22 @@ public class ConverterDataTest extends AbstractExcelTest {
RoundTripHelper.write(file, ConverterWriteData.class, data);
List<ConverterReadData> result = RoundTripHelper.read(file, ConverterReadData.class);
- assertEquals(1, result.size());
+ Assertions.assertEquals(1, result.size());
ConverterReadData row = result.get(0);
- assertEquals(TestUtil.TEST_DATE, row.getDate());
- assertEquals(TestUtil.TEST_LOCAL_DATE, row.getLocalDate());
- assertEquals(TestUtil.TEST_LOCAL_DATE_TIME, row.getLocalDateTime());
- assertEquals(Boolean.TRUE, row.getBooleanData());
- assertEquals(row.getBigDecimal().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
- assertEquals(row.getBigInteger().intValue(), BigInteger.ONE.intValue(), 0.0);
- assertEquals(1L, (long) row.getLongData());
- assertEquals(1L, (long) row.getIntegerData());
- assertEquals(1L, (long) row.getShortData());
- assertEquals(1L, (long) row.getByteData());
- assertEquals(1.0, row.getDoubleData(), 0.0);
- assertEquals((float) 1.0, row.getFloatData(), 0.0);
- assertEquals("test", row.getString());
- assertEquals("custom", row.getCellData().getStringValue());
+ Assertions.assertEquals(TestUtil.TEST_DATE, row.getDate());
+ Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE, row.getLocalDate());
+ Assertions.assertEquals(TestUtil.TEST_LOCAL_DATE_TIME, row.getLocalDateTime());
+ Assertions.assertEquals(Boolean.TRUE, row.getBooleanData());
+ Assertions.assertEquals(row.getBigDecimal().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+ Assertions.assertEquals(row.getBigInteger().intValue(), BigInteger.ONE.intValue(), 0.0);
+ Assertions.assertEquals(1L, (long) row.getLongData());
+ Assertions.assertEquals(1L, (long) row.getIntegerData());
+ Assertions.assertEquals(1L, (long) row.getShortData());
+ Assertions.assertEquals(1L, (long) row.getByteData());
+ Assertions.assertEquals(1.0, row.getDoubleData(), 0.0);
+ Assertions.assertEquals((float) 1.0, row.getFloatData(), 0.0);
+ Assertions.assertEquals("test", row.getString());
+ Assertions.assertEquals("custom", row.getCellData().getStringValue());
}
@ParameterizedTest
@@ -90,54 +89,56 @@ public class ConverterDataTest extends AbstractExcelTest {
.head(ReadAllConverterData.class)
.sheet()
.doReadSync();
- assertEquals(1, list.size());
+ Assertions.assertEquals(1, list.size());
ReadAllConverterData data = list.get(0);
- assertEquals(data.getBigDecimalBoolean().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
- assertEquals(data.getBigDecimalNumber().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
- assertEquals(data.getBigDecimalString().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
- assertEquals(data.getBigIntegerBoolean().intValue(), BigInteger.ONE.intValue(), 0.0);
- assertEquals(data.getBigIntegerNumber().intValue(), BigInteger.ONE.intValue(), 0.0);
- assertEquals(data.getBigIntegerString().intValue(), BigInteger.ONE.intValue(), 0.0);
- assertTrue(data.getBooleanBoolean());
- assertTrue(data.getBooleanNumber());
- assertTrue(data.getBooleanString());
- assertEquals(1L, (long) data.getByteBoolean());
- assertEquals(1L, (long) data.getByteNumber());
- assertEquals(1L, (long) data.getByteString());
- assertEquals(data.getDateNumber(), DateUtils.parseDate("2020-01-01 01:01:01"));
- assertEquals(data.getDateString(), DateUtils.parseDate("2020-01-01 01:01:01"));
- assertEquals(data.getLocalDateTimeNumber(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
- assertEquals(data.getLocalDateTimeString(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
- assertEquals(1.0, data.getDoubleBoolean(), 0.0);
- assertEquals(1.0, data.getDoubleNumber(), 0.0);
- assertEquals(1.0, data.getDoubleString(), 0.0);
- assertEquals((float) 1.0, data.getFloatBoolean(), 0.0);
- assertEquals((float) 1.0, data.getFloatNumber(), 0.0);
- assertEquals((float) 1.0, data.getFloatString(), 0.0);
- assertEquals(1L, (long) data.getIntegerBoolean());
- assertEquals(1L, (long) data.getIntegerNumber());
- assertEquals(1L, (long) data.getIntegerString());
- assertEquals(1L, (long) data.getLongBoolean());
- assertEquals(1L, (long) data.getLongNumber());
- assertEquals(1L, (long) data.getLongString());
- assertEquals(1L, (long) data.getShortBoolean());
- assertEquals(1L, (long) data.getShortNumber());
- assertEquals(1L, (long) data.getShortString());
- assertEquals("true", data.getStringBoolean().toLowerCase());
- assertEquals("测试", data.getStringString());
- assertEquals("#VALUE!", data.getStringError());
+ Assertions.assertEquals(data.getBigDecimalBoolean().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+ Assertions.assertEquals(data.getBigDecimalNumber().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+ Assertions.assertEquals(data.getBigDecimalString().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+ Assertions.assertEquals(data.getBigIntegerBoolean().intValue(), BigInteger.ONE.intValue(), 0.0);
+ Assertions.assertEquals(data.getBigIntegerNumber().intValue(), BigInteger.ONE.intValue(), 0.0);
+ Assertions.assertEquals(data.getBigIntegerString().intValue(), BigInteger.ONE.intValue(), 0.0);
+ Assertions.assertTrue(data.getBooleanBoolean());
+ Assertions.assertTrue(data.getBooleanNumber());
+ Assertions.assertTrue(data.getBooleanString());
+ Assertions.assertEquals(1L, (long) data.getByteBoolean());
+ Assertions.assertEquals(1L, (long) data.getByteNumber());
+ Assertions.assertEquals(1L, (long) data.getByteString());
+ Assertions.assertEquals(data.getDateNumber(), DateUtils.parseDate("2020-01-01 01:01:01"));
+ Assertions.assertEquals(data.getDateString(), DateUtils.parseDate("2020-01-01 01:01:01"));
+ Assertions.assertEquals(
+ 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(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 (format != ExcelFormat.CSV) {
- assertEquals("2020-1-1 1:01", data.getStringNumberDate());
+ Assertions.assertEquals("2020-1-1 1:01", data.getStringNumberDate());
} else {
- assertEquals("2020-01-01 01:01:01", data.getStringNumberDate());
+ Assertions.assertEquals("2020-01-01 01:01:01", data.getStringNumberDate());
}
double doubleStringFormulaNumber = new BigDecimal(data.getStringFormulaNumber()).doubleValue();
- assertEquals(2.0, doubleStringFormulaNumber, 0.0);
- assertEquals("1测试", data.getStringFormulaString());
+ Assertions.assertEquals(2.0, doubleStringFormulaNumber, 0.0);
+ Assertions.assertEquals("1测试", data.getStringFormulaString());
}
@ParameterizedTest
- @ExcelFormatSource(requires = IMAGES)
+ @ExcelFormatSource(requires = FormatCapability.IMAGES)
void writeImage(ExcelFormat format) throws Exception {
File file = createTempFile(format);
InputStream inputStream = null;
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExcludeOrIncludeDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExcludeOrIncludeDataTest.java
index 033f0f14..704d8b3b 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExcludeOrIncludeDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExcludeOrIncludeDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.converter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
@@ -38,6 +37,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,11 +59,11 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.sheet()
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(2, record.size());
- assertEquals("column2", record.get(0));
- assertEquals("column3", record.get(1));
+ Assertions.assertEquals(2, record.size());
+ Assertions.assertEquals("column2", record.get(0));
+ Assertions.assertEquals("column3", record.get(1));
}
@ParameterizedTest
@@ -79,10 +79,10 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.sheet()
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(1, record.size());
- assertEquals("column2", record.get(0));
+ Assertions.assertEquals(1, record.size());
+ Assertions.assertEquals("column2", record.get(0));
}
@ParameterizedTest
@@ -97,11 +97,11 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.sheet()
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(2, record.size());
- assertEquals("column2", record.get(0));
- assertEquals("column3", record.get(1));
+ Assertions.assertEquals(2, record.size());
+ Assertions.assertEquals("column2", record.get(0));
+ Assertions.assertEquals("column3", record.get(1));
}
@ParameterizedTest
@@ -116,11 +116,11 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.includeColumnFieldNames(includeColumnFieldNames)
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(2, record.size());
- assertEquals("column2", record.get(0));
- assertEquals("column3", record.get(1));
+ Assertions.assertEquals(2, record.size());
+ Assertions.assertEquals("column2", record.get(0));
+ Assertions.assertEquals("column3", record.get(1));
}
@ParameterizedTest
@@ -138,13 +138,13 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.sheet()
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(4, record.size());
- assertEquals("column4", record.get(0));
- assertEquals("column2", record.get(1));
- assertEquals("column3", record.get(2));
- assertEquals("column1", record.get(3));
+ Assertions.assertEquals(4, record.size());
+ Assertions.assertEquals("column4", record.get(0));
+ Assertions.assertEquals("column2", record.get(1));
+ Assertions.assertEquals("column3", record.get(2));
+ Assertions.assertEquals("column1", record.get(3));
}
@ParameterizedTest
@@ -161,12 +161,12 @@ public class ExcludeOrIncludeDataTest extends AbstractExcelTest {
.sheet()
.doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals(3, record.size());
- assertEquals("column4", record.get(0));
- assertEquals("column2", record.get(1));
- assertEquals("column3", record.get(2));
+ Assertions.assertEquals(3, record.size());
+ Assertions.assertEquals("column4", record.get(0));
+ Assertions.assertEquals("column2", record.get(1));
+ Assertions.assertEquals("column3", record.get(2));
}
private List<ExcludeOrIncludeData> data() {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataTest.java
index 9eb979aa..1c13ad43 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/ExtraDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.converter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -39,6 +37,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -65,28 +64,28 @@ public class ExtraDataTest extends AbstractExcelTest {
for (CellExtra extra : extras) {
switch (extra.getType()) {
case COMMENT:
- assertEquals("批注的内容", extra.getText());
- assertEquals(4, (int) extra.getRowIndex());
- assertEquals(0, (int) extra.getColumnIndex());
+ Assertions.assertEquals("批注的内容", extra.getText());
+ Assertions.assertEquals(4, (int) extra.getRowIndex());
+ Assertions.assertEquals(0, (int) extra.getColumnIndex());
break;
case HYPERLINK:
if ("Sheet1!A1".equals(extra.getText())) {
- assertEquals(1, (int) extra.getRowIndex());
- assertEquals(0, (int) extra.getColumnIndex());
+ Assertions.assertEquals(1, (int) extra.getRowIndex());
+ Assertions.assertEquals(0, (int) extra.getColumnIndex());
} else if ("Sheet2!A1".equals(extra.getText())) {
- assertEquals(2, (int) extra.getFirstRowIndex());
- assertEquals(0, (int) extra.getFirstColumnIndex());
- assertEquals(3, (int) extra.getLastRowIndex());
- assertEquals(1, (int) extra.getLastColumnIndex());
+ Assertions.assertEquals(2, (int) extra.getFirstRowIndex());
+ Assertions.assertEquals(0, (int) extra.getFirstColumnIndex());
+ Assertions.assertEquals(3, (int) extra.getLastRowIndex());
+ Assertions.assertEquals(1, (int) extra.getLastColumnIndex());
} else {
- fail("Unknown hyperlink!");
+ Assertions.fail("Unknown hyperlink!");
}
break;
case MERGE:
- assertEquals(5, (int) extra.getFirstRowIndex());
- assertEquals(0, (int) extra.getFirstColumnIndex());
- assertEquals(6, (int) extra.getLastRowIndex());
- assertEquals(1, (int) extra.getLastColumnIndex());
+ Assertions.assertEquals(5, (int) extra.getFirstRowIndex());
+ Assertions.assertEquals(0, (int) extra.getFirstColumnIndex());
+ Assertions.assertEquals(6, (int) extra.getLastRowIndex());
+ Assertions.assertEquals(1, (int) extra.getLastColumnIndex());
break;
default:
}
@@ -108,13 +107,13 @@ public class ExtraDataTest extends AbstractExcelTest {
switch (extra.getType()) {
case HYPERLINK:
if ("222222222".equals(extra.getText())) {
- assertEquals(1, (int) extra.getRowIndex());
- assertEquals(0, (int) extra.getColumnIndex());
+ Assertions.assertEquals(1, (int) extra.getRowIndex());
+ Assertions.assertEquals(0, (int) extra.getColumnIndex());
} else if ("333333333333".equals(extra.getText())) {
- assertEquals(1, (int) extra.getRowIndex());
- assertEquals(1, (int) extra.getColumnIndex());
+ Assertions.assertEquals(1, (int) extra.getRowIndex());
+ Assertions.assertEquals(1, (int) extra.getColumnIndex());
} else {
- fail("Unknown hyperlink!");
+ Assertions.fail("Unknown hyperlink!");
}
break;
default:
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SortDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SortDataTest.java
index 79050b32..51e2fb17 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SortDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SortDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.converter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,6 +37,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -54,25 +54,25 @@ public class SortDataTest extends AbstractExcelTest {
FesodSheet.write(file, SortData.class).sheet().doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals("column1", record.get(0));
- assertEquals("column2", record.get(1));
- assertEquals("column3", record.get(2));
- assertEquals("column4", record.get(3));
- assertEquals("column5", record.get(4));
- assertEquals("column6", record.get(5));
+ Assertions.assertEquals("column1", record.get(0));
+ Assertions.assertEquals("column2", record.get(1));
+ Assertions.assertEquals("column3", record.get(2));
+ Assertions.assertEquals("column4", record.get(3));
+ Assertions.assertEquals("column5", record.get(4));
+ Assertions.assertEquals("column6", record.get(5));
CollectingReadListener<SortData> listener = new CollectingReadListener<>();
FesodSheet.read(file, SortData.class, listener).sheet().doRead();
- assertEquals(1, listener.getRowCount());
+ Assertions.assertEquals(1, listener.getRowCount());
SortData sortData = listener.getFirstRow();
- assertEquals("column1", sortData.getColumn1());
- assertEquals("column2", sortData.getColumn2());
- assertEquals("column3", sortData.getColumn3());
- assertEquals("column4", sortData.getColumn4());
- assertEquals("column5", sortData.getColumn5());
- assertEquals("column6", sortData.getColumn6());
+ Assertions.assertEquals("column1", sortData.getColumn1());
+ Assertions.assertEquals("column2", sortData.getColumn2());
+ Assertions.assertEquals("column3", sortData.getColumn3());
+ Assertions.assertEquals("column4", sortData.getColumn4());
+ Assertions.assertEquals("column5", sortData.getColumn5());
+ Assertions.assertEquals("column6", sortData.getColumn6());
}
@ParameterizedTest
@@ -82,25 +82,25 @@ public class SortDataTest extends AbstractExcelTest {
FesodSheet.write(file).head(head()).sheet().doWrite(data());
List<Map<Integer, String>> dataMap = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, dataMap.size());
+ Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0);
- assertEquals("column1", record.get(0));
- assertEquals("column2", record.get(1));
- assertEquals("column3", record.get(2));
- assertEquals("column4", record.get(3));
- assertEquals("column5", record.get(4));
- assertEquals("column6", record.get(5));
+ Assertions.assertEquals("column1", record.get(0));
+ Assertions.assertEquals("column2", record.get(1));
+ Assertions.assertEquals("column3", record.get(2));
+ Assertions.assertEquals("column4", record.get(3));
+ Assertions.assertEquals("column5", record.get(4));
+ Assertions.assertEquals("column6", record.get(5));
CollectingReadListener<SortData> listener = new CollectingReadListener<>();
FesodSheet.read(file, SortData.class, listener).sheet().doRead();
- assertEquals(1, listener.getRowCount());
+ Assertions.assertEquals(1, listener.getRowCount());
SortData sortData = listener.getFirstRow();
- assertEquals("column1", sortData.getColumn1());
- assertEquals("column2", sortData.getColumn2());
- assertEquals("column3", sortData.getColumn3());
- assertEquals("column4", sortData.getColumn4());
- assertEquals("column5", sortData.getColumn5());
- assertEquals("column6", sortData.getColumn6());
+ Assertions.assertEquals("column1", sortData.getColumn1());
+ Assertions.assertEquals("column2", sortData.getColumn2());
+ Assertions.assertEquals("column3", sortData.getColumn3());
+ Assertions.assertEquals("column4", sortData.getColumn4());
+ Assertions.assertEquals("column5", sortData.getColumn5());
+ Assertions.assertEquals("column6", sortData.getColumn6());
}
private List<List<String>> head() {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/ClassUtilsFieldOverrideTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/ClassUtilsFieldOverrideTest.java
index 54b05ebe..7b2e9012 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/ClassUtilsFieldOverrideTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/ClassUtilsFieldOverrideTest.java
@@ -19,8 +19,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +30,7 @@ import org.apache.fesod.sheet.annotation.ExcelIgnore;
import org.apache.fesod.sheet.annotation.ExcelProperty;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -143,7 +142,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data1.add(new Parent1());
FesodSheet.write(file1.toString(), Parent1.class).sheet().doWrite(data1);
List<String> header1 = readHeader.apply(file1);
- assertTrue(header1.contains("parent1Field"), "Parent1 should contain parent1Field");
+ Assertions.assertTrue(header1.contains("parent1Field"), "Parent1 should contain parent1Field");
// Child1: should NOT contain parent1Field
Path file2 = tempDir.resolve("child1.xlsx");
@@ -151,7 +150,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data2.add(new Child1());
FesodSheet.write(file2.toString(), Child1.class).sheet().doWrite(data2);
List<String> header2 = readHeader.apply(file2);
- assertFalse(header2.contains("parent1Field"), "Child1 should NOT contain parent1Field");
+ Assertions.assertFalse(header2.contains("parent1Field"), "Child1 should NOT contain parent1Field");
// Parent2: should NOT contain field
Path file3 = tempDir.resolve("parent2.xlsx");
@@ -159,7 +158,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data3.add(new Parent2());
FesodSheet.write(file3.toString(), Parent2.class).sheet().doWrite(data3);
List<String> header3 = readHeader.apply(file3);
- assertFalse(header3.contains("field"), "Parent2 should NOT contain field");
+ Assertions.assertFalse(header3.contains("field"), "Parent2 should NOT contain field");
// Child2: should NOT contain field
Path file4 = tempDir.resolve("child2.xlsx");
@@ -167,7 +166,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data4.add(new Child2());
FesodSheet.write(file4.toString(), Child2.class).sheet().doWrite(data4);
List<String> header4 = readHeader.apply(file4);
- assertFalse(header4.contains("field"), "Child2 should NOT contain field");
+ Assertions.assertFalse(header4.contains("field"), "Child2 should NOT contain field");
// Parent3: should contain parent3Field
Path file5 = tempDir.resolve("parent3.xlsx");
@@ -175,7 +174,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data5.add(new Parent3());
FesodSheet.write(file5.toString(), Parent3.class).sheet().doWrite(data5);
List<String> header5 = readHeader.apply(file5);
- assertTrue(header5.contains("parent3Field"), "Parent3 should contain parent3Field");
+ Assertions.assertTrue(header5.contains("parent3Field"), "Parent3 should contain parent3Field");
// Child3: should contain child3Field
Path file6 = tempDir.resolve("child3.xlsx");
@@ -183,7 +182,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data6.add(new Child3());
FesodSheet.write(file6.toString(), Child3.class).sheet().doWrite(data6);
List<String> header6 = readHeader.apply(file6);
- assertTrue(header6.contains("child3Field"), "Child3 should contain child3Field");
+ Assertions.assertTrue(header6.contains("child3Field"), "Child3 should contain child3Field");
// Parent4: should NOT contain field
Path file7 = tempDir.resolve("parent4.xlsx");
@@ -191,7 +190,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data7.add(new Parent4());
FesodSheet.write(file7.toString(), Parent4.class).sheet().doWrite(data7);
List<String> header7 = readHeader.apply(file7);
- assertFalse(header7.contains("field"), "Parent4 should NOT contain field");
+ Assertions.assertFalse(header7.contains("field"), "Parent4 should NOT contain field");
// Child4: should contain child4Field
Path file8 = tempDir.resolve("child4.xlsx");
@@ -199,7 +198,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data8.add(new Child4());
FesodSheet.write(file8.toString(), Child4.class).sheet().doWrite(data8);
List<String> header8 = readHeader.apply(file8);
- assertTrue(header8.contains("child4Field"), "Child4 should contain child4Field");
+ Assertions.assertTrue(header8.contains("child4Field"), "Child4 should contain child4Field");
// Parent5: should contain parent5Field
Path file9 = tempDir.resolve("parent5.xlsx");
@@ -207,7 +206,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data9.add(new Parent5());
FesodSheet.write(file9.toString(), Parent5.class).sheet().doWrite(data9);
List<String> header9 = readHeader.apply(file9);
- assertTrue(header9.contains("parent5Field"), "Parent5 should contain parent5Field");
+ Assertions.assertTrue(header9.contains("parent5Field"), "Parent5 should contain parent5Field");
// Child5: should contain field
Path file10 = tempDir.resolve("child5.xlsx");
@@ -215,7 +214,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data10.add(new Child5());
FesodSheet.write(file10.toString(), Child5.class).sheet().doWrite(data10);
List<String> header10 = readHeader.apply(file10);
- assertTrue(header10.contains("field"), "Child5 should contain field");
+ Assertions.assertTrue(header10.contains("field"), "Child5 should contain field");
// Parent6: should NOT contain field
Path file11 = tempDir.resolve("parent6.xlsx");
@@ -223,7 +222,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data11.add(new Parent6());
FesodSheet.write(file11.toString(), Parent6.class).sheet().doWrite(data11);
List<String> header11 = readHeader.apply(file11);
- assertFalse(header11.contains("field"), "Parent6 should NOT contain field");
+ Assertions.assertFalse(header11.contains("field"), "Parent6 should NOT contain field");
// Child6: should contain field
Path file12 = tempDir.resolve("child6.xlsx");
@@ -231,7 +230,7 @@ public class ClassUtilsFieldOverrideTest extends AbstractExcelTest {
data12.add(new Child6());
FesodSheet.write(file12.toString(), Child6.class).sheet().doWrite(data12);
List<String> header12 = readHeader.apply(file12);
- assertTrue(header12.contains("field"), "Child6 should contain field");
+ Assertions.assertTrue(header12.contains("field"), "Child6 should contain field");
}
private static Function<Path, List<String>> extractExcelHeader() {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/NoModelDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/NoModelDataTest.java
index 2fe60b6e..39441449 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/NoModelDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/NoModelDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -39,6 +38,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,26 +58,26 @@ public class NoModelDataTest extends AbstractExcelTest {
FesodSheet.write(file).sheet().doWrite(TestDataBuilder.noModelData(10));
List<Map<Integer, String>> result =
FesodSheet.read(file).headRowNumber(0).sheet().doReadSync();
- assertEquals(10, result.size());
+ Assertions.assertEquals(10, result.size());
Map<Integer, String> data10 = result.get(9);
- assertEquals("string19", data10.get(0));
- assertEquals("109", data10.get(1));
- assertEquals("2020-01-01 01:01:01", data10.get(2));
+ Assertions.assertEquals("string19", data10.get(0));
+ Assertions.assertEquals("109", data10.get(1));
+ Assertions.assertEquals("2020-01-01 01:01:01", data10.get(2));
List<Map<Integer, Object>> actualDataList = FesodSheet.read(file)
.headRowNumber(0)
.readDefaultReturn(ReadDefaultReturnEnum.ACTUAL_DATA)
.sheet()
.doReadSync();
- assertEquals(10, actualDataList.size());
+ Assertions.assertEquals(10, actualDataList.size());
Map<Integer, Object> actualData10 = actualDataList.get(9);
- assertEquals("string19", actualData10.get(0));
+ Assertions.assertEquals("string19", actualData10.get(0));
if (isCsv) {
- assertEquals("109", actualData10.get(1));
- assertEquals("2020-01-01 01:01:01", actualData10.get(2));
+ Assertions.assertEquals("109", actualData10.get(1));
+ Assertions.assertEquals("2020-01-01 01:01:01", actualData10.get(2));
} else {
- assertEquals(0, new BigDecimal("109").compareTo((BigDecimal) actualData10.get(1)));
- assertEquals(LocalDateTime.of(2020, 1, 1, 1, 1, 1), actualData10.get(2));
+ Assertions.assertEquals(0, new BigDecimal("109").compareTo((BigDecimal) actualData10.get(1)));
+ Assertions.assertEquals(LocalDateTime.of(2020, 1, 1, 1, 1, 1), actualData10.get(2));
}
List<Map<Integer, ReadCellData<?>>> readCellDataList = FesodSheet.read(file)
@@ -85,25 +85,25 @@ public class NoModelDataTest extends AbstractExcelTest {
.readDefaultReturn(ReadDefaultReturnEnum.READ_CELL_DATA)
.sheet()
.doReadSync();
- assertEquals(10, readCellDataList.size());
+ Assertions.assertEquals(10, readCellDataList.size());
Map<Integer, ReadCellData<?>> readCellData10 = readCellDataList.get(9);
- assertEquals("string19", readCellData10.get(0).getData());
+ Assertions.assertEquals("string19", readCellData10.get(0).getData());
if (isCsv) {
- assertEquals("109", readCellData10.get(1).getData());
- assertEquals("2020-01-01 01:01:01", readCellData10.get(2).getData());
+ Assertions.assertEquals("109", readCellData10.get(1).getData());
+ Assertions.assertEquals("2020-01-01 01:01:01", readCellData10.get(2).getData());
} else {
- assertEquals(0, new BigDecimal("109").compareTo((BigDecimal)
+ Assertions.assertEquals(0, new BigDecimal("109").compareTo((BigDecimal)
readCellData10.get(1).getData()));
- assertEquals(
+ Assertions.assertEquals(
LocalDateTime.of(2020, 1, 1, 1, 1, 1), readCellData10.get(2).getData());
}
FesodSheet.write(fileRepeat).sheet().doWrite(result);
result = FesodSheet.read(fileRepeat).headRowNumber(0).sheet().doReadSync();
- assertEquals(10, result.size());
+ Assertions.assertEquals(10, result.size());
data10 = result.get(9);
- assertEquals("string19", data10.get(0));
- assertEquals("109", data10.get(1));
- assertEquals("2020-01-01 01:01:01", data10.get(2));
+ Assertions.assertEquals("string19", data10.get(0));
+ Assertions.assertEquals("109", data10.get(1));
+ Assertions.assertEquals("2020-01-01 01:01:01", data10.get(2));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/RepetitionDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/RepetitionDataTest.java
index ad09e9e5..4287278e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/RepetitionDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/RepetitionDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.ExcelReader;
@@ -40,6 +39,7 @@ import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.fesod.sheet.write.metadata.WriteTable;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -67,9 +67,9 @@ public class RepetitionDataTest extends AbstractExcelTest {
excelReader.read(readSheet);
}
- assertEquals(2, listener.getRowCount());
- assertEquals("String0", listener.getRows().get(0).getString());
- assertEquals("String0", listener.getRows().get(1).getString());
+ Assertions.assertEquals(2, listener.getRowCount());
+ Assertions.assertEquals("String0", listener.getRows().get(0).getString());
+ Assertions.assertEquals("String0", listener.getRows().get(1).getString());
}
@ParameterizedTest
@@ -92,8 +92,8 @@ public class RepetitionDataTest extends AbstractExcelTest {
excelReader.read(readSheet);
}
- assertEquals(2, listener.getRowCount());
- assertEquals("String0", listener.getRows().get(0).getString());
- assertEquals("String0", listener.getRows().get(1).getString());
+ Assertions.assertEquals(2, listener.getRowCount());
+ Assertions.assertEquals("String0", listener.getRows().get(0).getString());
+ Assertions.assertEquals("String0", listener.getRows().get(1).getString());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SimpleDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SimpleDataTest.java
index 0e636612..062d817a 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SimpleDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SimpleDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.io.File;
import java.util.List;
import java.util.Map;
@@ -57,8 +55,8 @@ public class SimpleDataTest extends AbstractExcelTest {
List<SimpleData> data = TestDataBuilder.simpleData(10);
List<SimpleData> result = writeAndRead(format, SimpleData.class, data);
- assertEquals(10, result.size());
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(10, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@ParameterizedTest
@@ -68,8 +66,8 @@ public class SimpleDataTest extends AbstractExcelTest {
List<SimpleData> data = TestDataBuilder.simpleData(10);
List<SimpleData> result = RoundTripHelper.writeAndRead(file, format, mode, SimpleData.class, data);
- assertEquals(10, result.size());
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(10, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@ParameterizedTest
@@ -78,9 +76,9 @@ public class SimpleDataTest extends AbstractExcelTest {
List<SimpleData> data = TestDataBuilder.simpleData(10);
List<SimpleData> result = RoundTripHelper.writeAndReadSync(createTempFile(format), SimpleData.class, data);
- assertEquals(10, result.size());
- assertInstanceOf(SimpleData.class, result.get(0));
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(10, result.size());
+ Assertions.assertInstanceOf(SimpleData.class, result.get(0));
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@Test
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SkipDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SkipDataTest.java
index e41289dd..aae54d95 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SkipDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/SkipDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.ExcelReader;
@@ -43,6 +41,7 @@ import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -63,7 +62,7 @@ public class SkipDataTest extends AbstractExcelTest {
@Test
void readAndWriteCsvThrows() throws Exception {
File file = createTempFile(ExcelFormat.CSV);
- assertThrows(ExcelGenerateException.class, () -> readAndWriteImpl(file));
+ Assertions.assertThrows(ExcelGenerateException.class, () -> readAndWriteImpl(file));
}
private void readAndWriteImpl(File file) {
@@ -80,8 +79,8 @@ public class SkipDataTest extends AbstractExcelTest {
List<SimpleData> list =
FesodSheet.read(file, SimpleData.class, null).sheet("Sheet2").doReadSync();
- assertEquals(1, list.size());
- assertEquals("name2", list.get(0).getName());
+ Assertions.assertEquals(1, list.size());
+ Assertions.assertEquals("name2", list.get(0).getName());
SyncReadListener syncReadListener = new SyncReadListener();
try (ExcelReader excelReader = FesodSheet.read(file, SimpleData.class, null)
@@ -91,9 +90,9 @@ public class SkipDataTest extends AbstractExcelTest {
ReadSheet readSheet3 = FesodSheet.readSheet("Sheet4").build();
excelReader.read(readSheet1, readSheet3);
List<Object> syncList = syncReadListener.getList();
- assertEquals(2, syncList.size());
- assertEquals("name2", ((SimpleData) syncList.get(0)).getName());
- assertEquals("name4", ((SimpleData) syncList.get(1)).getName());
+ Assertions.assertEquals(2, syncList.size());
+ Assertions.assertEquals("name2", ((SimpleData) syncList.get(0)).getName());
+ Assertions.assertEquals("name4", ((SimpleData) syncList.get(1)).getName());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/UnCamelDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/UnCamelDataTest.java
index 334005c7..408a526f 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/UnCamelDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/core/UnCamelDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.core;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -37,6 +36,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -55,14 +55,14 @@ public class UnCamelDataTest extends AbstractExcelTest {
CollectingReadListener<UnCamelData> listener = new CollectingReadListener<>();
FesodSheet.read(file, UnCamelData.class, listener).sheet().doRead();
- assertEquals(10, listener.getRowCount());
+ Assertions.assertEquals(10, listener.getRowCount());
UnCamelData row = listener.getFirstRow();
- assertEquals("string1", row.getString1());
- assertEquals("string2", row.getString2());
- assertEquals("string3", row.getSTring3());
- assertEquals("string4", row.getSTring4());
- assertEquals("string5", row.getSTRING5());
- assertEquals("string6", row.getSTRing6());
+ Assertions.assertEquals("string1", row.getString1());
+ Assertions.assertEquals("string2", row.getString2());
+ Assertions.assertEquals("string3", row.getSTring3());
+ Assertions.assertEquals("string4", row.getSTring4());
+ Assertions.assertEquals("string5", row.getSTRING5());
+ Assertions.assertEquals("string6", row.getSTRing6());
}
@ParameterizedTest
@@ -82,13 +82,13 @@ public class UnCamelDataTest extends AbstractExcelTest {
.sheet()
.doRead();
- assertEquals(1, headMaps.size());
+ Assertions.assertEquals(1, headMaps.size());
Map<Integer, String> headMap = headMaps.get(0);
- assertEquals("string1", headMap.get(0));
- assertEquals("string2", headMap.get(1));
- assertEquals("STring3", headMap.get(2));
- assertEquals("STring4", headMap.get(3));
- assertEquals("STRING5", headMap.get(4));
- assertEquals("STRing6", headMap.get(5));
+ Assertions.assertEquals("string1", headMap.get(0));
+ Assertions.assertEquals("string2", headMap.get(1));
+ Assertions.assertEquals("STring3", headMap.get(2));
+ Assertions.assertEquals("STring4", headMap.get(3));
+ Assertions.assertEquals("STRING5", headMap.get(4));
+ Assertions.assertEquals("STRing6", headMap.get(5));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/BomDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/BomDataTest.java
index 03287bd9..a023f9df 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/BomDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/BomDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.format;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.FileOutputStream;
import java.nio.charset.Charset;
@@ -39,6 +38,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.models.SimpleData;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -87,16 +87,16 @@ public class BomDataTest extends AbstractExcelTest {
.charset(charset)
.sheet()
.doRead();
- assertEquals(10, listener.getRowCount());
- assertEquals("Name0", listener.getFirstRow().getName());
- assertEquals(0, (int) listener.getFirstRow().getAge());
+ Assertions.assertEquals(10, listener.getRowCount());
+ Assertions.assertEquals("Name0", listener.getFirstRow().getName());
+ Assertions.assertEquals(0, (int) listener.getFirstRow().getAge());
}
private void readCsvImpl(File file) {
CollectingReadListener<SimpleData> listener = new CollectingReadListener<>();
FesodSheet.read(file, SimpleData.class, listener).sheet().doRead();
- assertEquals(10, listener.getRowCount());
- assertEquals("姓名0", listener.getFirstRow().getName());
- assertEquals(20, (int) listener.getFirstRow().getAge());
+ Assertions.assertEquals(10, listener.getRowCount());
+ Assertions.assertEquals("姓名0", listener.getFirstRow().getName());
+ Assertions.assertEquals(20, (int) listener.getFirstRow().getAge());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CharsetDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CharsetDataTest.java
index fff065ac..473a476a 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CharsetDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CharsetDataTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.format;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -31,6 +30,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.models.SimpleData;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -77,8 +77,8 @@ public class CharsetDataTest extends AbstractExcelTest {
.charset(charset)
.sheet()
.doRead();
- assertEquals(10, listener.getRowCount());
- assertEquals("Name0", listener.getFirstRow().getName());
- assertEquals(0, (int) listener.getFirstRow().getAge());
+ Assertions.assertEquals(10, listener.getRowCount());
+ Assertions.assertEquals("Name0", listener.getFirstRow().getName());
+ Assertions.assertEquals(0, (int) listener.getFirstRow().getAge());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java
index d71fb1e6..797cb4d0 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CompatibilityTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.format;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import com.alibaba.fastjson2.JSON;
import java.io.File;
import java.math.BigDecimal;
@@ -41,6 +40,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.util.FileUtils;
import org.apache.poi.util.TempFile;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -57,9 +57,9 @@ public class CompatibilityTest extends AbstractExcelTest {
@Test
public void readXlsWithSpecialCharacters() {
List<Map<Integer, Object>> list = readCompatibilityFile("t01.xls");
- assertEquals(2, list.size());
+ Assertions.assertEquals(2, list.size());
Map<Integer, Object> row1 = list.get(1);
- assertEquals("Q235(碳钢)", row1.get(0));
+ Assertions.assertEquals("Q235(碳钢)", row1.get(0));
}
@Test
@@ -67,9 +67,9 @@ public class CompatibilityTest extends AbstractExcelTest {
// Exist in `sharedStrings.xml` `x:t` start tag, need to be compatible
List<Map<Integer, Object>> list = readCompatibilityFile("t02.xlsx", 0);
log.info("data:{}", JSON.toJSONString(list));
- assertEquals(3, list.size());
+ Assertions.assertEquals(3, list.size());
Map<Integer, Object> row2 = list.get(2);
- assertEquals("1，2-戊二醇", row2.get(2));
+ Assertions.assertEquals("1，2-戊二醇", row2.get(2));
}
@Test
@@ -77,9 +77,9 @@ public class CompatibilityTest extends AbstractExcelTest {
// In the presence of the first line of a lot of null columns, ignore null columns
List<Map<Integer, Object>> list = readCompatibilityFile("t03.xlsx");
log.info("data:{}", JSON.toJSONString(list));
- assertEquals(1, list.size());
+ Assertions.assertEquals(1, list.size());
Map<Integer, Object> row0 = list.get(0);
- assertEquals(12, row0.size());
+ Assertions.assertEquals(12, row0.size());
}
@Test
@@ -87,9 +87,9 @@ public class CompatibilityTest extends AbstractExcelTest {
// Exist in `sheet1.xml` `ns2:t` start tag, need to be compatible
List<Map<Integer, Object>> list = readCompatibilityFile("t04.xlsx");
log.info("data:{}", JSON.toJSONString(list));
- assertEquals(56, list.size());
+ Assertions.assertEquals(56, list.size());
Map<Integer, Object> row0 = list.get(0);
- assertEquals("QQSJK28F152A012242S0081", row0.get(5));
+ Assertions.assertEquals("QQSJK28F152A012242S0081", row0.get(5));
}
@Test
@@ -97,11 +97,11 @@ public class CompatibilityTest extends AbstractExcelTest {
// Excel read date needs to be rounded
List<Map<Integer, String>> list = readCompatibilityFile("t05.xlsx");
log.info("data:{}", JSON.toJSONString(list));
- assertEquals("2023-01-01 00:00:00", list.get(0).get(0));
- assertEquals("2023-01-01 00:00:00", list.get(1).get(0));
- assertEquals("2023-01-01 00:00:00", list.get(2).get(0));
- assertEquals("2023-01-01 00:00:01", list.get(3).get(0));
- assertEquals("2023-01-01 00:00:01", list.get(4).get(0));
+ Assertions.assertEquals("2023-01-01 00:00:00", list.get(0).get(0));
+ Assertions.assertEquals("2023-01-01 00:00:00", list.get(1).get(0));
+ Assertions.assertEquals("2023-01-01 00:00:00", list.get(2).get(0));
+ Assertions.assertEquals("2023-01-01 00:00:01", list.get(3).get(0));
+ Assertions.assertEquals("2023-01-01 00:00:01", list.get(4).get(0));
}
@Test
@@ -109,7 +109,7 @@ public class CompatibilityTest extends AbstractExcelTest {
// Keep error precision digital format
List<Map<Integer, String>> list = readCompatibilityFile("t06.xlsx", 0);
log.info("data:{}", JSON.toJSONString(list));
- assertEquals("2087.03", list.get(0).get(2));
+ Assertions.assertEquals("2087.03", list.get(0).get(2));
}
@Test
@@ -120,12 +120,12 @@ public class CompatibilityTest extends AbstractExcelTest {
.sheet()
.doReadSync();
log.info("data:{}", JSON.toJSONString(list));
- assertEquals(0, new BigDecimal("24.1998124").compareTo((BigDecimal)
+ Assertions.assertEquals(0, new BigDecimal("24.1998124").compareTo((BigDecimal)
list.get(0).get(11)));
list = readCompatibilityFile("t07.xlsx");
log.info("data:{}", JSON.toJSONString(list));
- assertEquals("24.20", list.get(0).get(11));
+ Assertions.assertEquals("24.20", list.get(0).get(11));
}
@Test
@@ -136,7 +136,7 @@ public class CompatibilityTest extends AbstractExcelTest {
List<Map<Integer, Object>> list =
FesodSheet.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync();
- assertEquals(10L, list.size());
+ Assertions.assertEquals(10L, list.size());
// Save file content before deleting the system temp dir (which also removes @TempDir)
byte[] fileContent = java.nio.file.Files.readAllBytes(file.toPath());
@@ -148,7 +148,7 @@ public class CompatibilityTest extends AbstractExcelTest {
java.nio.file.Files.write(file.toPath(), fileContent);
list = FesodSheet.read(file).readCache(new Ehcache(null, 20)).sheet().doReadSync();
- assertEquals(10L, list.size());
+ Assertions.assertEquals(10L, list.size());
}
@Test
@@ -158,9 +158,9 @@ public class CompatibilityTest extends AbstractExcelTest {
List<Map<Integer, Object>> list =
FesodSheet.read(file).headRowNumber(0).sheet().doReadSync();
log.info("data:{}", JSON.toJSONString(list));
- assertEquals(1, list.size());
+ Assertions.assertEquals(1, list.size());
- assertEquals("SH_x000D_Z002", list.get(0).get(0));
+ Assertions.assertEquals("SH_x000D_Z002", list.get(0).get(0));
}
private File compatibilityFile(String fileName) {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvBenignErrorToleranceTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvBenignErrorToleranceTest.java
index 117854b7..6cce2321 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvBenignErrorToleranceTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/CsvBenignErrorToleranceTest.java
@@ -19,8 +19,6 @@
package org.apache.fesod.sheet.format;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +29,7 @@ import org.apache.fesod.sheet.exception.ExcelCommonException;
import org.apache.fesod.sheet.read.builder.CsvReaderBuilder;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -49,7 +48,7 @@ class CsvBenignErrorToleranceTest extends AbstractExcelTest {
ByteArrayInputStream in = new ByteArrayInputStream(csv.getBytes(StandardCharsets.UTF_8));
// When / Then: reading should complete without throwing any exception
- assertDoesNotThrow(() -> {
+ Assertions.assertDoesNotThrow(() -> {
CsvReaderBuilder builder = FesodSheet.read(in).csv();
// Use sync read to drive the pipeline end-to-end
List<Object> rows = builder.doReadSync();
@@ -91,7 +90,7 @@ class CsvBenignErrorToleranceTest extends AbstractExcelTest {
};
// When / Then: the pipeline should convert UncheckedIOException into ExcelAnalysisException
- assertThrows(ExcelCommonException.class, () -> {
+ Assertions.assertThrows(ExcelCommonException.class, () -> {
FesodSheet.read(throwing).csv().doReadSync();
});
}
@@ -100,7 +99,7 @@ class CsvBenignErrorToleranceTest extends AbstractExcelTest {
void shouldReadWellFormedCsvNormally() {
String csv = "a,b\n1,2\n3,4\n";
ByteArrayInputStream in = new ByteArrayInputStream(csv.getBytes(StandardCharsets.UTF_8));
- assertDoesNotThrow(() -> {
+ Assertions.assertDoesNotThrow(() -> {
CsvReaderBuilder builder = FesodSheet.read(in).csv();
List<Object> rows = builder.doReadSync();
});
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/DateFormatTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/DateFormatTest.java
index d84b7e8d..4349f8fd 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/DateFormatTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/format/DateFormatTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.format;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.util.List;
import java.util.Locale;
@@ -38,6 +36,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,9 +57,9 @@ public class DateFormatTest extends AbstractExcelTest {
.sheet()
.doReadSync();
for (DateFormatData data : list) {
- assertTrue(Objects.equals(data.getDateStringCn(), data.getDate())
+ Assertions.assertTrue(Objects.equals(data.getDateStringCn(), data.getDate())
|| Objects.equals(data.getDateStringCn2(), data.getDate()));
- assertEquals(data.getNumberStringCn(), data.getNumber());
+ Assertions.assertEquals(data.getNumberStringCn(), data.getNumber());
}
}
@@ -73,8 +72,8 @@ public class DateFormatTest extends AbstractExcelTest {
.sheet()
.doReadSync();
for (DateFormatData data : list) {
- assertEquals(data.getDateStringUs(), data.getDate());
- assertEquals(data.getNumberStringUs(), data.getNumber());
+ Assertions.assertEquals(data.getDateStringUs(), data.getDate());
+ Assertions.assertEquals(data.getNumberStringUs(), data.getNumber());
}
}
@@ -83,12 +82,12 @@ public class DateFormatTest extends AbstractExcelTest {
File file07V2 = readFile("dataformat" + File.separator + "dataformatv2.xlsx");
List<Map<Integer, String>> dataMap =
FesodSheet.read(file07V2).headRowNumber(0).doReadAllSync();
- assertEquals("15:00", dataMap.get(0).get(0));
- assertEquals("2023-1-01 00:00:00", dataMap.get(1).get(0));
- assertEquals("2023-1-01 00:00:00", dataMap.get(2).get(0));
- assertEquals("2023-1-01 00:00:01", dataMap.get(3).get(0));
- assertEquals("2023-1-01 00:00:00", dataMap.get(4).get(0));
- assertEquals("2023-1-01 00:00:00", dataMap.get(5).get(0));
- assertEquals("2023-1-01 00:00:01", dataMap.get(6).get(0));
+ Assertions.assertEquals("15:00", dataMap.get(0).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(1).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(2).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:01", dataMap.get(3).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(4).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(5).get(0));
+ Assertions.assertEquals("2023-1-01 00:00:01", dataMap.get(6).get(0));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ComplexHeadDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ComplexHeadDataTest.java
index 5674239d..1dfd4879 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ComplexHeadDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ComplexHeadDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.head;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -34,6 +33,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -53,8 +53,8 @@ public class ComplexHeadDataTest extends AbstractExcelTest {
.xlsxSAXParserFactoryName("com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl")
.sheet()
.doReadSync();
- assertEquals(1, result.size());
- assertEquals("String4", result.get(0).getString4());
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals("String4", result.get(0).getString4());
}
@ParameterizedTest
@@ -67,7 +67,7 @@ public class ComplexHeadDataTest extends AbstractExcelTest {
.doWrite(TestDataBuilder.complexHeadData(1));
List<ComplexHeadData> result =
FesodSheet.read(file).head(ComplexHeadData.class).sheet().doReadSync();
- assertEquals(1, result.size());
- assertEquals("String4", result.get(0).getString4());
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals("String4", result.get(0).getString4());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ImmutableListHeadDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ImmutableListHeadDataTest.java
index df784751..c0ffa11e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ImmutableListHeadDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ImmutableListHeadDataTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.head;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.text.ParseException;
import java.util.ArrayList;
@@ -33,6 +32,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.util.DateUtils;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -54,12 +54,12 @@ public class ImmutableListHeadDataTest extends AbstractExcelTest {
List<Map<Integer, String>> list =
FesodSheet.read(file).head(head()).sheet().doReadSync();
- assertEquals(1, list.size());
+ Assertions.assertEquals(1, list.size());
Map<Integer, String> row = list.get(0);
- assertEquals("stringData", row.get(0));
- assertEquals("1", row.get(1));
- assertEquals("2025-10-31 01:01:01", row.get(2));
- assertEquals("extraData", row.get(3));
+ Assertions.assertEquals("stringData", row.get(0));
+ Assertions.assertEquals("1", row.get(1));
+ Assertions.assertEquals("2025-10-31 01:01:01", row.get(2));
+ Assertions.assertEquals("extraData", row.get(3));
}
private List<List<String>> head() {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ListHeadDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ListHeadDataTest.java
index f3657455..980f86a3 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ListHeadDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/ListHeadDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.head;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.text.ParseException;
import java.util.ArrayList;
@@ -37,6 +36,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.util.DateUtils;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -52,12 +52,12 @@ public class ListHeadDataTest extends AbstractExcelTest {
File file = createTempFile("listHead", format);
FesodSheet.write(file).head(head()).sheet().doWrite(data());
List<Map<Integer, String>> list = FesodSheet.read(file).sheet().doReadSync();
- assertEquals(1, list.size());
+ Assertions.assertEquals(1, list.size());
Map<Integer, String> row = list.get(0);
- assertEquals("String0", row.get(0));
- assertEquals("1", row.get(1));
- assertEquals("2020-01-01 01:01:01", row.get(2));
- assertEquals("ExtraData", row.get(3));
+ Assertions.assertEquals("String0", row.get(0));
+ Assertions.assertEquals("1", row.get(1));
+ Assertions.assertEquals("2020-01-01 01:01:01", row.get(2));
+ Assertions.assertEquals("ExtraData", row.get(3));
}
private List<List<String>> head() {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/NoHeadDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/NoHeadDataTest.java
index 7bf80611..3f617f94 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/NoHeadDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/head/NoHeadDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.head;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -34,6 +33,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -53,7 +53,7 @@ public class NoHeadDataTest extends AbstractExcelTest {
.headRowNumber(0)
.sheet()
.doReadSync();
- assertEquals(1, result.size());
- assertEquals("String0", result.get(0).getString());
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals("String0", result.get(0).getString());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java
index aa915bcb..c5bf6f95 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/AutoStripParameterTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import com.alibaba.fastjson2.JSON;
import java.io.File;
import java.util.ArrayList;
@@ -42,6 +41,7 @@ import org.apache.fesod.sheet.testkit.params.FormatScope;
import org.apache.fesod.sheet.util.ParameterUtil;
import org.apache.fesod.sheet.util.SheetUtils;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -117,18 +117,18 @@ public class AutoStripParameterTest extends AbstractExcelTest {
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
// global configuration match
- assertEquals(
+ Assertions.assertEquals(
autoTrim == null ? Boolean.TRUE : autoTrim,
ParameterUtil.getAutoTrimFlag(
context.readSheetHolder().getReadSheet(), context));
- assertEquals(
+ Assertions.assertEquals(
autoStrip == null ? Boolean.FALSE : autoStrip,
ParameterUtil.getAutoStripFlag(
context.readSheetHolder().getReadSheet(), context));
// sheet name match
ReadSheet readSheet = context.readSheetHolder().getReadSheet();
- assertEquals(readSheet, SheetUtils.match(readSheet, context));
+ Assertions.assertEquals(readSheet, SheetUtils.match(readSheet, context));
}
})
.autoTrim(autoTrim)
@@ -176,18 +176,20 @@ public class AutoStripParameterTest extends AbstractExcelTest {
.doReadSync();
log.info("Read records: {}", JSON.toJSONString(dataList));
- assertEquals(2, dataList.size());
+ Assertions.assertEquals(2, dataList.size());
if (Boolean.TRUE.equals(autoStrip)) {
- assertEquals(StringUtils.strip(testContentSpaces), dataList.get(0).getName());
- assertEquals(
+ Assertions.assertEquals(
+ StringUtils.strip(testContentSpaces), dataList.get(0).getName());
+ Assertions.assertEquals(
StringUtils.strip(testContentFullWidthSpaces),
dataList.get(1).getName());
} else if (autoTrim == null || autoTrim) {
- assertEquals(testContentSpaces.trim(), dataList.get(0).getName());
- assertEquals(testContentFullWidthSpaces.trim(), dataList.get(1).getName());
+ Assertions.assertEquals(testContentSpaces.trim(), dataList.get(0).getName());
+ Assertions.assertEquals(
+ testContentFullWidthSpaces.trim(), dataList.get(1).getName());
} else {
- assertEquals(testContentSpaces, dataList.get(0).getName());
- assertEquals(testContentFullWidthSpaces, dataList.get(1).getName());
+ Assertions.assertEquals(testContentSpaces, dataList.get(0).getName());
+ Assertions.assertEquals(testContentFullWidthSpaces, dataList.get(1).getName());
}
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/CacheDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/CacheDataTest.java
index 8e872943..c50ad4ff 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/CacheDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/CacheDataTest.java
@@ -25,9 +25,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
@@ -47,6 +44,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.util.ClassUtils;
import org.apache.fesod.sheet.util.FieldUtils;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -62,14 +60,14 @@ public class CacheDataTest extends AbstractExcelTest {
Field field = FieldUtils.getField(ClassUtils.class, "FIELD_THREAD_LOCAL", true);
ThreadLocal<Map<Class<?>, FieldCache>> fieldThreadLocal =
(ThreadLocal<Map<Class<?>, FieldCache>>) field.get(ClassUtils.class.newInstance());
- assertNull(fieldThreadLocal.get());
+ Assertions.assertNull(fieldThreadLocal.get());
FesodSheet.write(file07, CacheData.class).sheet().doWrite(TestDataBuilder.cacheData(10));
FesodSheet.read(file07, CacheData.class, new PageReadListener<CacheData>(dataList -> {
- assertNotNull(fieldThreadLocal.get());
+ Assertions.assertNotNull(fieldThreadLocal.get());
}))
.sheet()
.doRead();
- assertNull(fieldThreadLocal.get());
+ Assertions.assertNull(fieldThreadLocal.get());
}
@Test
@@ -120,10 +118,10 @@ public class CacheDataTest extends AbstractExcelTest {
}
Map<Integer, String> headMap = listener.getHeadMap();
- assertNotNull(headMap);
- assertEquals(2, headMap.size());
- assertEquals(expectedFirstHead, headMap.get(0));
- assertEquals("Age", headMap.get(1));
+ Assertions.assertNotNull(headMap);
+ Assertions.assertEquals(2, headMap.size());
+ Assertions.assertEquals(expectedFirstHead, headMap.get(0));
+ Assertions.assertEquals("Age", headMap.get(1));
}
private void setNameHeader(String nameHeader) throws Exception {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/DateWindowingTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/DateWindowingTest.java
index 445f11ec..0374f15e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/DateWindowingTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/DateWindowingTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import org.apache.fesod.sheet.FesodSheet;
import org.apache.fesod.sheet.support.ExcelTypeEnum;
@@ -28,6 +27,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.models.SimpleData;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -98,7 +98,7 @@ public class DateWindowingTest extends AbstractExcelTest {
.head(SimpleData.class)
.doReadAllSync();
}
- assertEquals(expectedActualUse1904windowing, listener.getActualUse1904windowing());
+ Assertions.assertEquals(expectedActualUse1904windowing, listener.getActualUse1904windowing());
}
private File fixtureFile(String fileName) {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/EncryptDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/EncryptDataTest.java
index 20bdca89..1741d581 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/EncryptDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/EncryptDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.nio.file.Files;
import java.util.List;
@@ -41,6 +39,7 @@ import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.write.builder.ExcelWriterBuilder;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -102,7 +101,7 @@ public class EncryptDataTest extends AbstractExcelTest {
excelWriterBuilder.sheet().doWrite(TestDataBuilder.simpleData(10));
List<SimpleData> dataList = readerBuilder.sheet().doReadSync();
- assertEquals(10, dataList.size());
- assertNotNull(dataList.get(0).getName());
+ Assertions.assertEquals(10, dataList.size());
+ Assertions.assertNotNull(dataList.get(0).getName());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataTest.java
index 6b564891..8cfafa9d 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ExceptionDataTest.java
@@ -25,10 +25,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.util.List;
import java.util.Map;
@@ -42,6 +38,7 @@ import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,10 +55,10 @@ public class ExceptionDataTest extends AbstractExcelTest {
FesodSheet.write(file, SimpleData.class).sheet().doWrite(TestDataBuilder.simpleData(10));
ExceptionDataListener listener = new ExceptionDataListener();
FesodSheet.read(file, SimpleData.class, listener).sheet().doRead();
- assertEquals(8, listener.getList().size());
- assertEquals("Name0", listener.getList().get(0).getName());
- assertEquals(0, (int) listener.getSheetNo());
- assertEquals("Name", listener.getHeadName());
+ Assertions.assertEquals(8, listener.getList().size());
+ Assertions.assertEquals("Name0", listener.getList().get(0).getName());
+ Assertions.assertEquals(0, (int) listener.getSheetNo());
+ Assertions.assertEquals("Name", listener.getHeadName());
}
@ParameterizedTest
@@ -69,11 +66,11 @@ public class ExceptionDataTest extends AbstractExcelTest {
void readAndWriteException(ExcelFormat format) throws Exception {
File file = createTempFile(format);
FesodSheet.write(file, SimpleData.class).sheet().doWrite(TestDataBuilder.simpleData(10));
- ArithmeticException exception = assertThrows(ArithmeticException.class, () -> FesodSheet.read(
+ ArithmeticException exception = Assertions.assertThrows(ArithmeticException.class, () -> FesodSheet.read(
file, SimpleData.class, new ExceptionThrowDataListener())
.sheet()
.doRead());
- assertEquals("/ by zero", exception.getMessage());
+ Assertions.assertEquals("/ by zero", exception.getMessage());
}
@ParameterizedTest
@@ -92,14 +89,14 @@ public class ExceptionDataTest extends AbstractExcelTest {
ExcelAnalysisStopSheetExceptionDataListener listener = new ExcelAnalysisStopSheetExceptionDataListener();
FesodSheet.read(file, SimpleData.class, listener).doReadAll();
Map<Integer, List<String>> dataMap = listener.getDataMap();
- assertEquals(5, dataMap.size());
+ Assertions.assertEquals(5, dataMap.size());
for (int i = 0; i < 5; i++) {
List<String> sheetDataList = dataMap.get(i);
- assertNotNull(sheetDataList);
- assertEquals(5, sheetDataList.size());
+ Assertions.assertNotNull(sheetDataList);
+ Assertions.assertEquals(5, sheetDataList.size());
String sheetName = "sheet" + i;
for (String sheetData : sheetDataList) {
- assertTrue(sheetData.startsWith(sheetName));
+ Assertions.assertTrue(sheetData.startsWith(sheetName));
}
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ParameterDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ParameterDataTest.java
index 4b0869d1..22b4f6a7 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ParameterDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/ParameterDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.FileOutputStream;
import java.util.List;
@@ -45,6 +44,7 @@ import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.fesod.sheet.write.metadata.WriteTable;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -217,7 +217,7 @@ public class ParameterDataTest extends AbstractExcelTest {
}
private void assertParameterData(List<SimpleData> dataList) {
- assertEquals(10, dataList.size());
- assertEquals("Name0", dataList.get(0).getName());
+ Assertions.assertEquals(10, dataList.size());
+ Assertions.assertEquals("Name0", dataList.get(0).getName());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/XlsxSaxAnalyserReadOpcPackageTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/XlsxSaxAnalyserReadOpcPackageTest.java
index 5b2e4626..88c97552 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/XlsxSaxAnalyserReadOpcPackageTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/readwrite/XlsxSaxAnalyserReadOpcPackageTest.java
@@ -19,8 +19,6 @@
package org.apache.fesod.sheet.readwrite;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -35,6 +33,7 @@ import org.apache.fesod.sheet.read.metadata.ReadWorkbook;
import org.apache.fesod.sheet.support.ExcelTypeEnum;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -54,8 +53,10 @@ public class XlsxSaxAnalyserReadOpcPackageTest extends AbstractExcelTest {
rw.setMandatoryUseInputStream(true);
XlsxReadContext ctx = new DefaultXlsxReadContext(rw, ExcelTypeEnum.XLSX);
- ExcelCommonException ex = assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
- assertTrue(ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
+ ExcelCommonException ex =
+ Assertions.assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
+ Assertions.assertTrue(
+ ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
}
@Test
@@ -67,8 +68,10 @@ public class XlsxSaxAnalyserReadOpcPackageTest extends AbstractExcelTest {
rw.setFile(tmp);
XlsxReadContext ctx = new DefaultXlsxReadContext(rw, ExcelTypeEnum.XLSX);
- ExcelCommonException ex = assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
- assertTrue(ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
+ ExcelCommonException ex =
+ Assertions.assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
+ Assertions.assertTrue(
+ ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
} finally {
try {
Files.deleteIfExists(tmp.toPath());
@@ -84,8 +87,10 @@ public class XlsxSaxAnalyserReadOpcPackageTest extends AbstractExcelTest {
XlsxReadContext ctx = new DefaultXlsxReadContext(rw, ExcelTypeEnum.XLSX);
ByteArrayInputStream decrypted = new ByteArrayInputStream("still-not-xlsx".getBytes(StandardCharsets.UTF_8));
- ExcelCommonException ex = assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, decrypted));
- assertTrue(ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
+ ExcelCommonException ex =
+ Assertions.assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, decrypted));
+ Assertions.assertTrue(
+ ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
}
@Test
@@ -99,8 +104,10 @@ public class XlsxSaxAnalyserReadOpcPackageTest extends AbstractExcelTest {
ReadWorkbook rw = new ReadWorkbook();
rw.setFile(tmp);
XlsxReadContext ctx = new DefaultXlsxReadContext(rw, ExcelTypeEnum.XLSX);
- ExcelCommonException ex = assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
- assertTrue(ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
+ ExcelCommonException ex =
+ Assertions.assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
+ Assertions.assertTrue(
+ ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
} finally {
try {
Files.deleteIfExists(tmp.toPath());
@@ -117,7 +124,9 @@ public class XlsxSaxAnalyserReadOpcPackageTest extends AbstractExcelTest {
rw.setMandatoryUseInputStream(false);
XlsxReadContext ctx = new DefaultXlsxReadContext(rw, ExcelTypeEnum.XLSX);
- ExcelCommonException ex = assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
- assertTrue(ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
+ ExcelCommonException ex =
+ Assertions.assertThrows(ExcelCommonException.class, () -> new XlsxSaxAnalyser(ctx, null));
+ Assertions.assertTrue(
+ ex.getMessage() != null && ex.getMessage().toLowerCase().contains("invalid ooxml/zip format"));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/HiddenSheetsTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/HiddenSheetsTest.java
index 4ab0ce72..e9f68b7e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/HiddenSheetsTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/HiddenSheetsTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.sheet;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.ExcelReader;
@@ -32,6 +31,7 @@ import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.models.TitleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -63,10 +63,11 @@ public class HiddenSheetsTest extends AbstractExcelTest {
try (ExcelReader excelReader = FesodSheet.read(file, TitleData.class, new CollectingReadListener<TitleData>())
.build()) {
List<ReadSheet> allSheetList = excelReader.excelExecutor().sheetList();
- assertEquals(2, allSheetList.stream().filter(ReadSheet::isHidden).count());
- assertEquals(
+ Assertions.assertEquals(
+ 2, allSheetList.stream().filter(ReadSheet::isHidden).count());
+ Assertions.assertEquals(
1, allSheetList.stream().filter(ReadSheet::isVeryHidden).count());
- assertEquals(
+ Assertions.assertEquals(
"Sheet5",
allSheetList.stream()
.filter(ReadSheet::isVeryHidden)
@@ -82,9 +83,9 @@ public class HiddenSheetsTest extends AbstractExcelTest {
.build()) {
List<ReadSheet> sheets = excelReader.excelExecutor().sheetList();
if (Boolean.TRUE.equals(ignoreHidden)) {
- assertEquals(3, sheets.size());
+ Assertions.assertEquals(3, sheets.size());
} else {
- assertEquals(6, sheets.size());
+ Assertions.assertEquals(6, sheets.size());
}
}
}
@@ -94,9 +95,9 @@ public class HiddenSheetsTest extends AbstractExcelTest {
.ignoreHiddenSheet(ignoreHidden)
.doReadAllSync();
if (Boolean.TRUE.equals(ignoreHidden)) {
- assertEquals(3, dataList.size());
+ Assertions.assertEquals(3, dataList.size());
} else {
- assertEquals(6, dataList.size());
+ Assertions.assertEquals(6, dataList.size());
}
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/MultipleSheetsDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/MultipleSheetsDataTest.java
index 630d7623..46d02a1c 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/MultipleSheetsDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/MultipleSheetsDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.sheet;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.ExcelReader;
@@ -38,6 +37,7 @@ import org.apache.fesod.sheet.testkit.listeners.CollectingReadListener;
import org.apache.fesod.sheet.testkit.models.TitleData;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
import org.apache.fesod.sheet.testkit.params.FormatScope;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -58,7 +58,7 @@ public class MultipleSheetsDataTest extends AbstractExcelTest {
int count = 1;
for (ReadSheet readSheet : sheets) {
excelReader.read(readSheet);
- assertEquals(count, listener.getRowCount());
+ Assertions.assertEquals(count, listener.getRowCount());
count++;
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/WriteSheetTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/WriteSheetTest.java
index 16aa9e0d..238459e6 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/WriteSheetTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/sheet/WriteSheetTest.java
@@ -19,7 +19,6 @@
package org.apache.fesod.sheet.sheet;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
@@ -34,6 +33,7 @@ import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -85,7 +85,7 @@ public class WriteSheetTest extends AbstractExcelTest {
.head(WriteSheetData.class)
.sheet(i)
.doReadSync();
- assertEquals(dataMap.get(sheetNoList.get(i)), sheetDataList.size());
+ Assertions.assertEquals(dataMap.get(sheetNoList.get(i)), sheetDataList.size());
}
}
@@ -112,27 +112,31 @@ public class WriteSheetTest extends AbstractExcelTest {
int sheetNo = 0;
WriteSheet writeSheet = FesodSheet.writerSheet(sheetNo).build();
excelWriter.write(TestDataBuilder.writeSheetData(dataMap.get(sheetNo)), writeSheet);
- assertEquals(sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
+ Assertions.assertEquals(
+ sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
sheetNo = 1;
writeSheet = FesodSheet.writerSheet(sheetNameList.get(sheetNo)).build();
excelWriter.write(TestDataBuilder.writeSheetData(dataMap.get(sheetNo)), writeSheet);
- assertEquals(sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
+ Assertions.assertEquals(
+ sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
sheetNo = 2;
writeSheet =
FesodSheet.writerSheet(sheetNo, sheetNameList.get(sheetNo)).build();
excelWriter.write(TestDataBuilder.writeSheetData(dataMap.get(sheetNo)), writeSheet);
- assertEquals(sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
+ Assertions.assertEquals(
+ sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
sheetNo = 3;
writeSheet =
FesodSheet.writerSheet(sheetNo, sheetNameList.get(sheetNo)).build();
excelWriter.write(TestDataBuilder.writeSheetData(dataMap.get(sheetNo)), writeSheet);
- assertEquals(
+ Assertions.assertEquals(
sheetNameList.get(sheetNo).substring(0, Workbook.MAX_SENSITIVE_SHEET_NAME_LEN),
excelWriter.writeContext().writeSheetHolder().getSheetName());
- assertEquals(sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
+ Assertions.assertEquals(
+ sheetNo, excelWriter.writeContext().writeSheetHolder().getSheetNo());
}
for (int i = 0; i < sheetNoList.size(); i++) {
@@ -141,7 +145,7 @@ public class WriteSheetTest extends AbstractExcelTest {
.head(WriteSheetData.class)
.sheet(i)
.doReadSync();
- assertEquals(dataMap.get(sheetNoList.get(i)), sheetDataList.size());
+ Assertions.assertEquals(dataMap.get(sheetNoList.get(i)), sheetDataList.size());
}
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationDataTest.java
index 8aaf6c0a..4be66e86 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.style;
-import static org.apache.fesod.sheet.testkit.params.FormatCapability.*;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +34,7 @@ import org.apache.fesod.sheet.testkit.assertions.ExcelAssertions;
import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.apache.fesod.sheet.testkit.params.FormatCapability;
import org.apache.fesod.sheet.testkit.params.FormatScope;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -65,7 +65,7 @@ public class AnnotationDataTest extends AbstractExcelTest {
}
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = STYLES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.STYLES)
void writeStyle(ExcelFormat format) throws Exception {
File file = createTempFile("annotationStyle", format);
FesodSheet.write().file(file).head(AnnotationStyleData.class).sheet().doWrite(dataStyle());
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationIndexAndNameDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationIndexAndNameDataTest.java
index c4ba0ad5..c5847c51 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationIndexAndNameDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/AnnotationIndexAndNameDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.style;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -34,6 +33,7 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -54,10 +54,10 @@ public class AnnotationIndexAndNameDataTest extends AbstractExcelTest {
.head(AnnotationIndexAndNameData.class)
.sheet()
.doReadSync();
- assertEquals(1, result.size());
- assertEquals("Item0", result.get(0).getIndex0());
- assertEquals("Item1", result.get(0).getIndex1());
- assertEquals("Item2", result.get(0).getIndex2());
- assertEquals("Item4", result.get(0).getIndex4());
+ Assertions.assertEquals(1, result.size());
+ Assertions.assertEquals("Item0", result.get(0).getIndex0());
+ Assertions.assertEquals("Item1", result.get(0).getIndex1());
+ Assertions.assertEquals("Item2", result.get(0).getIndex2());
+ Assertions.assertEquals("Item4", result.get(0).getIndex4());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/ExcelPropertyFormatTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/ExcelPropertyFormatTest.java
index 3ea8dfa8..015aff8f 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/ExcelPropertyFormatTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/ExcelPropertyFormatTest.java
@@ -19,9 +19,6 @@
package org.apache.fesod.sheet.style;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
@@ -42,6 +39,7 @@ import org.apache.fesod.sheet.read.listener.ReadListener;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -73,8 +71,10 @@ public class ExcelPropertyFormatTest {
try (FileInputStream fis = new FileInputStream(fileName);
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
Row dataRow = workbook.getSheetAt(0).getRow(1);
- assertEquals("yyyy-MMM-dd", dataRow.getCell(0).getCellStyle().getDataFormatString());
- assertEquals("yyyy-MMM-dd", dataRow.getCell(1).getCellStyle().getDataFormatString());
+ Assertions.assertEquals(
+ "yyyy-MMM-dd", dataRow.getCell(0).getCellStyle().getDataFormatString());
+ Assertions.assertEquals(
+ "yyyy-MMM-dd", dataRow.getCell(1).getCellStyle().getDataFormatString());
}
}
@@ -104,9 +104,10 @@ public class ExcelPropertyFormatTest {
try (FileInputStream fis = new FileInputStream(fileName);
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
Row dataRow = workbook.getSheetAt(0).getRow(1);
- assertEquals(
+ Assertions.assertEquals(
"yyyy年MM月dd日HH时mm分ss秒", dataRow.getCell(0).getCellStyle().getDataFormatString());
- assertEquals("yyyy年MM月dd日", dataRow.getCell(1).getCellStyle().getDataFormatString());
+ Assertions.assertEquals(
+ "yyyy年MM月dd日", dataRow.getCell(1).getCellStyle().getDataFormatString());
}
}
@@ -139,9 +140,10 @@ public class ExcelPropertyFormatTest {
try (FileInputStream fis = new FileInputStream(file);
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
Row row = workbook.getSheetAt(0).getRow(1);
- assertEquals("yyyy/MM/dd", row.getCell(0).getCellStyle().getDataFormatString());
- assertEquals("dd-MM-yyyy", row.getCell(1).getCellStyle().getDataFormatString());
- assertEquals("yyyy-MM-dd HH:mm", row.getCell(2).getCellStyle().getDataFormatString());
+ Assertions.assertEquals("yyyy/MM/dd", row.getCell(0).getCellStyle().getDataFormatString());
+ Assertions.assertEquals("dd-MM-yyyy", row.getCell(1).getCellStyle().getDataFormatString());
+ Assertions.assertEquals(
+ "yyyy-MM-dd HH:mm", row.getCell(2).getCellStyle().getDataFormatString());
}
}
@@ -196,8 +198,8 @@ public class ExcelPropertyFormatTest {
try (FileInputStream fis = new FileInputStream(file);
XSSFWorkbook workbook = new XSSFWorkbook(fis)) {
Row row = workbook.getSheetAt(0).getRow(1);
- assertNotNull(row, "expect row existing");
- assertTrue(
+ Assertions.assertNotNull(row, "expect row existing");
+ Assertions.assertTrue(
StringUtils.isBlank(row.getCell(0).getStringCellValue()),
"Empty date field should write as blank cell");
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/FillDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/FillDataTest.java
index e9a784fb..03cb3fc8 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/FillDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/FillDataTest.java
@@ -25,9 +25,6 @@
package org.apache.fesod.sheet.style;
-import static org.apache.fesod.sheet.testkit.params.FormatCapability.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.util.HashMap;
import java.util.List;
@@ -41,11 +38,13 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.apache.fesod.sheet.testkit.params.FormatCapability;
import org.apache.fesod.sheet.testkit.params.FormatScope;
import org.apache.fesod.sheet.write.merge.LoopMergeStrategy;
import org.apache.fesod.sheet.write.metadata.WriteSheet;
import org.apache.fesod.sheet.write.metadata.fill.FillConfig;
import org.apache.fesod.sheet.write.metadata.fill.FillWrapper;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -61,15 +60,16 @@ public class FillDataTest extends AbstractExcelTest {
File file = createTempFile("fill", format);
File template = readFile("fill" + File.separator + "simple" + format.getExtension());
if (format == ExcelFormat.CSV) {
- ExcelGenerateException ex = assertThrows(ExcelGenerateException.class, () -> fill(file, template));
- assertEquals("csv cannot use template.", ex.getMessage());
+ ExcelGenerateException ex =
+ Assertions.assertThrows(ExcelGenerateException.class, () -> fill(file, template));
+ Assertions.assertEquals("csv cannot use template.", ex.getMessage());
} else {
fill(file, template);
}
}
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = TEMPLATES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.TEMPLATES)
void complexFill(ExcelFormat format) throws Exception {
File file = createTempFile("fillComplex", format);
File template = readFile("fill" + File.separator + "complex" + format.getExtension());
@@ -77,7 +77,7 @@ public class FillDataTest extends AbstractExcelTest {
}
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = TEMPLATES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.TEMPLATES)
void horizontalFill(ExcelFormat format) throws Exception {
File file = createTempFile("fillHorizontal", format);
File template = readFile("fill" + File.separator + "horizontal" + format.getExtension());
@@ -85,7 +85,7 @@ public class FillDataTest extends AbstractExcelTest {
}
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = TEMPLATES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.TEMPLATES)
void byNameFill(ExcelFormat format) throws Exception {
File file = createTempFile("byName", format);
File template = readFile("fill" + File.separator + "byName" + format.getExtension());
@@ -93,7 +93,7 @@ public class FillDataTest extends AbstractExcelTest {
}
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = TEMPLATES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.TEMPLATES)
void compositeFill(ExcelFormat format) throws Exception {
File file = createTempFile("composite", format);
File template = readFile("fill" + File.separator + "composite" + format.getExtension());
@@ -136,11 +136,11 @@ public class FillDataTest extends AbstractExcelTest {
.headRowNumber(0)
.doReadSync();
Map<String, String> map0 = (Map<String, String>) list.get(0);
- assertEquals("Zhang San", map0.get(21));
+ Assertions.assertEquals("Zhang San", map0.get(21));
Map<String, String> map27 = (Map<String, String>) list.get(27);
- assertEquals("Zhang San", map27.get(0));
+ Assertions.assertEquals("Zhang San", map27.get(0));
Map<String, String> map29 = (Map<String, String>) list.get(29);
- assertEquals("Zhang San", map29.get(3));
+ Assertions.assertEquals("Zhang San", map29.get(3));
}
@SuppressWarnings("unchecked")
@@ -160,9 +160,9 @@ public class FillDataTest extends AbstractExcelTest {
}
List<Object> list = FesodSheet.read(file).sheet().headRowNumber(0).doReadSync();
- assertEquals(5L, list.size());
+ Assertions.assertEquals(5L, list.size());
Map<String, String> map0 = (Map<String, String>) list.get(0);
- assertEquals("Zhang San", map0.get(2));
+ Assertions.assertEquals("Zhang San", map0.get(2));
}
@SuppressWarnings("unchecked")
@@ -182,9 +182,9 @@ public class FillDataTest extends AbstractExcelTest {
excelWriter.fill(map, writeSheet);
}
List<Object> list = FesodSheet.read(file).sheet().headRowNumber(3).doReadSync();
- assertEquals(21L, list.size());
+ Assertions.assertEquals(21L, list.size());
Map<String, String> map19 = (Map<String, String>) list.get(19);
- assertEquals("Zhang San", map19.get(0));
+ Assertions.assertEquals("Zhang San", map19.get(0));
}
private void fill(File file, File template) {
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/StyleDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/StyleDataTest.java
index 7f061de6..b2540ead 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/StyleDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/style/StyleDataTest.java
@@ -25,7 +25,6 @@
package org.apache.fesod.sheet.style;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -56,6 +55,7 @@ import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -220,9 +220,9 @@ public class StyleDataTest extends AbstractExcelTest {
List<StyleData> result =
FesodSheet.read(file).head(StyleData.class).sheet().doReadSync();
- assertEquals(2, result.size());
- assertEquals("String0", result.get(0).getString());
- assertEquals("String1", result.get(1).getString());
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals("String0", result.get(0).getString());
+ Assertions.assertEquals("String1", result.get(1).getString());
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
ea.sheet(0)
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/template/TemplateDataTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/template/TemplateDataTest.java
index 1b8846fb..7920d3db 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/template/TemplateDataTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/template/TemplateDataTest.java
@@ -25,8 +25,6 @@
package org.apache.fesod.sheet.template;
-import static org.apache.fesod.sheet.testkit.params.FormatCapability.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
@@ -35,7 +33,9 @@ import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
import org.apache.fesod.sheet.testkit.builders.TestDataBuilder;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.apache.fesod.sheet.testkit.params.FormatCapability;
import org.apache.fesod.sheet.testkit.params.FormatScope;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +46,7 @@ import org.junit.jupiter.params.ParameterizedTest;
public class TemplateDataTest extends AbstractExcelTest {
@ParameterizedTest
- @ExcelFormatSource(value = FormatScope.BINARY, requires = TEMPLATES)
+ @ExcelFormatSource(value = FormatScope.BINARY, requires = FormatCapability.TEMPLATES)
void readAndWrite(ExcelFormat format) throws Exception {
File file = createTempFile("template", format);
String templateName = "template" + File.separator + "template" + (format == ExcelFormat.XLSX ? "07" : "03")
@@ -61,8 +61,8 @@ public class TemplateDataTest extends AbstractExcelTest {
.headRowNumber(3)
.sheet()
.doReadSync();
- assertEquals(2, result.size());
- assertEquals("String0", result.get(0).getString0());
- assertEquals("String1", result.get(1).getString0());
+ Assertions.assertEquals(2, result.size());
+ Assertions.assertEquals("String0", result.get(0).getString0());
+ Assertions.assertEquals("String1", result.get(1).getString0());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/assertions/ExcelAssertionsTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/assertions/ExcelAssertionsTest.java
index 68b93c64..7b924f9e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/assertions/ExcelAssertionsTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/assertions/ExcelAssertionsTest.java
@@ -19,14 +19,13 @@
package org.apache.fesod.sheet.testkit.assertions;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.fesod.sheet.FesodSheet;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.models.SimpleData;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -59,7 +58,7 @@ class ExcelAssertionsTest {
@Test
void assertThatThrowsForMissingFile() {
File missing = new File(tempDir, "nonexistent.xlsx");
- assertThrows(AssertionError.class, () -> ExcelAssertions.assertThat(missing));
+ Assertions.assertThrows(AssertionError.class, () -> ExcelAssertions.assertThat(missing));
}
@Test
@@ -74,7 +73,7 @@ class ExcelAssertionsTest {
void sheetCountMismatchThrows() {
File file = writeSimpleFile("test.xlsx");
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
- assertThrows(AssertionError.class, () -> ea.workbook().hasSheetCount(5));
+ Assertions.assertThrows(AssertionError.class, () -> ea.workbook().hasSheetCount(5));
}
}
@@ -82,7 +81,7 @@ class ExcelAssertionsTest {
void sheetIndexOutOfBoundsThrows() {
File file = writeSimpleFile("test.xlsx");
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
- assertThrows(AssertionError.class, () -> ea.sheet(99));
+ Assertions.assertThrows(AssertionError.class, () -> ea.sheet(99));
}
}
@@ -99,7 +98,7 @@ class ExcelAssertionsTest {
void nullRowThrows() {
File file = writeSimpleFile("test.xlsx");
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
- assertThrows(AssertionError.class, () -> ea.sheet(0).row(999));
+ Assertions.assertThrows(AssertionError.class, () -> ea.sheet(0).row(999));
}
}
@@ -107,7 +106,8 @@ class ExcelAssertionsTest {
void nullCellThrows() {
File file = writeSimpleFile("test.xlsx");
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
- assertThrows(AssertionError.class, () -> ea.sheet(0).row(0).cell(999));
+ Assertions.assertThrows(
+ AssertionError.class, () -> ea.sheet(0).row(0).cell(999));
}
}
@@ -127,7 +127,8 @@ class ExcelAssertionsTest {
void stringValueIncorrectThrows() {
File file = writeSimpleFile("test.xlsx");
try (ExcelAssertions ea = ExcelAssertions.assertThat(file)) {
- assertThrows(AssertionError.class, () -> ea.sheet(0).row(1).cell(0).hasStringValue("wrong"));
+ Assertions.assertThrows(
+ AssertionError.class, () -> ea.sheet(0).row(1).cell(0).hasStringValue("wrong"));
}
}
@@ -147,7 +148,8 @@ class ExcelAssertionsTest {
ea.sheet(0)
.row(1)
.cell(0)
- .satisfies(cell -> assertTrue(cell.getStringCellValue().startsWith("Name")));
+ .satisfies(cell ->
+ Assertions.assertTrue(cell.getStringCellValue().startsWith("Name")));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/builders/TestDataBuilderTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/builders/TestDataBuilderTest.java
index 40563e1f..70ecac50 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/builders/TestDataBuilderTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/builders/TestDataBuilderTest.java
@@ -19,9 +19,6 @@
package org.apache.fesod.sheet.testkit.builders;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.List;
import org.apache.fesod.sheet.converter.ConverterWriteData;
import org.apache.fesod.sheet.style.FillAnnotationData;
@@ -31,6 +28,7 @@ import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.models.SimpleData;
import org.apache.fesod.sheet.util.DateUtils;
import org.apache.fesod.sheet.util.TestUtil;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -40,86 +38,89 @@ class TestDataBuilderTest {
@Test
void simpleDataCountAccuracy() {
List<SimpleData> data = TestDataBuilder.simpleData(10);
- assertEquals(10, data.size());
+ Assertions.assertEquals(10, data.size());
for (SimpleData d : data) {
- assertNotNull(d);
- assertNotNull(d.getName());
+ Assertions.assertNotNull(d);
+ Assertions.assertNotNull(d.getName());
}
}
@Test
void simpleDataFieldValues() {
List<SimpleData> data = TestDataBuilder.simpleData(3);
- assertEquals("Name0", data.get(0).getName());
- assertEquals("Name1", data.get(1).getName());
- assertEquals("Name2", data.get(2).getName());
+ Assertions.assertEquals("Name0", data.get(0).getName());
+ Assertions.assertEquals("Name1", data.get(1).getName());
+ Assertions.assertEquals("Name2", data.get(2).getName());
}
@Test
void simpleDataSingleElement() {
List<SimpleData> data = TestDataBuilder.simpleData(1);
- assertEquals(1, data.size());
- assertEquals("Name0", data.get(0).getName());
+ Assertions.assertEquals(1, data.size());
+ Assertions.assertEquals("Name0", data.get(0).getName());
}
@Test
void converterWriteDataNotEmpty() {
List<ConverterWriteData> data = TestDataBuilder.converterWriteData();
- assertFalse(data.isEmpty());
- assertEquals(1, data.size());
+ Assertions.assertFalse(data.isEmpty());
+ Assertions.assertEquals(1, data.size());
}
@Test
void converterWriteDataFieldValues() {
ConverterWriteData data = TestDataBuilder.converterWriteData().get(0);
- assertEquals(TestUtil.TEST_DATE, data.getDate());
- assertEquals(TestUtil.TEST_LOCAL_DATE, data.getLocalDate());
- assertEquals(TestUtil.TEST_LOCAL_DATE_TIME, data.getLocalDateTime());
- assertEquals(Boolean.TRUE, data.getBooleanData());
- assertEquals(1, data.getBigDecimal().intValue());
- assertEquals(1, data.getBigInteger().intValue());
- assertEquals(1L, data.getLongData());
- assertEquals(1, (int) data.getIntegerData());
- assertEquals((short) 1, (short) data.getShortData());
- assertEquals((byte) 1, (byte) data.getByteData());
- assertEquals(1.0, data.getDoubleData(), 0.0);
- assertEquals((float) 1.0, data.getFloatData(), 0.0);
- assertEquals("test", data.getString());
- assertEquals("custom", data.getCellData().getStringValue());
+ 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(Boolean.TRUE, data.getBooleanData());
+ Assertions.assertEquals(1, data.getBigDecimal().intValue());
+ Assertions.assertEquals(1, data.getBigInteger().intValue());
+ Assertions.assertEquals(1L, data.getLongData());
+ Assertions.assertEquals(1, (int) data.getIntegerData());
+ Assertions.assertEquals((short) 1, (short) data.getShortData());
+ Assertions.assertEquals((byte) 1, (byte) data.getByteData());
+ Assertions.assertEquals(1.0, data.getDoubleData(), 0.0);
+ Assertions.assertEquals((float) 1.0, data.getFloatData(), 0.0);
+ Assertions.assertEquals("test", data.getString());
+ Assertions.assertEquals("custom", data.getCellData().getStringValue());
}
@Test
void fillStyleDataMatchesLegacyFixtures() throws Exception {
List<FillStyleData> data = TestDataBuilder.fillStyleData(10);
- assertEquals(10, data.size());
- assertEquals("Zhang San", data.get(0).getName());
- assertEquals(5.2, data.get(0).getNumber(), 0.0);
- assertEquals("2020-01-01 01:01:01", DateUtils.format(data.get(0).getDate(), "yyyy-MM-dd HH:mm:ss"));
- assertEquals(null, data.get(5).getName());
+ Assertions.assertEquals(10, data.size());
+ Assertions.assertEquals("Zhang San", data.get(0).getName());
+ Assertions.assertEquals(5.2, data.get(0).getNumber(), 0.0);
+ Assertions.assertEquals(
+ "2020-01-01 01:01:01", DateUtils.format(data.get(0).getDate(), "yyyy-MM-dd HH:mm:ss"));
+ Assertions.assertEquals(null, data.get(5).getName());
}
@Test
void fillStyleAnnotatedDataMatchesLegacyFixtures() throws Exception {
List<FillStyleAnnotatedData> data = TestDataBuilder.fillStyleAnnotatedData(10);
- assertEquals(10, data.size());
- assertEquals("Zhang San", data.get(0).getName());
- assertEquals(5.2, data.get(0).getNumber(), 0.0);
- assertEquals(null, data.get(5).getName());
+ Assertions.assertEquals(10, data.size());
+ Assertions.assertEquals("Zhang San", data.get(0).getName());
+ Assertions.assertEquals(5.2, data.get(0).getNumber(), 0.0);
+ Assertions.assertEquals(null, data.get(5).getName());
}
@Test
void fillAnnotationDataMatchesLegacyFixtures() throws Exception {
List<FillAnnotationData> data = TestDataBuilder.fillAnnotationData(5, "image-path");
- assertEquals(5, data.size());
- assertEquals(99.99, data.get(0).getNumber(), 0.0);
- assertEquals("string1", data.get(0).getString1());
- assertEquals("string2", data.get(0).getString2());
- assertEquals("image-path", data.get(0).getImage());
+ Assertions.assertEquals(5, data.size());
+ Assertions.assertEquals(99.99, data.get(0).getNumber(), 0.0);
+ Assertions.assertEquals("string1", data.get(0).getString1());
+ Assertions.assertEquals("string2", data.get(0).getString2());
+ Assertions.assertEquals("image-path", data.get(0).getImage());
}
@Test
void titleDataMatchesExpectedPrefixPattern() {
- assertEquals("sheet-0", TestDataBuilder.titleData(2, "sheet-").get(0).getTitle());
- assertEquals("sheet-1", TestDataBuilder.titleData(2, "sheet-").get(1).getTitle());
+ Assertions.assertEquals(
+ "sheet-0", TestDataBuilder.titleData(2, "sheet-").get(0).getTitle());
+ Assertions.assertEquals(
+ "sheet-1", TestDataBuilder.titleData(2, "sheet-").get(1).getTitle());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/enums/ExcelFormatTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/enums/ExcelFormatTest.java
index 66e1519b..1323396f 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/enums/ExcelFormatTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/enums/ExcelFormatTest.java
@@ -19,14 +19,11 @@
package org.apache.fesod.sheet.testkit.enums;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
import org.apache.fesod.sheet.support.ExcelTypeEnum;
import org.apache.fesod.sheet.testkit.Tags;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -43,35 +40,35 @@ class ExcelFormatTest {
@Test
void xlsxCapabilities() {
- assertTrue(ExcelFormat.XLSX.supportsTemplates());
- assertTrue(ExcelFormat.XLSX.supportsImages());
- assertTrue(ExcelFormat.XLSX.supportsEncryption());
- assertTrue(ExcelFormat.XLSX.supportsStyles());
+ Assertions.assertTrue(ExcelFormat.XLSX.supportsTemplates());
+ Assertions.assertTrue(ExcelFormat.XLSX.supportsImages());
+ Assertions.assertTrue(ExcelFormat.XLSX.supportsEncryption());
+ Assertions.assertTrue(ExcelFormat.XLSX.supportsStyles());
}
@Test
void xlsCapabilities() {
- assertTrue(ExcelFormat.XLS.supportsTemplates());
- assertTrue(ExcelFormat.XLS.supportsImages());
- assertFalse(ExcelFormat.XLS.supportsEncryption());
- assertTrue(ExcelFormat.XLS.supportsStyles());
+ Assertions.assertTrue(ExcelFormat.XLS.supportsTemplates());
+ Assertions.assertTrue(ExcelFormat.XLS.supportsImages());
+ Assertions.assertFalse(ExcelFormat.XLS.supportsEncryption());
+ Assertions.assertTrue(ExcelFormat.XLS.supportsStyles());
}
@Test
void csvCapabilities() {
- assertFalse(ExcelFormat.CSV.supportsTemplates());
- assertFalse(ExcelFormat.CSV.supportsImages());
- assertFalse(ExcelFormat.CSV.supportsEncryption());
- assertFalse(ExcelFormat.CSV.supportsStyles());
+ Assertions.assertFalse(ExcelFormat.CSV.supportsTemplates());
+ Assertions.assertFalse(ExcelFormat.CSV.supportsImages());
+ Assertions.assertFalse(ExcelFormat.CSV.supportsEncryption());
+ Assertions.assertFalse(ExcelFormat.CSV.supportsStyles());
}
// --- Extension tests ---
@Test
void extensions() {
- assertEquals(".xlsx", ExcelFormat.XLSX.getExtension());
- assertEquals(".xls", ExcelFormat.XLS.getExtension());
- assertEquals(".csv", ExcelFormat.CSV.getExtension());
+ Assertions.assertEquals(".xlsx", ExcelFormat.XLSX.getExtension());
+ Assertions.assertEquals(".xls", ExcelFormat.XLS.getExtension());
+ Assertions.assertEquals(".csv", ExcelFormat.CSV.getExtension());
}
// --- Enum round-trip: toExcelTypeEnum / fromExcelTypeEnum ---
@@ -81,14 +78,14 @@ class ExcelFormatTest {
void enumRoundTrip(ExcelFormat format) {
ExcelTypeEnum type = format.toExcelTypeEnum();
ExcelFormat roundTripped = ExcelFormat.fromExcelTypeEnum(type);
- assertEquals(format, roundTripped);
+ Assertions.assertEquals(format, roundTripped);
}
@Test
void toExcelTypeEnumMapping() {
- assertEquals(ExcelTypeEnum.XLSX, ExcelFormat.XLSX.toExcelTypeEnum());
- assertEquals(ExcelTypeEnum.XLS, ExcelFormat.XLS.toExcelTypeEnum());
- assertEquals(ExcelTypeEnum.CSV, ExcelFormat.CSV.toExcelTypeEnum());
+ Assertions.assertEquals(ExcelTypeEnum.XLSX, ExcelFormat.XLSX.toExcelTypeEnum());
+ Assertions.assertEquals(ExcelTypeEnum.XLS, ExcelFormat.XLS.toExcelTypeEnum());
+ Assertions.assertEquals(ExcelTypeEnum.CSV, ExcelFormat.CSV.toExcelTypeEnum());
}
// --- Temp file tests ---
@@ -97,10 +94,10 @@ class ExcelFormatTest {
@EnumSource(ExcelFormat.class)
void createTempFileHasCorrectExtension(ExcelFormat format) throws IOException {
File file = format.createTempFile("test", tempDir);
- assertTrue(
+ Assertions.assertTrue(
file.getName().endsWith(format.getExtension()),
"Expected file name to end with " + format.getExtension() + ", got: " + file.getName());
- assertEquals(tempDir, file.getParentFile());
+ Assertions.assertEquals(tempDir, file.getParentFile());
}
@ParameterizedTest
@@ -108,10 +105,10 @@ class ExcelFormatTest {
void createTempFileInSystemTempDir(ExcelFormat format) throws IOException {
File file = format.createTempFile("test");
try {
- assertTrue(
+ Assertions.assertTrue(
file.getName().endsWith(format.getExtension()),
"Expected file name to end with " + format.getExtension() + ", got: " + file.getName());
- assertTrue(file.exists());
+ Assertions.assertTrue(file.exists());
} finally {
file.delete();
}
@@ -121,6 +118,6 @@ class ExcelFormatTest {
@Test
void fromExcelTypeEnumWithNull() {
- assertThrows(IllegalArgumentException.class, () -> ExcelFormat.fromExcelTypeEnum(null));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> ExcelFormat.fromExcelTypeEnum(null));
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/helpers/RoundTripHelperTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/helpers/RoundTripHelperTest.java
index 6e8e2647..a7bc9617 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/helpers/RoundTripHelperTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/helpers/RoundTripHelperTest.java
@@ -19,9 +19,6 @@
package org.apache.fesod.sheet.testkit.helpers;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,6 +27,7 @@ import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.testkit.enums.ApiMode;
import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
import org.apache.fesod.sheet.testkit.models.SimpleData;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,9 +57,9 @@ class RoundTripHelperTest {
List<SimpleData> result = RoundTripHelper.writeAndRead(file, SimpleData.class, data);
- assertEquals(10, result.size());
- assertEquals("Name0", result.get(0).getName());
- assertEquals("Name9", result.get(9).getName());
+ Assertions.assertEquals(10, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals("Name9", result.get(9).getName());
}
@ParameterizedTest
@@ -72,9 +70,9 @@ class RoundTripHelperTest {
List<SimpleData> result = RoundTripHelper.writeAndReadViaStream(file, format, SimpleData.class, data);
- assertEquals(5, result.size());
- assertEquals("Name0", result.get(0).getName());
- assertEquals("Name4", result.get(4).getName());
+ Assertions.assertEquals(5, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals("Name4", result.get(4).getName());
}
@ParameterizedTest
@@ -85,8 +83,8 @@ class RoundTripHelperTest {
List<SimpleData> result = RoundTripHelper.writeAndReadSync(file, SimpleData.class, data);
- assertEquals(3, result.size());
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(3, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@ParameterizedTest
@@ -97,8 +95,8 @@ class RoundTripHelperTest {
List<SimpleData> result = RoundTripHelper.writeAndRead(file, format, ApiMode.FILE, SimpleData.class, data);
- assertEquals(7, result.size());
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(7, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@ParameterizedTest
@@ -109,8 +107,8 @@ class RoundTripHelperTest {
List<SimpleData> result = RoundTripHelper.writeAndRead(file, format, ApiMode.STREAM, SimpleData.class, data);
- assertEquals(7, result.size());
- assertEquals("Name0", result.get(0).getName());
+ Assertions.assertEquals(7, result.size());
+ Assertions.assertEquals("Name0", result.get(0).getName());
}
@ParameterizedTest
@@ -124,9 +122,10 @@ class RoundTripHelperTest {
File fileB = format.createTempFile("rth-fb", tempDir);
List<SimpleData> streamResult = RoundTripHelper.writeAndReadViaStream(fileB, format, SimpleData.class, data);
- assertEquals(fileResult.size(), streamResult.size());
+ Assertions.assertEquals(fileResult.size(), streamResult.size());
for (int i = 0; i < fileResult.size(); i++) {
- assertEquals(fileResult.get(i).getName(), streamResult.get(i).getName());
+ Assertions.assertEquals(
+ fileResult.get(i).getName(), streamResult.get(i).getName());
}
}
@@ -139,8 +138,8 @@ class RoundTripHelperTest {
RoundTripHelper.write(file, SimpleData.class, data);
List<SimpleData> result = RoundTripHelper.read(file, SimpleData.class);
- assertNotNull(result);
- assertFalse(result.isEmpty());
- assertEquals(4, result.size());
+ Assertions.assertNotNull(result);
+ Assertions.assertFalse(result.isEmpty());
+ Assertions.assertEquals(4, result.size());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/listeners/CollectingReadListenerTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/listeners/CollectingReadListenerTest.java
index a17f3832..0fcada1e 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/listeners/CollectingReadListenerTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/testkit/listeners/CollectingReadListenerTest.java
@@ -19,12 +19,10 @@
package org.apache.fesod.sheet.testkit.listeners;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.NoSuchElementException;
import org.apache.fesod.sheet.testkit.Tags;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -39,12 +37,12 @@ class CollectingReadListenerTest {
listener.invoke("row1", null);
listener.invoke("row2", null);
- assertEquals(3, listener.getRowCount());
+ Assertions.assertEquals(3, listener.getRowCount());
List<String> rows = listener.getRows();
- assertEquals(3, rows.size());
- assertEquals("row0", rows.get(0));
- assertEquals("row1", rows.get(1));
- assertEquals("row2", rows.get(2));
+ Assertions.assertEquals(3, rows.size());
+ Assertions.assertEquals("row0", rows.get(0));
+ Assertions.assertEquals("row1", rows.get(1));
+ Assertions.assertEquals("row2", rows.get(2));
}
@Test
@@ -53,9 +51,9 @@ class CollectingReadListenerTest {
listener.invoke("data", null);
List<String> rows = listener.getRows();
- assertThrows(UnsupportedOperationException.class, () -> rows.add("illegal"));
- assertThrows(UnsupportedOperationException.class, () -> rows.remove(0));
- assertThrows(UnsupportedOperationException.class, () -> rows.clear());
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> rows.add("illegal"));
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> rows.remove(0));
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> rows.clear());
}
@Test
@@ -63,12 +61,12 @@ class CollectingReadListenerTest {
CollectingReadListener<String> listener = new CollectingReadListener<String>();
listener.invoke("row0", null);
listener.invoke("row1", null);
- assertEquals(2, listener.getRowCount());
+ Assertions.assertEquals(2, listener.getRowCount());
listener.clear();
- assertEquals(0, listener.getRowCount());
- assertTrue(listener.getRows().isEmpty());
+ Assertions.assertEquals(0, listener.getRowCount());
+ Assertions.assertTrue(listener.getRows().isEmpty());
}
@Test
@@ -77,15 +75,16 @@ class CollectingReadListenerTest {
listener.invoke("first", null);
listener.invoke("second", null);
- assertEquals("first", listener.getFirstRow());
+ Assertions.assertEquals("first", listener.getFirstRow());
}
@Test
void getFirstRowOnEmptyThrowsNoSuchElement() {
CollectingReadListener<String> listener = new CollectingReadListener<String>();
- NoSuchElementException error = assertThrows(NoSuchElementException.class, () -> listener.getFirstRow());
- assertTrue(error.getMessage().contains("at least one row"));
+ NoSuchElementException error =
+ Assertions.assertThrows(NoSuchElementException.class, () -> listener.getFirstRow());
+ Assertions.assertTrue(error.getMessage().contains("at least one row"));
}
@Test
@@ -96,15 +95,15 @@ class CollectingReadListenerTest {
// should not throw or modify state
listener.doAfterAllAnalysed(null);
- assertEquals(1, listener.getRowCount());
- assertEquals("data", listener.getFirstRow());
+ Assertions.assertEquals(1, listener.getRowCount());
+ Assertions.assertEquals("data", listener.getFirstRow());
}
@Test
void emptyListenerHasZeroRows() {
CollectingReadListener<String> listener = new CollectingReadListener<String>();
- assertEquals(0, listener.getRowCount());
- assertTrue(listener.getRows().isEmpty());
+ Assertions.assertEquals(0, listener.getRowCount());
+ Assertions.assertTrue(listener.getRows().isEmpty());
}
}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java
index a68a214b..8dfaf97c 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java
@@ -19,17 +19,16 @@
package org.apache.fesod.sheet.write.handler.impl;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
import org.apache.fesod.sheet.testkit.Tags;
import org.apache.fesod.sheet.write.metadata.holder.WriteSheetHolder;
import org.apache.fesod.sheet.write.metadata.holder.WriteWorkbookHolder;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
@Tag(Tags.UNIT)
class DimensionWorkbookWriteHandlerTest {
@@ -38,16 +37,16 @@ class DimensionWorkbookWriteHandlerTest {
void afterWorkbookDispose_shouldNotThrowNPE_whenMapContainsNullValue() {
// Given
DimensionWorkbookWriteHandler handler = new DimensionWorkbookWriteHandler();
- WriteWorkbookHolder writeWorkbookHolder = mock(WriteWorkbookHolder.class);
- SXSSFWorkbook workbook = mock(SXSSFWorkbook.class);
+ WriteWorkbookHolder writeWorkbookHolder = Mockito.mock(WriteWorkbookHolder.class);
+ SXSSFWorkbook workbook = Mockito.mock(SXSSFWorkbook.class);
Map<Integer, WriteSheetHolder> sheetHolderMap = new HashMap<>();
sheetHolderMap.put(0, null); // null entry that caused NPE
- when(writeWorkbookHolder.getWorkbook()).thenReturn(workbook);
- when(writeWorkbookHolder.getHasBeenInitializedSheetIndexMap()).thenReturn(sheetHolderMap);
+ Mockito.when(writeWorkbookHolder.getWorkbook()).thenReturn(workbook);
+ Mockito.when(writeWorkbookHolder.getHasBeenInitializedSheetIndexMap()).thenReturn(sheetHolderMap);
// When & Then
- assertDoesNotThrow(() -> handler.afterWorkbookDispose(writeWorkbookHolder));
+ Assertions.assertDoesNotThrow(() -> handler.afterWorkbookDispose(writeWorkbookHolder));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@fesod.apache.org
For additional commands, e-mail: commits-help@fesod.apache.org