单元测试由Junit4变更为Junit5

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

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

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

@@ -10,8 +10,8 @@ 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;
@@ -22,13 +22,13 @@ import java.util.Map;
 
 /**
  * 写出Excel单元测试
- * 
+ *
  * @author looly
  */
 public class BigExcelWriteTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("e:/excel/single_line.xlsx");
@@ -37,7 +37,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -50,7 +50,7 @@ public class BigExcelWriteTest {
 			//超大列表写出测试
 			rows.add(ObjectUtil.clone(row1));
 		}
-		
+
 		String filePath = "e:/bigWriteTest.xlsx";
 		FileUtil.del(filePath);
 		// 通过工具类创建writer
@@ -66,9 +66,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		List<?> row1 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -89,16 +89,16 @@ public class BigExcelWriteTest {
 		writer.merge(row1.size() - 1, "测试标题");
 		// 一次性写出内容，使用默认样式
 		writer.write(rows);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(7, 10, 4, 10, "测试Merge", false);
-		
+
 		// 关闭writer，释放内存
 		writer.close();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 		Map<String, Object> row1 = new LinkedHashMap<>();
 		row1.put("姓名", "张三");
@@ -120,14 +120,14 @@ public class BigExcelWriteTest {
 		String path = "e:/bigWriteMapTest.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		//设置内容字体
 		Font font = writer.createFont();
 		font.setBold(true);
-		font.setColor(Font.COLOR_RED); 
-		font.setItalic(true); 
+		font.setColor(Font.COLOR_RED);
+		font.setItalic(true);
 		writer.getStyleSet().setFont(font, true);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(row1.size() - 1, "一班成绩单");
 		// 一次性写出内容，使用默认样式
@@ -135,9 +135,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 		Map<String, Object> row1 = MapUtil.newHashMap(true);
 		row1.put("姓名", "张三");
@@ -145,12 +145,12 @@ public class BigExcelWriteTest {
 		row1.put("成绩", 88.32);
 		row1.put("是否合格", true);
 		row1.put("考试日期", DateUtil.date());
-		
+
 		// 通过工具类创建writer
 		String path = "e:/bigWriteMapTest2.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		// 一次性写出内容，使用默认样式
 		writer.writeRow(row1, true);
 		// 关闭writer，释放内存
@@ -158,7 +158,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
 		bean1.setName("张三");
@@ -192,9 +192,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		String path = "d:/test/cellValueTest.xlsx";
 		FileUtil.del(path);
@@ -204,7 +204,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 +217,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue1210() {
 		// 通过工具类创建writer
 		String path = "d:/test/issue1210.xlsx";

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

@@ -4,30 +4,32 @@ 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.Test;
 
 import java.io.Serializable;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class CellEditorTest {
 
-	@org.junit.Test
+	@Test
 	public void readTest(){
 		ExcelReader excelReader= ExcelUtil.getReader("cell_editor_test.xlsx");
 		excelReader.setCellEditor(new ExcelHandler());
-		List<Test> excelReaderObjects=excelReader.readAll(Test.class);
+		List<TestBean> excelReaderObjects=excelReader.readAll(TestBean.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());
+		assertEquals("0", excelReaderObjects.get(0).getTest1());
+		assertEquals("b", excelReaderObjects.get(0).getTest2());
+		assertEquals("0", excelReaderObjects.get(1).getTest1());
+		assertEquals("b1", excelReaderObjects.get(1).getTest2());
+		assertEquals("0", excelReaderObjects.get(2).getTest1());
+		assertEquals("c2", excelReaderObjects.get(2).getTest2());
 	}
 
 	@AllArgsConstructor
 	@Data
-	public static class Test implements Serializable {
+	public static class TestBean implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private String test1;

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

@@ -1,15 +1,15 @@
 package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.lang.Console;
 
 public class CellUtilTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void isDateTest() {
 		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.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static 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(){
 		InputStream in = FileUtil.getInputStream("aaa.xls");
 		try{
-			Assert.assertTrue(ExcelFileUtil.isXls(in));
-			Assert.assertFalse(ExcelFileUtil.isXlsx(in));
+			assertTrue(ExcelFileUtil.isXls(in));
+			assertFalse(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.close(in);
 		}
@@ -24,8 +24,8 @@ public class ExcelFileUtilTest {
 	public void xlsxTest(){
 		InputStream in = FileUtil.getInputStream("aaa.xlsx");
 		try{
-			Assert.assertFalse(ExcelFileUtil.isXls(in));
-			Assert.assertTrue(ExcelFileUtil.isXlsx(in));
+			assertFalse(ExcelFileUtil.isXls(in));
+			assertTrue(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.close(in);
 		}

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

@@ -6,9 +6,9 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.cell.CellHandler;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static 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;
@@ -27,7 +27,7 @@ public class ExcelReadTest {
 
 		//读取单个单元格内容测试
 		Object value = reader.readCellValue(1, 2);
-		Assert.assertEquals("仓库", value);
+		assertEquals("仓库", value);
 
 		Map<String, String> headerAlias = MapUtil.newHashMap();
 		headerAlias.put("用户姓名", "userName");
@@ -38,17 +38,17 @@ public class ExcelReadTest {
 
 		// 读取list时默认首个非空行为标题
 		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));
+		assertEquals("userName", read.get(0).get(0));
+		assertEquals("storageName", read.get(0).get(1));
+		assertEquals("checkPerm", read.get(0).get(2));
+		assertEquals("allotAuditPerm", read.get(0).get(3));
 
 		List<Map<String, Object>> readAll = reader.readAll();
 		for (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"));
+			assertTrue(map.containsKey("userName"));
+			assertTrue(map.containsKey("storageName"));
+			assertTrue(map.containsKey("checkPerm"));
+			assertTrue(map.containsKey("allotAuditPerm"));
 		}
 	}
 
@@ -57,7 +57,7 @@ public class ExcelReadTest {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("priceIndex.xls"));
 		List<Map<String, Object>> readAll = reader.readAll();
 
-		Assert.assertEquals(4, readAll.size());
+		assertEquals(4, readAll.size());
 	}
 
 	@Test
@@ -66,22 +66,22 @@ public class ExcelReadTest {
 		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));
+		assertEquals("姓名", readAll.get(0).get(0));
+		assertEquals("性别", readAll.get(0).get(1));
+		assertEquals("年龄", readAll.get(0).get(2));
+		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));
+		assertEquals("张三", readAll.get(1).get(0));
+		assertEquals("男", readAll.get(1).get(1));
+		assertEquals(11L, readAll.get(1).get(2));
+		assertEquals(41.5D, readAll.get(1).get(3));
 	}
 
 	@Test
 	public void excelReadAsTextTest() {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
-		Assert.assertNotNull(reader.readAsText(false));
+		assertNotNull(reader.readAsText(false));
 	}
 
 	@Test
@@ -94,16 +94,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));
+		assertEquals("姓名", readAll.get(0).get(0));
+		assertEquals("性别", readAll.get(0).get(1));
+		assertEquals("年龄", readAll.get(0).get(2));
+		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));
+		assertEquals("张三", readAll.get(1).get(0));
+		assertEquals("男", readAll.get(1).get(1));
+		assertEquals(11L, readAll.get(1).get(2));
+		assertEquals(33.2D, readAll.get(1).get(3));
 	}
 
 	@Test
@@ -112,11 +112,11 @@ public class ExcelReadTest {
 		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));
+		assertEquals("班级", readAll.get(0).get(0));
+		assertEquals("年级", readAll.get(0).get(1));
+		assertEquals("学校", readAll.get(0).get(2));
+		assertEquals("入学时间", readAll.get(0).get(3));
+		assertEquals("更新时间", readAll.get(0).get(4));
 	}
 
 	@Test
@@ -124,9 +124,9 @@ public class ExcelReadTest {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
 		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("年龄"));
+		assertEquals("张三", readAll.get(0).get("姓名"));
+		assertEquals("男", readAll.get(0).get("性别"));
+		assertEquals(11L, readAll.get(0).get("年龄"));
 	}
 
 	@Test
@@ -138,14 +138,14 @@ public class ExcelReadTest {
 		reader.addHeaderAlias("鞋码", "shoeSize");
 
 		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());
+		assertEquals("张三", all.get(0).getName());
+		assertEquals("男", all.get(0).getGender());
+		assertEquals(Integer.valueOf(11), all.get(0).getAge());
+		assertEquals(new BigDecimal("41.5"), all.get(0).getShoeSize());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void excelReadToBeanListTest2() {
 		ExcelReader reader = ExcelUtil.getReader("f:/test/toBean.xlsx");
 		reader.addHeaderAlias("姓名", "name");
@@ -167,7 +167,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readDoubleTest() {
 		ExcelReader reader = ExcelUtil.getReader("f:/test/doubleTest.xls");
 		final List<List<Object>> read = reader.read();
@@ -181,19 +181,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));
+		assertEquals(11L, read.get(1).get(2));
+		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");
@@ -210,17 +210,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());
+		assertEquals(1, read.get(1).size());
+		assertEquals(2, read.get(2).size());
+		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));
+		assertEquals("#", read.get(2).get(0));
+		assertEquals("#", read.get(3).get(0));
+		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();
@@ -228,7 +228,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readNullRowTest(){
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/1.-.xls");
 		reader.read((CellHandler) Console::log);
@@ -239,10 +239,10 @@ public class ExcelReadTest {
 		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));
+		assertEquals(3, objects.size());
+		assertEquals("张三", objects.get(0));
+		assertEquals("李四", objects.get(1));
+		assertEquals("", objects.get(2));
 	}
 
 	@Test

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

@@ -13,13 +13,13 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ExcelReaderToWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWriterTest() {
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/issue3120.xlsx");
 		final ExcelWriter writer = reader.getWriter();

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

@@ -11,14 +11,15 @@ 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.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Excel sax方式读取
  *
@@ -65,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");
+		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))) {
@@ -99,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));
 	}
@@ -109,13 +112,13 @@ public class ExcelSaxReadTest {
 //			Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist);
 			if (5 != rowIndex && 6 != rowIndex) {
 				// 测试样例中除第五行、第六行都为非空行
-				Assert.assertTrue(CollUtil.isNotEmpty(rowlist));
+				assertTrue(CollUtil.isNotEmpty(rowlist));
 			}
 		};
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void handle07CellTest() {
 		ExcelUtil.readBySax("d:/test/test.xlsx", -1, new RowHandler() {
 
@@ -158,7 +161,7 @@ public class ExcelSaxReadTest {
 				rows.add("");
 			}
 		});
-		Assert.assertEquals(50L, rows.get(3));
+		assertEquals(50L, rows.get(3));
 	}
 
 	@Test
@@ -168,7 +171,7 @@ public class ExcelSaxReadTest {
 				rows.add(list.get(1)));
 
 		final FormulaCellValue value = (FormulaCellValue) rows.get(3);
-		Assert.assertEquals(50L, value.getResult());
+		assertEquals(50L, value.getResult());
 	}
 
 	@Test
@@ -178,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));
+		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));
+		assertEquals("112233", rows.get(2));
+		assertEquals("1000.0", rows.get(3));
+		assertEquals("2012-12-21 00:00:00", rows.get(4));
 	}
 
 	@Test
@@ -192,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));
+		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));
+		assertEquals("112233", rows.get(2));
+		assertEquals("1000.0", rows.get(3));
+		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)
@@ -208,7 +211,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBlankTest() {
 		final File file = new File("D:/test/b.xlsx");
 
@@ -218,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));

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

@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.poi.excel.cell.CellLocation;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -13,39 +13,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));
+		assertEquals("A", ExcelUtil.indexToColName(0));
+		assertEquals("B", ExcelUtil.indexToColName(1));
+		assertEquals("C", ExcelUtil.indexToColName(2));
 
-		Assert.assertEquals("AA", ExcelUtil.indexToColName(26));
-		Assert.assertEquals("AB", ExcelUtil.indexToColName(27));
-		Assert.assertEquals("AC", ExcelUtil.indexToColName(28));
+		assertEquals("AA", ExcelUtil.indexToColName(26));
+		assertEquals("AB", ExcelUtil.indexToColName(27));
+		assertEquals("AC", ExcelUtil.indexToColName(28));
 
-		Assert.assertEquals("AAA", ExcelUtil.indexToColName(702));
-		Assert.assertEquals("AAB", ExcelUtil.indexToColName(703));
-		Assert.assertEquals("AAC", ExcelUtil.indexToColName(704));
+		assertEquals("AAA", ExcelUtil.indexToColName(702));
+		assertEquals("AAB", ExcelUtil.indexToColName(703));
+		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"));
+		assertEquals(704, ExcelUtil.colNameToIndex("AAC"));
+		assertEquals(703, ExcelUtil.colNameToIndex("AAB"));
+		assertEquals(702, ExcelUtil.colNameToIndex("AAA"));
 
-		Assert.assertEquals(28, ExcelUtil.colNameToIndex("AC"));
-		Assert.assertEquals(27, ExcelUtil.colNameToIndex("AB"));
-		Assert.assertEquals(26, ExcelUtil.colNameToIndex("AA"));
+		assertEquals(28, ExcelUtil.colNameToIndex("AC"));
+		assertEquals(27, ExcelUtil.colNameToIndex("AB"));
+		assertEquals(26, ExcelUtil.colNameToIndex("AA"));
 
-		Assert.assertEquals(2, ExcelUtil.colNameToIndex("C"));
-		Assert.assertEquals(1, ExcelUtil.colNameToIndex("B"));
-		Assert.assertEquals(0, ExcelUtil.colNameToIndex("A"));
+		assertEquals(2, ExcelUtil.colNameToIndex("C"));
+		assertEquals(1, ExcelUtil.colNameToIndex("B"));
+		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());
+		assertEquals(0, a11.getX());
+		assertEquals(10, a11.getY());
 	}
 
 	@Test
@@ -61,7 +61,7 @@ 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("鞋码"));
+		assertEquals(1L, list.get(1).get("鞋码"));
 	}
 
 	@Test
@@ -80,7 +80,7 @@ public class ExcelUtilTest {
 			}
 		});
 		//总共2个sheet页，读取所有sheet时，一共执行doAfterAllAnalysed2次。
-		Assert.assertEquals(2, doAfterAllAnalysedTime.intValue());
+		assertEquals(2, doAfterAllAnalysedTime.intValue());
 	}
 
 }

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

@@ -1,13 +1,13 @@
 package cn.hutool.poi.excel;
 
 import lombok.Getter;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ExcelWriteBeanTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeRowTest() {
 		MyBean bean = new MyBean("value1", "value2");
 

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

@@ -15,9 +15,9 @@ import org.apache.poi.common.usermodel.HyperlinkType;
 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 static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.*;
@@ -61,7 +61,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testRowOrColumnCellStyle() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -105,7 +105,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		ExcelWriter overtimeWriter = ExcelUtil.getWriter("e:/excel/single_line.xlsx");
@@ -114,7 +114,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithSheetTest() {
 		ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1");
 
@@ -134,7 +134,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -169,7 +169,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		List<?> row1 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -199,7 +199,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest2() {
 
 		ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(MAP_DATA_1, MAP_DATA_2);
@@ -216,7 +216,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 
 		ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(MAP_DATA_1, MAP_DATA_2);
@@ -240,7 +240,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 
 		// 通过工具类创建writer
@@ -253,7 +253,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapWithStyleTest() {
 
 		// 通过工具类创建writer
@@ -274,7 +274,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAliasTest() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -309,7 +309,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -342,7 +342,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest2() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -372,7 +372,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest3() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -406,7 +406,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		TestBean bean1 = new TestBean();
 		bean1.setName("张三");
@@ -442,7 +442,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest2() {
 		OrderExcel order1 = new OrderExcel();
 		order1.setId("1");
@@ -470,7 +470,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		ExcelWriter writer = new ExcelWriter("d:/cellValueTest.xls");
 		writer.writeCellValue(3, 5, "aaa");
@@ -479,7 +479,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx");
@@ -489,7 +489,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest2() {
 		ExcelWriter writer = ExcelUtil.getWriter("d:/test/select.xls");
 		writer.writeCellValue(0, 0, "请选择科目");
@@ -507,7 +507,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest() {
 		List<Map<String, Object>> rows = new LinkedList<>();
 		for (int i = 0; i < 10; i++) {
@@ -542,7 +542,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest2() {
 		List<Map<String, Object>> rows = new LinkedList<>();
 		final HashMap<String, Object> map = MapUtil.newHashMap();
@@ -566,7 +566,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetWithStyleTest() {
 		ExcelWriter writer = ExcelUtil.getWriter("D:\\test\\multiSheetWithStyle.xlsx", "表格1");
 
@@ -597,7 +597,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapsTest() {
 		List<Map<String, Object>> rows = new ArrayList<>();
 
@@ -625,7 +625,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);
@@ -634,7 +634,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeNumberFormatTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
 		writer.disableDefaultStyle();
@@ -645,7 +645,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeSecHeadRowTest() {
 		List<?> row1 = CollUtil.newArrayList(1, "aa", "bb", "cc", "dd", "ee");
 		List<?> row2 = CollUtil.newArrayList(2, "aa1", "bb1", "cc1", "dd1", "ee1");
@@ -695,7 +695,7 @@ public class ExcelWriteTest {
 	 * 测试使用BigWriter写出，ExcelWriter修改失败
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void editTest() {
 		// 生成文件
 		File file = new File("d:/test/100_.xlsx");
@@ -718,7 +718,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest3() {
 		// https://github.com/dromara/hutool/issues/1696
 
@@ -748,7 +748,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeForDateTest() {
 		// https://github.com/dromara/hutool/issues/1911
 
@@ -761,7 +761,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void changeHeaderStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx");
 		writer.writeHeadRow(ListUtil.of("姓名", "性别", "年龄"));
@@ -773,7 +773,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeFloatTest() {
 		//issue https://gitee.com/dromara/hutool/issues/I43U9G
 		String path = "d:/test/floatTest.xlsx";
@@ -785,7 +785,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueI466ZZTest() {
 		// https://gitee.com/dromara/hutool/issues/I466ZZ
 		// 需要输出S_20000314_x5116_0004
@@ -798,7 +798,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");
@@ -807,7 +807,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeHyperlinkTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/hyperlink.xlsx");
 
@@ -818,7 +818,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeNumberTest() {
 		File tempFile = new File("d:/test/mergeNumber.xlsx");
 		FileUtil.del(tempFile);
@@ -829,7 +829,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeImgTest() {
 		ExcelWriter writer = ExcelUtil.getWriter(true);
 
@@ -846,11 +846,11 @@ public class ExcelWriteTest {
 	public void getDispositionTest() {
 		ExcelWriter writer = ExcelUtil.getWriter(true);
 		final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
+		assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeColTest() {
 		ExcelWriter writer = ExcelUtil.getWriter("G:\\test.xlsx");
 		List<Integer> list = new ArrayList<>();
@@ -881,7 +881,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void autoSizeColumnTest() {
 
 		Map<String, Object> map = new LinkedHashMap<>(MAP_DATA_1);

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 static 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());
+		assertEquals("aa", read.get(0).getProjectName());
+		assertNull(read.get(0).getEndTrainTime());
+		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的流
 		ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/duplicateAlias2.xlsx");

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

@@ -1,7 +1,7 @@
 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;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,7 +14,7 @@ import java.util.Set;
 public class Issue2706Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		String path = "d:/test/issue2706.xlsx";
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path, "表格名称");

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

@@ -4,13 +4,13 @@ import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import lombok.Data;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue2899Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void aliasWriteTest() {
 		// Bean中设置@Alias时，setOnlyAlias是无效的，这个参数只和addHeaderAlias配合使用，原因是注解是Bean内部的操作，而addHeaderAlias是Writer的操作，不互通。
 		final TestBean testBean1 = new TestBean();

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

@@ -1,15 +1,15 @@
 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.List;
 import java.util.Map;
 
 public class Issue2941Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void excelReadDateTest() {
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/1677649503673.xlsx");
 		final List<Map<String, Object>> maps = reader.readAll();

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

@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 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.io.File;
 import java.math.BigDecimal;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class Issue3048Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void excelOutPutBeanListToExcel(){
 		List<TestBean> excelExportList = new ArrayList<>();
 		excelExportList.add(new TestBean("1", new BigDecimal("1.22")));

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(){
 		Map<String, Object> result = new HashMap<>();
 		List<Object> header = new ArrayList<>();

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

@@ -4,13 +4,13 @@ import cn.hutool.core.collection.ListUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 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;
 
 public class IssueI64P2KTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithColumnStyleTest() {
 		// 设置默认列样式无效，暂时无解。
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/columnColorTest.xlsx");

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

@@ -6,8 +6,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;
@@ -21,7 +21,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);
@@ -32,7 +32,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/IssueI6URF3Test.java

@@ -14,13 +14,13 @@ package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI6URF3Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCellStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/issueI6URF3.xlsx");
 		writer.writeCellValue(0, 0, 1);

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 static 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);
+		assertNotNull(book);
 
 		book = WorkbookUtil.createBook(false);
-		Assert.assertNotNull(book);
+		assertNotNull(book);
 	}
 }

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

@@ -2,12 +2,12 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.poi.excel.cell.FormulaCellValue;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class WriteNumberToStringTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void writeNumberTest() {
 		final ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/dataWithNumber.xlsx");
 

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

@@ -7,8 +7,8 @@ import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class WriteStyleTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);

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.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

@@ -5,8 +5,8 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 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.awt.Font;
 import java.io.File;
@@ -18,7 +18,7 @@ import java.util.Map;
 public class WordWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		Word07Writer writer = new Word07Writer();
 		writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分", "我是第二部分");
@@ -29,7 +29,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writePicTest() {
 		Word07Writer writer = new Word07Writer();
 		writer.addPicture(new File("d:\\test\\qrcodeCustom.jpg"), 100, 200);
@@ -40,7 +40,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTableTest(){
 		final Word07Writer writer = new Word07Writer();
 		Map<String, Object> map = new LinkedHashMap<>();
@@ -54,7 +54,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAsTableTest() {
 		Word07Writer writer = new Word07Writer();