zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-04-29 01:46:01 +08:00
parent b2f0dc7b0f
commit c753a53173
561 changed files with 1532 additions and 4201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-poi/src/test/java/cn/hutool/poi/csv/CsvParserTest.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.poi.csv;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import org.junit.Assert;
import org.junit.Test;

8
hutool-poi/src/test/java/cn/hutool/poi/csv/CsvReaderTest.java
View File

@@ -19,7 +19,7 @@ public class CsvReaderTest {
@Test
public void readTest() {
CsvReader reader = new CsvReader();
CsvData data = reader.read(ResourceUtil.getReader("test.csv", CharsetUtil.CHARSET_UTF_8));
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));
@@ -129,7 +129,7 @@ public class CsvReaderTest {
@Test
public void lineNoTest() {
CsvReader reader = new CsvReader();
CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
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), ","));
@@ -146,7 +146,7 @@ public class CsvReaderTest {
public void lineLimitTest() {
// 从原始第2行开始读取
CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2));
CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
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), ","));
@@ -164,7 +164,7 @@ public class CsvReaderTest {
public void lineLimitWithHeaderTest() {
// 从原始第2行开始读取
CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2).setContainsHeader(true));
CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
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带换行的内容",

8
hutool-poi/src/test/java/cn/hutool/poi/csv/CsvUtilTest.java
View File

@@ -92,7 +92,7 @@ public class CsvUtilTest {
@Ignore
public void writeTest() {
String path = FileUtil.isWindows() ? "d:/test/testWrite.csv" : "~/test/testWrite.csv";
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
writer.write(
new String[] {"a1", "b1", "c1", "123345346456745756756785656"},
new String[] {"a2", "b2", "c2"},
@@ -112,7 +112,7 @@ public class CsvUtilTest {
}
String path = FileUtil.isWindows() ? "d:/test/testWriteBeans.csv" : "~/test/testWriteBeans.csv";
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
List<Student> students = new ArrayList<>();
Student student1 = new Student();
student1.setId(1);
@@ -162,7 +162,7 @@ public class CsvUtilTest {
resultList.add(list);
String path = FileUtil.isWindows() ? "d:/test/csvWrapTest.csv" : "~/test/csvWrapTest.csv";
final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
writer.write(resultList);
}
@@ -201,7 +201,7 @@ public class CsvUtilTest {
CsvData csvData = new CsvData(header, row);
String path = FileUtil.isWindows() ? "d:/test/csvWriteDataTest.csv" : "~/test/csvWriteDataTest.csv";
final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
final CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.UTF_8);
writer.write(csvData);
}
}

4
hutool-poi/src/test/java/cn/hutool/poi/csv/CsvWriterTest.java
View File

@@ -21,7 +21,7 @@ public class CsvWriterTest {
final CsvWriter writer = CsvUtil.getWriter(
FileUtil.file("d:/test/csvAliasTest.csv"),
CharsetUtil.CHARSET_GBK, false, csvWriteConfig);
CharsetUtil.GBK, false, csvWriteConfig);
writer.writeHeaderLine("name", "gender", "address");
writer.writeLine("张三", "男", "XX市XX区");
@@ -33,7 +33,7 @@ public class CsvWriterTest {
@Ignore
public void issue2255Test(){
String fileName = "D:/test/" + new Random().nextInt(100) + "-a.csv";
CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.CHARSET_UTF_8);
CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.UTF_8);
List<String> list = new ArrayList<>();
for (int i = 0; i < 10000; i++) {
list.add(i+"");

32
hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.poi.excel.style.StyleUtil;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.FillPatternType;
@@ -22,11 +22,11 @@ import java.util.Map;
/**
* 写出Excel单元测试
*
*
* @author looly
*/
public class BigExcelWriteTest {
@Test
@Ignore
public void writeTest2() {
@@ -48,9 +48,9 @@ public class BigExcelWriteTest {
List<List<?>> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5);
for(int i=0; i < 400000; i++) {
//超大列表写出测试
rows.add(ObjectUtil.clone(row1));
rows.add(ObjUtil.clone(row1));
}
String filePath = "e:/bigWriteTest.xlsx";
FileUtil.del(filePath);
// 通过工具类创建writer
@@ -66,7 +66,7 @@ public class BigExcelWriteTest {
// 关闭writer，释放内存
writer.close();
}
@Test
@Ignore
public void mergeTest() {
@@ -89,10 +89,10 @@ public class BigExcelWriteTest {
writer.merge(row1.size() - 1, "测试标题");
// 一次性写出内容，使用默认样式
writer.write(rows);
// 合并单元格后的标题行，使用默认标题样式
writer.merge(7, 10, 4, 10, "测试Merge", false);
// 关闭writer，释放内存
writer.close();
}
@@ -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,7 +135,7 @@ public class BigExcelWriteTest {
// 关闭writer，释放内存
writer.close();
}
@Test
@Ignore
public void writeMapTest2() {
@@ -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，释放内存
@@ -192,7 +192,7 @@ public class BigExcelWriteTest {
// 关闭writer，释放内存
writer.close();
}
@Test
@Ignore
public void writeCellValueTest() {

4
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.poi.excel;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.poi.excel.cell.CellHandler;
import lombok.Data;
import org.junit.Assert;
@@ -206,7 +206,7 @@ public class ExcelReadTest {
@Test
public void nullValueEditTest(){
final ExcelReader reader = ExcelUtil.getReader("null_cell_test.xlsx");
reader.setCellEditor((cell, value)-> ObjectUtil.defaultIfNull(value, "#"));
reader.setCellEditor((cell, value)-> ObjUtil.defaultIfNull(value, "#"));
final List<List<Object>> read = reader.read();
// 对于任意一个单元格有值的情况下，之前的单元格值按照null处理

2
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
View File

@@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.poi.excel.cell.FormulaCellValue;
import cn.hutool.poi.excel.sax.Excel03SaxReader;
import cn.hutool.poi.excel.sax.handler.RowHandler;

6
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
View File

@@ -8,7 +8,7 @@ import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.util.ObjectUtil;
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;
@@ -144,7 +144,7 @@ public class ExcelWriteTest {
List<List<?>> rows = CollUtil.newArrayList(row1, row2, row3, row4, row5);
for (int i = 0; i < 400; i++) {
// 超大列表写出测试
rows.add(ObjectUtil.clone(row1));
rows.add(ObjUtil.clone(row1));
}
String filePath = "d:/test/writeTest.xlsx";
@@ -882,7 +882,7 @@ public class ExcelWriteTest {
@Test
public void getDispositionTest(){
ExcelWriter writer = ExcelUtil.getWriter(true);
final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.CHARSET_UTF_8);
final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.UTF_8);
Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
}
}