update to junit5

hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java

@@ -2,8 +2,8 @@ package cn.hutool.poi.csv;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 
@@ -15,7 +15,7 @@ public class CsvParserTest {
 		final CsvParser parser = new CsvParser(reader, null);
 		final CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("b\"bba\"", row.getRawList().get(1));
+		Assertions.assertEquals("b\"bba\"", row.getRawList().get(1));
 		IoUtil.closeQuietly(parser);
 	}
 
@@ -25,7 +25,7 @@ public class CsvParserTest {
 		final CsvParser parser = new CsvParser(reader, null);
 		final CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("\"bba\"bbb", row.getRawList().get(1));
+		Assertions.assertEquals("\"bba\"bbb", row.getRawList().get(1));
 		IoUtil.closeQuietly(parser);
 	}
 
@@ -35,7 +35,7 @@ public class CsvParserTest {
 		final CsvParser parser = new CsvParser(reader, null);
 		final CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("bba", row.getRawList().get(1));
+		Assertions.assertEquals("bba", row.getRawList().get(1));
 		IoUtil.closeQuietly(parser);
 	}
 
@@ -45,7 +45,7 @@ public class CsvParserTest {
 		final CsvParser parser = new CsvParser(reader, null);
 		final CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("", row.getRawList().get(1));
+		Assertions.assertEquals("", row.getRawList().get(1));
 		IoUtil.closeQuietly(parser);
 	}
 
@@ -56,8 +56,8 @@ public class CsvParserTest {
 		final StringReader reader = StrUtil.getReader("\"b\"\"bb\"");
 		final CsvParser parser = new CsvParser(reader, null);
 		final CsvRow row = parser.nextRow();
-		Assert.assertNotNull(row);
-		Assert.assertEquals(1, row.size());
-		Assert.assertEquals("b\"bb", row.get(0));
+		Assertions.assertNotNull(row);
+		Assertions.assertEquals(1, row.size());
+		Assertions.assertEquals("b\"bb", row.get(0));
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java

@@ -7,23 +7,24 @@ import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 
+@SuppressWarnings("resource")
 public class CsvReaderTest {
 
 	@Test
 	public void readTest() {
 		final CsvReader reader = new CsvReader();
 		final CsvData data = reader.read(ResourceUtil.getReader("test.csv", CharsetUtil.UTF_8));
-		Assert.assertEquals("sss,sss", data.getRow(0).get(0));
-		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("性别", data.getRow(0).get(2));
-		Assert.assertEquals("关注\"对象\"", data.getRow(0).get(3));
+		Assertions.assertEquals("sss,sss", data.getRow(0).get(0));
+		Assertions.assertEquals(1, data.getRow(0).getOriginalLineNumber());
+		Assertions.assertEquals("性别", data.getRow(0).get(2));
+		Assertions.assertEquals("关注\"对象\"", data.getRow(0).get(3));
 	}
 
 	@Test
@@ -32,20 +33,20 @@ public class CsvReaderTest {
 		final List<Map<String, String>> result = reader.readMapList(
 				ResourceUtil.getUtf8Reader("test_bean.csv"));
 
-		Assert.assertEquals("张三", result.get(0).get("姓名"));
-		Assert.assertEquals("男", result.get(0).get("gender"));
-		Assert.assertEquals("无", result.get(0).get("focus"));
-		Assert.assertEquals("33", result.get(0).get("age"));
+		Assertions.assertEquals("张三", result.get(0).get("姓名"));
+		Assertions.assertEquals("男", result.get(0).get("gender"));
+		Assertions.assertEquals("无", result.get(0).get("focus"));
+		Assertions.assertEquals("33", result.get(0).get("age"));
 
-		Assert.assertEquals("李四", result.get(1).get("姓名"));
-		Assert.assertEquals("男", result.get(1).get("gender"));
-		Assert.assertEquals("好对象", result.get(1).get("focus"));
-		Assert.assertEquals("23", result.get(1).get("age"));
+		Assertions.assertEquals("李四", result.get(1).get("姓名"));
+		Assertions.assertEquals("男", result.get(1).get("gender"));
+		Assertions.assertEquals("好对象", result.get(1).get("focus"));
+		Assertions.assertEquals("23", result.get(1).get("age"));
 
-		Assert.assertEquals("王妹妹", result.get(2).get("姓名"));
-		Assert.assertEquals("女", result.get(2).get("gender"));
-		Assert.assertEquals("特别关注", result.get(2).get("focus"));
-		Assert.assertEquals("22", result.get(2).get("age"));
+		Assertions.assertEquals("王妹妹", result.get(2).get("姓名"));
+		Assertions.assertEquals("女", result.get(2).get("gender"));
+		Assertions.assertEquals("特别关注", result.get(2).get("focus"));
+		Assertions.assertEquals("22", result.get(2).get("age"));
 	}
 
 	@Test
@@ -57,20 +58,20 @@ public class CsvReaderTest {
 		final List<Map<String, String>> result = reader.readMapList(
 				ResourceUtil.getUtf8Reader("test_bean.csv"));
 
-		Assert.assertEquals("张三", result.get(0).get("name"));
-		Assert.assertEquals("男", result.get(0).get("gender"));
-		Assert.assertEquals("无", result.get(0).get("focus"));
-		Assert.assertEquals("33", result.get(0).get("age"));
+		Assertions.assertEquals("张三", result.get(0).get("name"));
+		Assertions.assertEquals("男", result.get(0).get("gender"));
+		Assertions.assertEquals("无", result.get(0).get("focus"));
+		Assertions.assertEquals("33", result.get(0).get("age"));
 
-		Assert.assertEquals("李四", result.get(1).get("name"));
-		Assert.assertEquals("男", result.get(1).get("gender"));
-		Assert.assertEquals("好对象", result.get(1).get("focus"));
-		Assert.assertEquals("23", result.get(1).get("age"));
+		Assertions.assertEquals("李四", result.get(1).get("name"));
+		Assertions.assertEquals("男", result.get(1).get("gender"));
+		Assertions.assertEquals("好对象", result.get(1).get("focus"));
+		Assertions.assertEquals("23", result.get(1).get("age"));
 
-		Assert.assertEquals("王妹妹", result.get(2).get("name"));
-		Assert.assertEquals("女", result.get(2).get("gender"));
-		Assert.assertEquals("特别关注", result.get(2).get("focus"));
-		Assert.assertEquals("22", result.get(2).get("age"));
+		Assertions.assertEquals("王妹妹", result.get(2).get("name"));
+		Assertions.assertEquals("女", result.get(2).get("gender"));
+		Assertions.assertEquals("特别关注", result.get(2).get("focus"));
+		Assertions.assertEquals("22", result.get(2).get("age"));
 	}
 
 	@Test
@@ -79,20 +80,20 @@ public class CsvReaderTest {
 		final List<TestBean> result = reader.read(
 				ResourceUtil.getUtf8Reader("test_bean.csv"), TestBean.class);
 
-		Assert.assertEquals("张三", result.get(0).getName());
-		Assert.assertEquals("男", result.get(0).getGender());
-		Assert.assertEquals("无", result.get(0).getFocus());
-		Assert.assertEquals(Integer.valueOf(33), result.get(0).getAge());
+		Assertions.assertEquals("张三", result.get(0).getName());
+		Assertions.assertEquals("男", result.get(0).getGender());
+		Assertions.assertEquals("无", result.get(0).getFocus());
+		Assertions.assertEquals(Integer.valueOf(33), result.get(0).getAge());
 
-		Assert.assertEquals("李四", result.get(1).getName());
-		Assert.assertEquals("男", result.get(1).getGender());
-		Assert.assertEquals("好对象", result.get(1).getFocus());
-		Assert.assertEquals(Integer.valueOf(23), result.get(1).getAge());
+		Assertions.assertEquals("李四", result.get(1).getName());
+		Assertions.assertEquals("男", result.get(1).getGender());
+		Assertions.assertEquals("好对象", result.get(1).getFocus());
+		Assertions.assertEquals(Integer.valueOf(23), result.get(1).getAge());
 
-		Assert.assertEquals("王妹妹", result.get(2).getName());
-		Assert.assertEquals("女", result.get(2).getGender());
-		Assert.assertEquals("特别关注", result.get(2).getFocus());
-		Assert.assertEquals(Integer.valueOf(22), result.get(2).getAge());
+		Assertions.assertEquals("王妹妹", result.get(2).getName());
+		Assertions.assertEquals("女", result.get(2).getGender());
+		Assertions.assertEquals("特别关注", result.get(2).getFocus());
+		Assertions.assertEquals(Integer.valueOf(22), result.get(2).getAge());
 	}
 
 	@Data
@@ -105,7 +106,7 @@ public class CsvReaderTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest2() {
 		final CsvReader reader = CsvUtil.getReader();
 		final CsvData read = reader.read(FileUtil.file("d:/test/test.csv"));
@@ -115,7 +116,7 @@ public class CsvReaderTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest3() {
 		final CsvReadConfig csvReadConfig = CsvReadConfig.defaultConfig();
 		csvReadConfig.setContainsHeader(true);
@@ -130,16 +131,16 @@ public class CsvReaderTest {
 	public void lineNoTest() {
 		final CsvReader reader = new CsvReader();
 		final CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
-		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("a,b,c,d", CollUtil.join(data.getRow(0), ","));
+		Assertions.assertEquals(1, data.getRow(0).getOriginalLineNumber());
+		Assertions.assertEquals("a,b,c,d", CollUtil.join(data.getRow(0), ","));
 
-		Assert.assertEquals(4, data.getRow(2).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		Assertions.assertEquals(4, data.getRow(2).getOriginalLineNumber());
+		Assertions.assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(2), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(3).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(3), ","));
+		Assertions.assertEquals(6, data.getRow(3).getOriginalLineNumber());
+		Assertions.assertEquals("a,s,d,f", CollUtil.join(data.getRow(3), ","));
 	}
 
 	@Test
@@ -148,16 +149,16 @@ public class CsvReaderTest {
 		final CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2));
 		final CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
 
-		Assert.assertEquals(2, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("1,2,3,4", CollUtil.join(data.getRow(0), ","));
+		Assertions.assertEquals(2, data.getRow(0).getOriginalLineNumber());
+		Assertions.assertEquals("1,2,3,4", CollUtil.join(data.getRow(0), ","));
 
-		Assert.assertEquals(4, data.getRow(1).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		Assertions.assertEquals(4, data.getRow(1).getOriginalLineNumber());
+		Assertions.assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(1), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(2).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(2), ","));
+		Assertions.assertEquals(6, data.getRow(2).getOriginalLineNumber());
+		Assertions.assertEquals("a,s,d,f", CollUtil.join(data.getRow(2), ","));
 	}
 
 	@Test
@@ -166,13 +167,13 @@ public class CsvReaderTest {
 		final CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2).setContainsHeader(true));
 		final CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.UTF_8));
 
-		Assert.assertEquals(4, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		Assertions.assertEquals(4, data.getRow(0).getOriginalLineNumber());
+		Assertions.assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(0), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(1).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(1), ","));
+		Assertions.assertEquals(6, data.getRow(1).getOriginalLineNumber());
+		Assertions.assertEquals("a,s,d,f", CollUtil.join(data.getRow(1), ","));
 	}
 
 	@Test
@@ -183,9 +184,9 @@ public class CsvReaderTest {
 						.setFieldSeparator(';'));
 		final CsvData csvRows = reader.readFromStr("123;456;'789;0'abc;");
 		final CsvRow row = csvRows.getRow(0);
-		Assert.assertEquals("123", row.get(0));
-		Assert.assertEquals("456", row.get(1));
-		Assert.assertEquals("'789;0'abc", row.get(2));
+		Assertions.assertEquals("123", row.get(0));
+		Assertions.assertEquals("456", row.get(1));
+		Assertions.assertEquals("'789;0'abc", row.get(2));
 	}
 
 	@Test
@@ -193,18 +194,18 @@ public class CsvReaderTest {
 		final CsvReader reader = CsvUtil.getReader(CsvReadConfig.defaultConfig().disableComment());
 		final CsvData read = reader.read(ResourceUtil.getUtf8Reader("test.csv"));
 		final CsvRow row = read.getRow(0);
-		Assert.assertEquals("# 这是一行注释，读取时应忽略", row.get(0));
+		Assertions.assertEquals("# 这是一行注释，读取时应忽略", row.get(0));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void streamTest() {
 		final CsvReader reader = CsvUtil.getReader(ResourceUtil.getUtf8Reader("test_bean.csv"));
 		reader.stream().limit(2).forEach(Console::log);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue2306Test(){
 		final CsvReader reader = CsvUtil.getReader(ResourceUtil.getUtf8Reader("d:/test/issue2306.csv"));
 		final CsvData csvData = reader.read();

hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java

@@ -7,9 +7,9 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,13 +26,13 @@ public class CsvUtilTest {
 		final CsvData data = reader.read(FileUtil.file("test.csv"));
 		final List<CsvRow> rows = data.getRows();
 		final CsvRow row0 = rows.get(0);
-		Assert.assertEquals("sss,sss", row0.get(0));
-		Assert.assertEquals("姓名", row0.get(1));
-		Assert.assertEquals("性别", row0.get(2));
-		Assert.assertEquals("关注\"对象\"", row0.get(3));
-		Assert.assertEquals("年龄", row0.get(4));
-		Assert.assertEquals("", row0.get(5));
-		Assert.assertEquals("\"", row0.get(6));
+		Assertions.assertEquals("sss,sss", row0.get(0));
+		Assertions.assertEquals("姓名", row0.get(1));
+		Assertions.assertEquals("性别", row0.get(2));
+		Assertions.assertEquals("关注\"对象\"", row0.get(3));
+		Assertions.assertEquals("年龄", row0.get(4));
+		Assertions.assertEquals("", row0.get(5));
+		Assertions.assertEquals("\"", row0.get(6));
 	}
 
 	@Test
@@ -40,18 +40,18 @@ public class CsvUtilTest {
 		final CsvReader reader = CsvUtil.getReader();
 		reader.read(FileUtil.getUtf8Reader("test.csv"), (csvRow)-> {
 			// 只有一行，所以直接判断
-			Assert.assertEquals("sss,sss", csvRow.get(0));
-			Assert.assertEquals("姓名", csvRow.get(1));
-			Assert.assertEquals("性别", csvRow.get(2));
-			Assert.assertEquals("关注\"对象\"", csvRow.get(3));
-			Assert.assertEquals("年龄", csvRow.get(4));
-			Assert.assertEquals("", csvRow.get(5));
-			Assert.assertEquals("\"", csvRow.get(6));
+			Assertions.assertEquals("sss,sss", csvRow.get(0));
+			Assertions.assertEquals("姓名", csvRow.get(1));
+			Assertions.assertEquals("性别", csvRow.get(2));
+			Assertions.assertEquals("关注\"对象\"", csvRow.get(3));
+			Assertions.assertEquals("年龄", csvRow.get(4));
+			Assertions.assertEquals("", csvRow.get(5));
+			Assertions.assertEquals("\"", csvRow.get(6));
 		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest3() {
 		final CsvReader reader = CsvUtil.getReader();
 		final String path = FileUtil.isWindows() ? "d:/test/test.csv" : "~/test/test.csv";
@@ -64,13 +64,13 @@ public class CsvUtilTest {
 				"\"sss,sss\",姓名,\"性别\",关注\"对象\",年龄,\"\",\"\"\"\n");
 		final List<CsvRow> rows = data.getRows();
 		final CsvRow row0 = rows.get(0);
-		Assert.assertEquals("sss,sss", row0.get(0));
-		Assert.assertEquals("姓名", row0.get(1));
-		Assert.assertEquals("性别", row0.get(2));
-		Assert.assertEquals("关注\"对象\"", row0.get(3));
-		Assert.assertEquals("年龄", row0.get(4));
-		Assert.assertEquals("", row0.get(5));
-		Assert.assertEquals("\"", row0.get(6));
+		Assertions.assertEquals("sss,sss", row0.get(0));
+		Assertions.assertEquals("姓名", row0.get(1));
+		Assertions.assertEquals("性别", row0.get(2));
+		Assertions.assertEquals("关注\"对象\"", row0.get(3));
+		Assertions.assertEquals("年龄", row0.get(4));
+		Assertions.assertEquals("", row0.get(5));
+		Assertions.assertEquals("\"", row0.get(6));
 	}
 
 	@Test
@@ -78,18 +78,18 @@ public class CsvUtilTest {
 		CsvUtil.getReader().readFromStr("# 这是一行注释，读取时应忽略\n" +
 				"\"sss,sss\",姓名,\"性别\",关注\"对象\",年龄,\"\",\"\"\"\n",(csvRow)-> {
 			// 只有一行，所以直接判断
-			Assert.assertEquals("sss,sss", csvRow.get(0));
-			Assert.assertEquals("姓名", csvRow.get(1));
-			Assert.assertEquals("性别", csvRow.get(2));
-			Assert.assertEquals("关注\"对象\"", csvRow.get(3));
-			Assert.assertEquals("年龄", csvRow.get(4));
-			Assert.assertEquals("", csvRow.get(5));
-			Assert.assertEquals("\"", csvRow.get(6));
+			Assertions.assertEquals("sss,sss", csvRow.get(0));
+			Assertions.assertEquals("姓名", csvRow.get(1));
+			Assertions.assertEquals("性别", csvRow.get(2));
+			Assertions.assertEquals("关注\"对象\"", csvRow.get(3));
+			Assertions.assertEquals("年龄", csvRow.get(4));
+			Assertions.assertEquals("", csvRow.get(5));
+			Assertions.assertEquals("\"", csvRow.get(6));
 		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final String path = FileUtil.isWindows() ? "d:/test/testWrite.csv" : "~/test/testWrite.csv";
 		final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
@@ -101,7 +101,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeansTest() {
 
 		@Data
@@ -137,7 +137,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readLfTest(){
 		final CsvReader reader = CsvUtil.getReader();
 		final String path = FileUtil.isWindows() ? "d:/test/rw_test.csv" : "~/test/rw_test.csv";
@@ -148,7 +148,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWrapTest(){
 		final List<List<Object>> resultList=new ArrayList<>();
 		List<Object> list =new ArrayList<>();
@@ -167,7 +167,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDataTest(){
 		@Data
 		@AllArgsConstructor

hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java

@@ -3,8 +3,8 @@ package cn.hutool.poi.csv;
 import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -14,7 +14,7 @@ import java.util.Random;
 public class CsvWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithAliasTest(){
 		final CsvWriteConfig csvWriteConfig = CsvWriteConfig.defaultConfig()
 				.addHeaderAlias("name", "姓名")
@@ -31,7 +31,7 @@ public class CsvWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue2255Test(){
 		final String fileName = "D:/test/" + new Random().nextInt(100) + "-a.csv";
 		final CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.UTF_8);
@@ -47,7 +47,7 @@ public class CsvWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue3014Test(){
 		// https://blog.csdn.net/weixin_42522167/article/details/112241143
 		final File tmp = new File("d:/test/dde_safe.csv");

hutool-poi/src/test/java/cn/hutool/poi/csv/Issue2783Test.java

@@ -3,13 +3,13 @@ package cn.hutool.poi.csv;
 import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.lang.func.SerConsumer;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue2783Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest() {
 		// 测试数据
 		final CsvWriter writer = CsvUtil.getWriter("d:/test/big.csv", CharsetUtil.UTF_8);

hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java

@@ -10,15 +10,10 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 写出Excel单元测试
@@ -28,7 +23,7 @@ import java.util.Map;
 public class BigExcelWriteTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		final BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("e:/excel/single_line.xlsx");
@@ -37,7 +32,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.now(), 3.22676575765);
 		final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.now(), 250.7676);
@@ -68,7 +63,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		final List<?> row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.now(), 3.22676575765);
 		final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.now(), 250.7676);
@@ -98,7 +93,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 		final Map<String, Object> row1 = new LinkedHashMap<>();
 		row1.put("姓名", "张三");
@@ -137,7 +132,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 		final Map<String, Object> row1 = MapUtil.newHashMap(true);
 		row1.put("姓名", "张三");
@@ -158,7 +153,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		final cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
 		bean1.setName("张三");
@@ -194,7 +189,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		final String path = "d:/test/cellValueTest.xlsx";
 		FileUtil.del(FileUtil.file(path));
@@ -204,7 +199,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void closeTest() {
 		final Map<String, ?> map1 = MapUtil.of("id", "123456");
 		final Map<String, ?> map2 = MapUtil.of("id", "123457");
@@ -217,7 +212,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue1210() {
 		// 通过工具类创建writer
 		final String path = "d:/test/issue1210.xlsx";

hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java

@@ -4,25 +4,25 @@ import cn.hutool.poi.excel.cell.CellEditor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 
 import java.io.Serializable;
 import java.util.List;
 
 public class CellEditorTest {
 
-	@org.junit.Test
+	@org.junit.jupiter.api.Test
 	public void readTest(){
 		final ExcelReader excelReader= ExcelUtil.getReader("cell_editor_test.xlsx");
 		excelReader.setCellEditor(new ExcelHandler());
 		final List<Test> excelReaderObjects=excelReader.readAll(Test.class);
 
-		Assert.assertEquals("0", excelReaderObjects.get(0).getTest1());
-		Assert.assertEquals("b", excelReaderObjects.get(0).getTest2());
-		Assert.assertEquals("0", excelReaderObjects.get(1).getTest1());
-		Assert.assertEquals("b1", excelReaderObjects.get(1).getTest2());
-		Assert.assertEquals("0", excelReaderObjects.get(2).getTest1());
-		Assert.assertEquals("c2", excelReaderObjects.get(2).getTest2());
+		Assertions.assertEquals("0", excelReaderObjects.get(0).getTest1());
+		Assertions.assertEquals("b", excelReaderObjects.get(0).getTest2());
+		Assertions.assertEquals("0", excelReaderObjects.get(1).getTest1());
+		Assertions.assertEquals("b1", excelReaderObjects.get(1).getTest2());
+		Assertions.assertEquals("0", excelReaderObjects.get(2).getTest1());
+		Assertions.assertEquals("c2", excelReaderObjects.get(2).getTest2());
 	}
 
 	@AllArgsConstructor

hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java

@@ -1,15 +1,14 @@
 package cn.hutool.poi.excel;
 
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import cn.hutool.core.lang.Console;
+import org.apache.poi.ss.usermodel.BuiltinFormats;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class CellUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void isDateTest() {
 		final String[] all = BuiltinFormats.getAll();
 		for(int i = 0 ; i < all.length; i++) {

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java

@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 
@@ -13,8 +13,8 @@ public class ExcelFileUtilTest {
 	public void xlsTest(){
 		final InputStream in = FileUtil.getInputStream("aaa.xls");
 		try{
-			Assert.assertTrue(ExcelFileUtil.isXls(in));
-			Assert.assertFalse(ExcelFileUtil.isXlsx(in));
+			Assertions.assertTrue(ExcelFileUtil.isXls(in));
+			Assertions.assertFalse(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.closeQuietly(in);
 		}
@@ -24,8 +24,8 @@ public class ExcelFileUtilTest {
 	public void xlsxTest(){
 		final InputStream in = FileUtil.getInputStream("aaa.xlsx");
 		try{
-			Assert.assertFalse(ExcelFileUtil.isXls(in));
-			Assert.assertTrue(ExcelFileUtil.isXlsx(in));
+			Assertions.assertFalse(ExcelFileUtil.isXls(in));
+			Assertions.assertTrue(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.closeQuietly(in);
 		}

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java

@@ -7,9 +7,9 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjUtil;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -28,7 +28,7 @@ public class ExcelReadTest {
 
 		//读取单个单元格内容测试
 		final Object value = reader.readCellValue(1, 2);
-		Assert.assertEquals("仓库", value);
+		Assertions.assertEquals("仓库", value);
 
 		final Map<String, String> headerAlias = MapUtil.newHashMap();
 		headerAlias.put("用户姓名", "userName");
@@ -39,17 +39,17 @@ public class ExcelReadTest {
 
 		// 读取list时默认首个非空行为标题
 		final List<List<Object>> read = reader.read();
-		Assert.assertEquals("userName", read.get(0).get(0));
-		Assert.assertEquals("storageName", read.get(0).get(1));
-		Assert.assertEquals("checkPerm", read.get(0).get(2));
-		Assert.assertEquals("allotAuditPerm", read.get(0).get(3));
+		Assertions.assertEquals("userName", read.get(0).get(0));
+		Assertions.assertEquals("storageName", read.get(0).get(1));
+		Assertions.assertEquals("checkPerm", read.get(0).get(2));
+		Assertions.assertEquals("allotAuditPerm", read.get(0).get(3));
 
 		final List<Map<String, Object>> readAll = reader.readAll();
 		for (final Map<String, Object> map : readAll) {
-			Assert.assertTrue(map.containsKey("userName"));
-			Assert.assertTrue(map.containsKey("storageName"));
-			Assert.assertTrue(map.containsKey("checkPerm"));
-			Assert.assertTrue(map.containsKey("allotAuditPerm"));
+			Assertions.assertTrue(map.containsKey("userName"));
+			Assertions.assertTrue(map.containsKey("storageName"));
+			Assertions.assertTrue(map.containsKey("checkPerm"));
+			Assertions.assertTrue(map.containsKey("allotAuditPerm"));
 		}
 	}
 
@@ -58,7 +58,7 @@ public class ExcelReadTest {
 		final ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("priceIndex.xls"));
 		final List<Map<String, Object>> readAll = reader.readAll();
 
-		Assert.assertEquals(4, readAll.size());
+		Assertions.assertEquals(4, readAll.size());
 	}
 
 	@Test
@@ -67,22 +67,22 @@ public class ExcelReadTest {
 		final List<List<Object>> readAll = reader.read();
 
 		// 标题
-		Assert.assertEquals("姓名", readAll.get(0).get(0));
-		Assert.assertEquals("性别", readAll.get(0).get(1));
-		Assert.assertEquals("年龄", readAll.get(0).get(2));
-		Assert.assertEquals("鞋码", readAll.get(0).get(3));
+		Assertions.assertEquals("姓名", readAll.get(0).get(0));
+		Assertions.assertEquals("性别", readAll.get(0).get(1));
+		Assertions.assertEquals("年龄", readAll.get(0).get(2));
+		Assertions.assertEquals("鞋码", readAll.get(0).get(3));
 
 		// 第一行
-		Assert.assertEquals("张三", readAll.get(1).get(0));
-		Assert.assertEquals("男", readAll.get(1).get(1));
-		Assert.assertEquals(11L, readAll.get(1).get(2));
-		Assert.assertEquals(41.5D, readAll.get(1).get(3));
+		Assertions.assertEquals("张三", readAll.get(1).get(0));
+		Assertions.assertEquals("男", readAll.get(1).get(1));
+		Assertions.assertEquals(11L, readAll.get(1).get(2));
+		Assertions.assertEquals(41.5D, readAll.get(1).get(3));
 	}
 
 	@Test
 	public void excelReadAsTextTest() {
 		final ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
-		Assert.assertNotNull(reader.readAsText(false));
+		Assertions.assertNotNull(reader.readAsText(false));
 	}
 
 	@Test
@@ -95,16 +95,16 @@ public class ExcelReadTest {
 		// }
 
 		// 标题
-		Assert.assertEquals("姓名", readAll.get(0).get(0));
-		Assert.assertEquals("性别", readAll.get(0).get(1));
-		Assert.assertEquals("年龄", readAll.get(0).get(2));
-		Assert.assertEquals("分数", readAll.get(0).get(3));
+		Assertions.assertEquals("姓名", readAll.get(0).get(0));
+		Assertions.assertEquals("性别", readAll.get(0).get(1));
+		Assertions.assertEquals("年龄", readAll.get(0).get(2));
+		Assertions.assertEquals("分数", readAll.get(0).get(3));
 
 		// 第一行
-		Assert.assertEquals("张三", readAll.get(1).get(0));
-		Assert.assertEquals("男", readAll.get(1).get(1));
-		Assert.assertEquals(11L, readAll.get(1).get(2));
-		Assert.assertEquals(33.2D, readAll.get(1).get(3));
+		Assertions.assertEquals("张三", readAll.get(1).get(0));
+		Assertions.assertEquals("男", readAll.get(1).get(1));
+		Assertions.assertEquals(11L, readAll.get(1).get(2));
+		Assertions.assertEquals(33.2D, readAll.get(1).get(3));
 	}
 
 	@Test
@@ -113,11 +113,11 @@ public class ExcelReadTest {
 		final List<List<Object>> readAll = reader.read();
 
 		// 标题
-		Assert.assertEquals("班级", readAll.get(0).get(0));
-		Assert.assertEquals("年级", readAll.get(0).get(1));
-		Assert.assertEquals("学校", readAll.get(0).get(2));
-		Assert.assertEquals("入学时间", readAll.get(0).get(3));
-		Assert.assertEquals("更新时间", readAll.get(0).get(4));
+		Assertions.assertEquals("班级", readAll.get(0).get(0));
+		Assertions.assertEquals("年级", readAll.get(0).get(1));
+		Assertions.assertEquals("学校", readAll.get(0).get(2));
+		Assertions.assertEquals("入学时间", readAll.get(0).get(3));
+		Assertions.assertEquals("更新时间", readAll.get(0).get(4));
 	}
 
 	@Test
@@ -125,9 +125,9 @@ public class ExcelReadTest {
 		final ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
 		final List<Map<String, Object>> readAll = reader.readAll();
 
-		Assert.assertEquals("张三", readAll.get(0).get("姓名"));
-		Assert.assertEquals("男", readAll.get(0).get("性别"));
-		Assert.assertEquals(11L, readAll.get(0).get("年龄"));
+		Assertions.assertEquals("张三", readAll.get(0).get("姓名"));
+		Assertions.assertEquals("男", readAll.get(0).get("性别"));
+		Assertions.assertEquals(11L, readAll.get(0).get("年龄"));
 	}
 
 	@Test
@@ -139,14 +139,14 @@ public class ExcelReadTest {
 		reader.addHeaderAlias("鞋码", "shoeSize");
 
 		final List<Person> all = reader.readAll(Person.class);
-		Assert.assertEquals("张三", all.get(0).getName());
-		Assert.assertEquals("男", all.get(0).getGender());
-		Assert.assertEquals(Integer.valueOf(11), all.get(0).getAge());
-		Assert.assertEquals(new BigDecimal("41.5"), all.get(0).getShoeSize());
+		Assertions.assertEquals("张三", all.get(0).getName());
+		Assertions.assertEquals("男", all.get(0).getGender());
+		Assertions.assertEquals(Integer.valueOf(11), all.get(0).getAge());
+		Assertions.assertEquals(new BigDecimal("41.5"), all.get(0).getShoeSize());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void excelReadToBeanListTest2() {
 		final ExcelReader reader = ExcelUtil.getReader("f:/test/toBean.xlsx");
 		reader.addHeaderAlias("姓名", "name");
@@ -168,7 +168,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readDoubleTest() {
 		final ExcelReader reader = ExcelUtil.getReader("f:/test/doubleTest.xls");
 		final List<List<Object>> read = reader.read();
@@ -182,19 +182,19 @@ public class ExcelReadTest {
 		final ExcelReader reader = ExcelUtil.getReader("merge_test.xlsx");
 		final List<List<Object>> read = reader.read();
 		// 验证合并单元格在两行中都可以取到值
-		Assert.assertEquals(11L, read.get(1).get(2));
-		Assert.assertEquals(11L, read.get(2).get(2));
+		Assertions.assertEquals(11L, read.get(1).get(2));
+		Assertions.assertEquals(11L, read.get(2).get(2));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readCellsTest() {
 		final ExcelReader reader = ExcelUtil.getReader("merge_test.xlsx");
 		reader.read((cell, value)-> Console.log("{}, {} {}", cell.getRowIndex(), cell.getColumnIndex(), value));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest() {
 		// 测试合并单元格是否可以正常读到第一个单元格的值
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/人员体检信息表.xlsx");
@@ -211,17 +211,17 @@ public class ExcelReadTest {
 		final List<List<Object>> read = reader.read();
 
 		// 对于任意一个单元格有值的情况下，之前的单元格值按照null处理
-		Assert.assertEquals(1, read.get(1).size());
-		Assert.assertEquals(2, read.get(2).size());
-		Assert.assertEquals(3, read.get(3).size());
+		Assertions.assertEquals(1, read.get(1).size());
+		Assertions.assertEquals(2, read.get(2).size());
+		Assertions.assertEquals(3, read.get(3).size());
 
-		Assert.assertEquals("#", read.get(2).get(0));
-		Assert.assertEquals("#", read.get(3).get(0));
-		Assert.assertEquals("#", read.get(3).get(1));
+		Assertions.assertEquals("#", read.get(2).get(0));
+		Assertions.assertEquals("#", read.get(3).get(0));
+		Assertions.assertEquals("#", read.get(3).get(1));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readEmptyTest(){
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/issue.xlsx");
 		final List<Map<String, Object>> maps = reader.readAll();
@@ -229,7 +229,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readNullRowTest(){
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/1.-.xls");
 		reader.read((SerBiConsumer<Cell, Object>) Console::log);
@@ -240,10 +240,10 @@ public class ExcelReadTest {
 		final ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
 		final List<Object> objects = reader.readColumn(0, 1);
 
-		Assert.assertEquals(3, objects.size());
-		Assert.assertEquals("张三", objects.get(0));
-		Assert.assertEquals("李四", objects.get(1));
-		Assert.assertEquals("", objects.get(2));
+		Assertions.assertEquals(3, objects.size());
+		Assertions.assertEquals("张三", objects.get(0));
+		Assertions.assertEquals("李四", objects.get(1));
+		Assertions.assertEquals("", objects.get(2));
 	}
 
 	@Test

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java

@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.text.StrUtil;
 import cn.hutool.poi.excel.cell.values.FormulaCellValue;
@@ -11,9 +11,9 @@ import cn.hutool.poi.excel.sax.Excel03SaxReader;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.ss.usermodel.CellStyle;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -66,15 +66,17 @@ public class ExcelSaxReadTest {
 		reader.read("aaa.xls", "sheetName:校园入学");
 	}
 
-	@Test(expected = POIException.class)
+	@Test
 	public void excel03ByNameErrorTest() {
-		// sheet名称不存在则报错
-		final Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
-		reader.read("aaa.xls", "校园入学1");
+		Assertions.assertThrows(POIException.class, ()->{
+			// sheet名称不存在则报错
+			final Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
+			reader.read("aaa.xls", "校园入学1");
+		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBlankLineTest() {
 		ExcelUtil.readBySax("e:/ExcelBlankLine.xlsx", 0, (sheetIndex, rowIndex, rowList) -> {
 			if (StrUtil.isAllEmpty(Convert.toStrArray(rowList))) {
@@ -100,7 +102,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBySaxTest2() {
 		ExcelUtil.readBySax("d:/test/456789.xlsx", "0", (sheetIndex, rowIndex, rowList) -> Console.log(rowList));
 	}
@@ -110,13 +112,13 @@ public class ExcelSaxReadTest {
 //			Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist);
 			if (5 != rowIndex && 6 != rowIndex) {
 				// 测试样例中除第五行、第六行都为非空行
-				Assert.assertTrue(CollUtil.isNotEmpty(rowlist));
+				Assertions.assertTrue(CollUtil.isNotEmpty(rowlist));
 			}
 		};
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void handle07CellTest() {
 		ExcelUtil.readBySax("d:/test/test.xlsx", -1, new RowHandler() {
 
@@ -159,7 +161,7 @@ public class ExcelSaxReadTest {
 				rows.add("");
 			}
 		});
-		Assert.assertEquals(50L, rows.get(3));
+		Assertions.assertEquals(50L, rows.get(3));
 	}
 
 	@Test
@@ -169,7 +171,7 @@ public class ExcelSaxReadTest {
 				rows.add(list.get(1)));
 
 		final FormulaCellValue value = (FormulaCellValue) rows.get(3);
-		Assert.assertEquals(50L, value.getResult());
+		Assertions.assertEquals(50L, value.getResult());
 	}
 
 	@Test
@@ -179,11 +181,11 @@ public class ExcelSaxReadTest {
 				(i, i1, list) -> rows.add(StrUtil.toString(list.get(0)))
 		);
 
-		Assert.assertEquals("2020-10-09 00:00:00", rows.get(1));
+		Assertions.assertEquals("2020-10-09 00:00:00", rows.get(1));
 		// 非日期格式不做转换
-		Assert.assertEquals("112233", rows.get(2));
-		Assert.assertEquals("1000.0", rows.get(3));
-		Assert.assertEquals("2012-12-21 00:00:00", rows.get(4));
+		Assertions.assertEquals("112233", rows.get(2));
+		Assertions.assertEquals("1000.0", rows.get(3));
+		Assertions.assertEquals("2012-12-21 00:00:00", rows.get(4));
 	}
 
 	@Test
@@ -193,15 +195,15 @@ public class ExcelSaxReadTest {
 				(i, i1, list) -> rows.add(StrUtil.toString(list.get(0)))
 		);
 
-		Assert.assertEquals("2020-10-09 00:00:00", rows.get(1));
+		Assertions.assertEquals("2020-10-09 00:00:00", rows.get(1));
 		// 非日期格式不做转换
-		Assert.assertEquals("112233", rows.get(2));
-		Assert.assertEquals("1000.0", rows.get(3));
-		Assert.assertEquals("2012-12-21 00:00:00", rows.get(4));
+		Assertions.assertEquals("112233", rows.get(2));
+		Assertions.assertEquals("1000.0", rows.get(3));
+		Assertions.assertEquals("2012-12-21 00:00:00", rows.get(4));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dateReadXlsxTest2() {
 		ExcelUtil.readBySax("d:/test/custom_date_format2.xlsx", 0,
 				(i, i1, list) -> Console.log(list)
@@ -209,7 +211,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBlankTest() {
 		final File file = new File("D:/test/b.xlsx");
 
@@ -219,7 +221,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readXlsmTest() {
 		ExcelUtil.readBySax("d:/test/WhiteListTemplate.xlsm", -1,
 				(sheetIndex, rowIndex, rowlist) -> Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist));
@@ -241,6 +243,6 @@ public class ExcelSaxReadTest {
 			}
 		});
 		//总共2个sheet页，读取所有sheet时，一共执行doAfterAllAnalysed2次。
-		Assert.assertEquals(2, doAfterAllAnalysedTime.intValue());
+		Assertions.assertEquals(2, doAfterAllAnalysedTime.intValue());
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java

@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.poi.excel.cell.CellLocation;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -11,39 +11,39 @@ public class ExcelUtilTest {
 
 	@Test
 	public void indexToColNameTest() {
-		Assert.assertEquals("A", ExcelUtil.indexToColName(0));
-		Assert.assertEquals("B", ExcelUtil.indexToColName(1));
-		Assert.assertEquals("C", ExcelUtil.indexToColName(2));
+		Assertions.assertEquals("A", ExcelUtil.indexToColName(0));
+		Assertions.assertEquals("B", ExcelUtil.indexToColName(1));
+		Assertions.assertEquals("C", ExcelUtil.indexToColName(2));
 
-		Assert.assertEquals("AA", ExcelUtil.indexToColName(26));
-		Assert.assertEquals("AB", ExcelUtil.indexToColName(27));
-		Assert.assertEquals("AC", ExcelUtil.indexToColName(28));
+		Assertions.assertEquals("AA", ExcelUtil.indexToColName(26));
+		Assertions.assertEquals("AB", ExcelUtil.indexToColName(27));
+		Assertions.assertEquals("AC", ExcelUtil.indexToColName(28));
 
-		Assert.assertEquals("AAA", ExcelUtil.indexToColName(702));
-		Assert.assertEquals("AAB", ExcelUtil.indexToColName(703));
-		Assert.assertEquals("AAC", ExcelUtil.indexToColName(704));
+		Assertions.assertEquals("AAA", ExcelUtil.indexToColName(702));
+		Assertions.assertEquals("AAB", ExcelUtil.indexToColName(703));
+		Assertions.assertEquals("AAC", ExcelUtil.indexToColName(704));
 	}
 
 	@Test
 	public void colNameToIndexTest() {
-		Assert.assertEquals(704, ExcelUtil.colNameToIndex("AAC"));
-		Assert.assertEquals(703, ExcelUtil.colNameToIndex("AAB"));
-		Assert.assertEquals(702, ExcelUtil.colNameToIndex("AAA"));
+		Assertions.assertEquals(704, ExcelUtil.colNameToIndex("AAC"));
+		Assertions.assertEquals(703, ExcelUtil.colNameToIndex("AAB"));
+		Assertions.assertEquals(702, ExcelUtil.colNameToIndex("AAA"));
 
-		Assert.assertEquals(28, ExcelUtil.colNameToIndex("AC"));
-		Assert.assertEquals(27, ExcelUtil.colNameToIndex("AB"));
-		Assert.assertEquals(26, ExcelUtil.colNameToIndex("AA"));
+		Assertions.assertEquals(28, ExcelUtil.colNameToIndex("AC"));
+		Assertions.assertEquals(27, ExcelUtil.colNameToIndex("AB"));
+		Assertions.assertEquals(26, ExcelUtil.colNameToIndex("AA"));
 
-		Assert.assertEquals(2, ExcelUtil.colNameToIndex("C"));
-		Assert.assertEquals(1, ExcelUtil.colNameToIndex("B"));
-		Assert.assertEquals(0, ExcelUtil.colNameToIndex("A"));
+		Assertions.assertEquals(2, ExcelUtil.colNameToIndex("C"));
+		Assertions.assertEquals(1, ExcelUtil.colNameToIndex("B"));
+		Assertions.assertEquals(0, ExcelUtil.colNameToIndex("A"));
 	}
 
 	@Test
 	public void toLocationTest() {
 		final CellLocation a11 = ExcelUtil.toLocation("A11");
-		Assert.assertEquals(0, a11.getX());
-		Assert.assertEquals(10, a11.getY());
+		Assertions.assertEquals(0, a11.getX());
+		Assertions.assertEquals(10, a11.getY());
 	}
 
 	@Test
@@ -59,6 +59,6 @@ public class ExcelUtilTest {
 		final ExcelReader reader = ExcelUtil.getReader("aaa.xlsx", "12");
 		final List<Map<String, Object>> list = reader.readAll();
 		reader.close();
-		Assert.assertEquals(1L, list.get(1).get("鞋码"));
+		Assertions.assertEquals(1L, list.get(1).get("鞋码"));
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java

@@ -11,31 +11,15 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
 import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.common.usermodel.HyperlinkType;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Hyperlink;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 /**
  * 写出Excel单元测试
@@ -59,7 +43,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testRowOrColumnCellStyle() {
 		final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.now(), 3.22676575765);
 		final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.now(), 250.7676);
@@ -103,7 +87,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		final ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/excel/single_line.xlsx");
@@ -112,7 +96,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithSheetTest() {
 		final ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1");
 
@@ -132,7 +116,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final List<?> row1 = ListUtil.of("aaaaa", "bb", "cc", "dd", DateUtil.now(), 3.22676575765);
 		final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.now(), 250.7676);
@@ -167,7 +151,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		final List<?> row1 = ListUtil.of("aa", "bb", "cc", "dd", DateUtil.now(), 3.22676575765);
 		final List<?> row2 = ListUtil.of("aa1", "bb1", "cc1", "dd1", DateUtil.now(), 250.7676);
@@ -197,7 +181,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest2() {
 		final Map<String, Object> row1 = new LinkedHashMap<>();
 		row1.put("姓名", "张三");
@@ -227,7 +211,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 		final Map<String, Object> row1 = new LinkedHashMap<>();
 		row1.put("姓名", "张三");
@@ -264,7 +248,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 		final Map<String, Object> row1 = MapUtil.newHashMap(true);
 		row1.put("姓名", "张三");
@@ -283,7 +267,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapWithStyleTest() {
 		final Map<String, Object> row1 = MapUtil.newHashMap(true);
 		row1.put("姓名", "张三");
@@ -310,7 +294,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAliasTest() {
 		final Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -345,7 +329,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest() {
 		final Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -378,7 +362,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest2() {
 		final Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -408,7 +392,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest3() {
 		final Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -442,7 +426,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		final cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
 		bean1.setName("张三");
@@ -478,7 +462,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest2() {
 		final cn.hutool.poi.excel.OrderExcel order1 = new cn.hutool.poi.excel.OrderExcel();
 		order1.setId("1");
@@ -506,7 +490,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		final ExcelWriter writer = new ExcelWriter("d:/cellValueTest.xls");
 		writer.writeCellValue(3, 5, "aaa");
@@ -515,7 +499,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest() {
 		final List<String> row = ListUtil.of("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		final ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx");
@@ -525,7 +509,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest2() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/select.xls");
 		writer.writeCellValue(0, 0, "请选择科目");
@@ -543,13 +527,13 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest() {
 		final List<Map<String, Object>> rows = new LinkedList<>();
 		for (int i = 0; i < 10; i++) {
 			final Map<String, Object> tempList = new TreeMap<>();
 			for (int j = 0; j < 10; j++) {
-				tempList.put(j + "", IdUtil.randomUUID());
+				tempList.put(String.valueOf(j), IdUtil.randomUUID());
 			}
 			rows.add(tempList);
 		}
@@ -578,7 +562,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest2() {
 		final List<Map<String, Object>> rows = new LinkedList<>();
 		final HashMap<String, Object> map = MapUtil.newHashMap();
@@ -602,7 +586,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetWithStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("D:\\test\\multiSheetWithStyle.xlsx", "表格1");
 
@@ -633,7 +617,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapsTest() {
 		final List<Map<String, Object>> rows = new ArrayList<>();
 
@@ -661,7 +645,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void formatTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
 		final CellStyle cellStyle = writer.createCellStyle(0, 0);
@@ -670,7 +654,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeNumberFormatTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
 		writer.disableDefaultStyle();
@@ -681,7 +665,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeSecHeadRowTest() {
 		final List<?> row1 = ListUtil.of(1, "aa", "bb", "cc", "dd", "ee");
 		final List<?> row2 = ListUtil.of(2, "aa1", "bb1", "cc1", "dd1", "ee1");
@@ -731,7 +715,7 @@ public class ExcelWriteTest {
 	 * 测试使用BigWriter写出，ExcelWriter修改失败
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void editTest() {
 		// 生成文件
 		final File file = new File("d:/test/100_.xlsx");
@@ -754,7 +738,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest3() {
 		// https://github.com/dromara/hutool/issues/1696
 
@@ -784,7 +768,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeForDateTest() {
 		// https://github.com/dromara/hutool/issues/1911
 
@@ -797,7 +781,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void changeHeaderStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx");
 		writer.writeHeadRow(ListUtil.view("姓名", "性别", "年龄"));
@@ -809,7 +793,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeFloatTest() {
 		//issue https://gitee.com/dromara/hutool/issues/I43U9G
 		final String path = "d:/test/floatTest.xlsx";
@@ -821,7 +805,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDoubleTest() {
 		// https://gitee.com/dromara/hutool/issues/I5PI5C
 		final String path = "d:/test/doubleTest.xlsx";
@@ -834,7 +818,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueI466ZZTest() {
 		// https://gitee.com/dromara/hutool/issues/I466ZZ
 		// 需要输出S_20000314_x5116_0004
@@ -847,7 +831,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeLongTest() {
 		//https://gitee.com/dromara/hutool/issues/I49R6U
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/long.xlsx");
@@ -856,7 +840,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeHyperlinkTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/hyperlink.xlsx");
 
@@ -867,7 +851,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeNumberTest() {
 		final File tempFile = new File("d:/test/mergeNumber.xlsx");
 		FileUtil.del(tempFile);
@@ -878,7 +862,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeImgTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter(true);
 
@@ -895,6 +879,6 @@ public class ExcelWriteTest {
 	public void getDispositionTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter(true);
 		final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.UTF_8);
-		Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
+		Assertions.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java

@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -16,9 +16,9 @@ public class Issue1729Test {
 	public void readTest() {
 		final ExcelReader reader = ExcelUtil.getReader("UserProjectDO.xlsx");
 		final List<UserProjectDO> read = reader.read(0, 1, UserProjectDO.class);
-		Assert.assertEquals("aa", read.get(0).getProjectName());
-		Assert.assertNull(read.get(0).getEndTrainTime());
-		Assert.assertEquals("2020-02-02", read.get(0).getEndTestTime().toString());
+		Assertions.assertEquals("aa", read.get(0).getProjectName());
+		Assertions.assertNull(read.get(0).getEndTrainTime());
+		Assertions.assertEquals("2020-02-02", read.get(0).getEndTestTime().toString());
 	}
 
 	@Data

hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java

@@ -6,8 +6,8 @@ import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +18,7 @@ public class Issue2221Test {
 	 * 设置重复别名的时候，通过原key获取写出位置
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDuplicateHeaderAliasTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/duplicateAlias.xlsx");
 		// 设置别名
@@ -37,7 +37,7 @@ public class Issue2221Test {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDuplicateHeaderAliasTest2(){
 		// 获取写Excel的流
 		final ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/duplicateAlias2.xlsx");

hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2307Test.java

@@ -5,15 +5,15 @@ import cn.hutool.core.io.file.FileUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 public class Issue2307Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest(){
 		final String filePath = "d:/test/issue2307.xlsx";
 		FileUtil.del(FileUtil.file(filePath));

hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java

@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,7 +15,7 @@ import java.util.Map;
 public class IssueI53OSTTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest(){
 		final Map<String, Object> result = new HashMap<>();
 		final List<Object> header = new ArrayList<>();

hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5Q1TWTest.java

@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class IssueI5Q1TWTest {
 
@@ -10,9 +10,9 @@ public class IssueI5Q1TWTest {
 		final ExcelReader reader = ExcelUtil.getReader("I5Q1TW.xlsx");
 
 		// 自定义时间格式1
-		Assert.assertEquals("18:56", reader.readCellValue(0, 0).toString());
+		Assertions.assertEquals("18:56", reader.readCellValue(0, 0).toString());
 
 		// 自定义时间格式2
-		Assert.assertEquals("18:56", reader.readCellValue(1, 0).toString());
+		Assertions.assertEquals("18:56", reader.readCellValue(1, 0).toString());
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI5U1JATest.java

@@ -1,11 +1,11 @@
 package cn.hutool.poi.excel;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI5U1JATest {
 	@Test
-	@Ignore
+	@Disabled
 	public void readAllTest() {
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/issueI5U1JA.xlsx");
 		reader.readAll();

hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI66Z6BTest.java

@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.file.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -17,7 +17,7 @@ public class IssueI66Z6BTest {
 	 * 部分字段定义别名后，由于IndexedComparator比较器的问题，会造成字段丢失，已修复
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void test() {
 		final File destFile = new File("D:/test/0001test.xlsx");
 		FileUtil.del(destFile);

hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java

@@ -5,8 +5,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,7 +20,7 @@ import java.nio.file.Files;
 public class IssueI6MBS5Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCommentTest() {
 		final ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/setCommentTest.xlsx");
 		final Cell cell = writer.getOrCreateCell(0, 0);
@@ -31,7 +31,7 @@ public class IssueI6MBS5Test {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCommentTest2() {
 		final File file = new File("D:\\test\\CellUtilTest.xlsx");
 		try (final Workbook workbook = WorkbookUtil.createBook(true)) {

hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java

@@ -3,7 +3,7 @@ package cn.hutool.poi.excel;
 import cn.hutool.poi.excel.cell.values.NumericCellValue;
 import java.util.Date;
 import org.apache.poi.ss.usermodel.Cell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NumericCellValueTest {
 

hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java

@@ -1,17 +1,17 @@
 package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class WorkbookUtilTest {
 
 	@Test
 	public void createBookTest(){
 		Workbook book = WorkbookUtil.createBook(true);
-		Assert.assertNotNull(book);
+		Assertions.assertNotNull(book);
 
 		book = WorkbookUtil.createBook(false);
-		Assert.assertNotNull(book);
+		Assertions.assertNotNull(book);
 	}
 }

hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java

@@ -1,13 +1,13 @@
 package cn.hutool.poi.ofd;
 
 import cn.hutool.core.io.file.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class OfdWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest(){
 		final OfdWriter ofdWriter = new OfdWriter(FileUtil.file("d:/test/test.ofd"));
 		ofdWriter.addText(null, "测试文本");

hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java

@@ -6,8 +6,8 @@ import cn.hutool.core.io.file.FileUtil;
 import cn.hutool.core.lang.Console;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Font;
 import java.io.File;
@@ -17,10 +17,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+@SuppressWarnings("resource")
 public class WordWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final Word07Writer writer = new Word07Writer();
 		writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分", "我是第二部分");
@@ -31,7 +32,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writePicTest() {
 		final Word07Writer writer = new Word07Writer();
 		writer.addPicture(new File("d:\\test\\qrcodeCustom.jpg"), 100, 200);
@@ -42,7 +43,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTableTest(){
 		final Word07Writer writer = new Word07Writer();
 		final Map<String, Object> map = new LinkedHashMap<>();
@@ -56,7 +57,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAsTableTest() {
 		final Word07Writer writer = new Word07Writer();
 
@@ -99,7 +100,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanAsTableTest(){
 		final List<Vo> of = ListUtil.of(
 				new Vo("测试1", new BigDecimal(12), new BigDecimal(2)),