Skip to content

Commit 0caf92b

Browse files
committed
Migrate junit4 to junit5
1 parent f5c7a09 commit 0caf92b

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

SpringBootExcel/src/main/java/com/example/component/ExcelReader.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import org.apache.poi.ss.usermodel.Sheet;
88
import org.apache.poi.ss.usermodel.Workbook;
99
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
1012
import org.springframework.stereotype.Component;
1113
import org.springframework.web.multipart.MultipartFile;
1214

@@ -19,6 +21,8 @@
1921
@Component
2022
public class ExcelReader {
2123

24+
Logger logger = LoggerFactory.getLogger(ExcelReader.class);
25+
2226
public <T> List<T> readFileToList(final MultipartFile multipartFile,
2327
final Function<Row, T> rowFunc) throws IOException, InvalidFormatException {
2428

@@ -38,7 +42,9 @@ private Workbook readWorkbook(MultipartFile multipartFile) throws IOException, I
3842
}
3943

4044
private void verifyFileExtension(MultipartFile multipartFile) throws InvalidFormatException {
41-
if (!isExcelExtension(multipartFile.getOriginalFilename())) {
45+
final String originalFilename = multipartFile.getOriginalFilename();
46+
logger.info(originalFilename);
47+
if (!isExcelExtension(originalFilename)) {
4248
throw new InvalidFormatException("This file extension is not verify");
4349
}
4450
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
spring.http.multipart.max-file-size=100KB
2-
spring.http.multipart.max-request-size=100KB
1+
spring.servlet.multipart.max-file-size=100KB
2+
spring.servlet.multipart.max-request-size=100KB

SpringBootExcel/src/test/java/com/example/SpringBootExcelApplicationTests.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
import com.example.component.ExcelReader;
44
import com.example.domain.Product;
55
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
6-
import org.junit.Ignore;
7-
import org.junit.Test;
8-
import org.junit.runner.RunWith;
6+
import org.junit.jupiter.api.Test;
97
import org.springframework.beans.factory.annotation.Autowired;
108
import org.springframework.boot.test.context.SpringBootTest;
9+
import org.springframework.http.MediaType;
1110
import org.springframework.mock.web.MockMultipartFile;
12-
import org.springframework.test.context.junit4.SpringRunner;
11+
import org.springframework.util.ResourceUtils;
1312

1413
import java.io.File;
1514
import java.io.FileInputStream;
1615
import java.io.IOException;
1716

18-
@RunWith(SpringRunner.class)
1917
@SpringBootTest
20-
public class SpringBootExcelApplicationTests {
18+
class SpringBootExcelApplicationTests {
2119

2220
@Autowired
2321
ExcelReader excelReader;
2422

2523
@Test
26-
@Ignore
27-
public void test_readExcel() throws IOException, InvalidFormatException {
28-
File xlsxFile = new File("{path}\\test.xlsx");
24+
void test_readExcel() throws IOException, InvalidFormatException {
25+
File xlsxFile = ResourceUtils.getFile("classpath:test.xlsx");
2926

27+
final String name = "test.xlsx";
3028
excelReader
31-
.readFileToList(new MockMultipartFile("test.xlsx", new FileInputStream(xlsxFile)),
29+
.readFileToList(new MockMultipartFile(name, name, MediaType.APPLICATION_XHTML_XML_VALUE, new FileInputStream(xlsxFile)),
3230
Product::from)
3331
.forEach(System.out::println);
3432
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
spring.servlet.multipart.max-file-size=100KB
2+
spring.servlet.multipart.max-request-size=100KB
File renamed without changes.

0 commit comments

Comments
 (0)