Skip to content

Commit 1e01b29

Browse files
colorful3juzi214032
authored andcommitted
refactor: 将单侧使用的 junit4 替换为 junit5
1 parent 2133425 commit 1e01b29

18 files changed

+141
-273
lines changed

src/test/java/Jackson2Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import lombok.extern.slf4j.Slf4j;
6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
import java.util.HashMap;
99
import java.util.Map;

src/test/java/io/github/talelin/latticy/LatticyApplicationTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package io.github.talelin.latticy;
22

33
import io.github.talelin.latticy.module.file.FileProperties;
4-
import org.junit.Test;
5-
import org.junit.runner.RunWith;
4+
import org.junit.jupiter.api.Test;
65
import org.springframework.beans.factory.annotation.Autowired;
76
import org.springframework.boot.test.context.SpringBootTest;
87
import org.springframework.test.context.ActiveProfiles;
9-
import org.springframework.test.context.junit4.SpringRunner;
108

11-
@RunWith(SpringRunner.class)
129
@SpringBootTest
1310
@ActiveProfiles("test")
1411
public class LatticyApplicationTests {

src/test/java/io/github/talelin/latticy/controller/cms/AdminControllerTest.java

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,24 @@
77
import io.github.talelin.latticy.model.*;
88
import io.github.talelin.latticy.service.impl.UserIdentityServiceImpl;
99
import lombok.extern.slf4j.Slf4j;
10-
import org.junit.After;
11-
import org.junit.Before;
12-
import org.junit.Test;
13-
import org.junit.runner.RunWith;
10+
import org.junit.jupiter.api.Test;
1411
import org.springframework.beans.factory.annotation.Autowired;
1512
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1613
import org.springframework.boot.test.context.SpringBootTest;
1714
import org.springframework.http.MediaType;
1815
import org.springframework.test.annotation.Rollback;
1916
import org.springframework.test.context.ActiveProfiles;
20-
import org.springframework.test.context.junit4.SpringRunner;
2117
import org.springframework.test.web.servlet.MockMvc;
2218
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
2319
import org.springframework.transaction.annotation.Transactional;
2420

2521
import java.util.Arrays;
2622

27-
import static org.junit.Assert.*;
28-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
29-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
30-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
31-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
23+
import static org.junit.jupiter.api.Assertions.*;
24+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
3225
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
3326
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
3427

35-
@RunWith(SpringRunner.class)
3628
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
3729
@Transactional
3830
@Rollback
@@ -62,14 +54,6 @@ public class AdminControllerTest {
6254
@Autowired
6355
private UserIdentityServiceImpl userIdentityService;
6456

65-
@Before
66-
public void setUp() throws Exception {
67-
}
68-
69-
@After
70-
public void tearDown() throws Exception {
71-
}
72-
7357
@Test
7458
public void getAllPermissions() throws Exception {
7559
mvc.perform(get("/cms/admin/permission")

src/test/java/io/github/talelin/latticy/controller/cms/LogControllerTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
import io.github.talelin.latticy.mapper.LogMapper;
55
import io.github.talelin.latticy.model.LogDO;
66
import lombok.extern.slf4j.Slf4j;
7-
import org.junit.Before;
8-
import org.junit.Test;
9-
import org.junit.runner.RunWith;
7+
import org.junit.jupiter.api.BeforeAll;
8+
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.TestInstance;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1212
import org.springframework.boot.test.context.SpringBootTest;
1313
import org.springframework.http.MediaType;
1414
import org.springframework.test.annotation.Rollback;
1515
import org.springframework.test.context.ActiveProfiles;
16-
import org.springframework.test.context.junit4.SpringRunner;
1716
import org.springframework.test.web.servlet.MockMvc;
1817
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
1918
import org.springframework.transaction.annotation.Transactional;
@@ -24,13 +23,13 @@
2423
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
2524
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
2625

27-
@RunWith(SpringRunner.class)
2826
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
29-
@Transactional // 数据操作后回滚
27+
@Transactional
3028
@Rollback
3129
@AutoConfigureMockMvc
3230
@Slf4j
3331
@ActiveProfiles("test")
32+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3433
public class LogControllerTest {
3534

3635
@Autowired
@@ -39,7 +38,7 @@ public class LogControllerTest {
3938
@Autowired
4039
private LogMapper logMapper;
4140

42-
@Before
41+
@BeforeAll
4342
public void setUp() throws Exception {
4443
Date time = new Date();
4544
String permission = "查看lin的信息";

src/test/java/io/github/talelin/latticy/controller/cms/UserControllerTest.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,17 @@
88
import io.github.talelin.latticy.dto.user.RegisterDTO;
99
import io.github.talelin.latticy.dto.user.UpdateInfoDTO;
1010
import io.github.talelin.latticy.mapper.GroupMapper;
11-
import io.github.talelin.latticy.mapper.UserMapper;
1211
import io.github.talelin.latticy.model.GroupDO;
1312
import io.github.talelin.latticy.model.UserDO;
1413
import io.github.talelin.latticy.service.UserService;
1514
import lombok.extern.slf4j.Slf4j;
16-
import org.junit.After;
17-
import org.junit.Before;
18-
import org.junit.Test;
19-
import org.junit.runner.RunWith;
15+
import org.junit.jupiter.api.Test;
2016
import org.springframework.beans.factory.annotation.Autowired;
2117
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2218
import org.springframework.boot.test.context.SpringBootTest;
2319
import org.springframework.http.MediaType;
2420
import org.springframework.test.annotation.Rollback;
2521
import org.springframework.test.context.ActiveProfiles;
26-
import org.springframework.test.context.junit4.SpringRunner;
2722
import org.springframework.test.web.servlet.MockMvc;
2823
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2924
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
@@ -32,12 +27,11 @@
3227
import java.util.Arrays;
3328
import java.util.Random;
3429

35-
import static org.junit.Assert.assertTrue;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
3631
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
3732
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
3833
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
3934

40-
@RunWith(SpringRunner.class)
4135
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
4236
@Transactional
4337
@Rollback
@@ -49,9 +43,6 @@ public class UserControllerTest {
4943
@Autowired
5044
private MockMvc mvc;
5145

52-
@Autowired
53-
private UserMapper userMapper;
54-
5546
@Autowired
5647
private GroupMapper groupMapper;
5748

@@ -64,14 +55,6 @@ public class UserControllerTest {
6455

6556
private String username = "pedro大大";
6657

67-
@Before
68-
public void setUp() throws Exception {
69-
}
70-
71-
@After
72-
public void tearDown() throws Exception {
73-
}
74-
7558
@Test
7659
public void register() throws Exception {
7760
GroupDO group = GroupDO.builder().name("少林足球").info("致敬周星星").build();

src/test/java/io/github/talelin/latticy/controller/v1/BookControllerTest.java

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,22 @@
55
import io.github.talelin.latticy.dto.book.CreateOrUpdateBookDTO;
66
import io.github.talelin.latticy.mapper.BookMapper;
77
import io.github.talelin.latticy.model.BookDO;
8-
import org.junit.After;
9-
import org.junit.Before;
10-
import org.junit.Test;
11-
import org.junit.runner.RunWith;
8+
import org.junit.jupiter.api.Test;
129
import org.springframework.beans.factory.annotation.Autowired;
1310
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1411
import org.springframework.boot.test.context.SpringBootTest;
1512
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1613
import org.springframework.http.MediaType;
1714
import org.springframework.test.annotation.Rollback;
1815
import org.springframework.test.context.ActiveProfiles;
19-
import org.springframework.test.context.junit4.SpringRunner;
2016
import org.springframework.test.web.servlet.MockMvc;
2117
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
2218
import org.springframework.transaction.annotation.Transactional;
2319

24-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
25-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
26-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
27-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
20+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
2821
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
2922
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
3023

31-
@RunWith(SpringRunner.class)
3224
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
3325
@Transactional
3426
@Rollback
@@ -48,9 +40,6 @@ public class BookControllerTest {
4840
private String image = "千里之外.png";
4941
private String summary = "千里之外,是周杰伦和费玉清一起发售的歌曲";
5042

51-
@Before
52-
public void setUp() throws Exception {
53-
}
5443

5544
@Test
5645
public void getBook() throws Exception {
@@ -167,8 +156,4 @@ public void deleteBook() throws Exception {
167156
jsonPath("$.message").value("删除图书成功"));
168157
}
169158

170-
171-
@After
172-
public void tearDown() throws Exception {
173-
}
174159
}

src/test/java/io/github/talelin/latticy/mapper/BookMapperTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package io.github.talelin.latticy.mapper;
22

33
import io.github.talelin.latticy.model.BookDO;
4-
import org.junit.Test;
5-
import org.junit.runner.RunWith;
4+
import org.junit.jupiter.api.Test;
65
import org.springframework.beans.factory.annotation.Autowired;
76
import org.springframework.boot.test.context.SpringBootTest;
87
import org.springframework.test.annotation.Rollback;
98
import org.springframework.test.context.ActiveProfiles;
10-
import org.springframework.test.context.junit4.SpringRunner;
119
import org.springframework.transaction.annotation.Transactional;
1210

1311
import java.util.List;
1412

15-
import static org.junit.Assert.*;
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
14+
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
1616

17-
@RunWith(SpringRunner.class)
1817
@SpringBootTest
1918
@Transactional
2019
@Rollback
Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package io.github.talelin.latticy.mapper;
22

33
import io.github.talelin.latticy.model.FileDO;
4-
import org.junit.After;
5-
import org.junit.Before;
6-
import org.junit.Test;
7-
import org.junit.runner.RunWith;
4+
import org.junit.jupiter.api.BeforeAll;
5+
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.TestInstance;
87
import org.springframework.beans.factory.annotation.Autowired;
98
import org.springframework.boot.test.context.SpringBootTest;
109
import org.springframework.test.annotation.Rollback;
1110
import org.springframework.test.context.ActiveProfiles;
12-
import org.springframework.test.context.junit4.SpringRunner;
1311
import org.springframework.transaction.annotation.Transactional;
1412

15-
import static org.junit.Assert.assertEquals;
13+
import static org.junit.jupiter.api.Assertions.assertEquals;
14+
1615

17-
@RunWith(SpringRunner.class)
1816
@SpringBootTest
1917
@Transactional
2018
@Rollback
2119
@ActiveProfiles("test")
20+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2221
public class FileMapperTest {
2322

2423
@Autowired
@@ -27,7 +26,7 @@ public class FileMapperTest {
2726
private String md5 = "iiiiilllllll";
2827
private String name = "千里之外";
2928

30-
@Before
29+
@BeforeAll
3130
public void setUp() throws Exception {
3231
FileDO fileDO = new FileDO();
3332
fileDO.setName(name);
@@ -44,7 +43,4 @@ public void testFindOneByMd5() {
4443
assertEquals(one.getName(), name);
4544
}
4645

47-
@After
48-
public void tearDown() throws Exception {
49-
}
5046
}

src/test/java/io/github/talelin/latticy/mapper/GroupMapperTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
import io.github.talelin.latticy.model.GroupDO;
44
import io.github.talelin.latticy.model.UserDO;
55
import io.github.talelin.latticy.model.UserGroupDO;
6-
import org.junit.Test;
7-
import org.junit.runner.RunWith;
6+
import org.junit.jupiter.api.Test;
87
import org.springframework.beans.factory.annotation.Autowired;
98
import org.springframework.boot.test.context.SpringBootTest;
109
import org.springframework.test.annotation.Rollback;
1110
import org.springframework.test.context.ActiveProfiles;
12-
import org.springframework.test.context.junit4.SpringRunner;
1311
import org.springframework.transaction.annotation.Transactional;
1412

1513
import java.util.List;
1614

17-
import static org.junit.Assert.assertTrue;
15+
import static org.junit.jupiter.api.Assertions.assertTrue;
16+
1817

19-
@RunWith(SpringRunner.class)
2018
@SpringBootTest
2119
@Transactional
2220
@Rollback

src/test/java/io/github/talelin/latticy/mapper/LogMapperTest.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,28 @@
33
import com.baomidou.mybatisplus.core.metadata.IPage;
44
import io.github.talelin.latticy.common.mybatis.Page;
55
import io.github.talelin.latticy.model.LogDO;
6-
import org.junit.After;
7-
import org.junit.Before;
8-
import org.junit.Test;
9-
import org.junit.runner.RunWith;
6+
import org.junit.jupiter.api.BeforeAll;
7+
import org.junit.jupiter.api.Test;
8+
import org.junit.jupiter.api.TestInstance;
109
import org.springframework.beans.factory.annotation.Autowired;
1110
import org.springframework.boot.test.context.SpringBootTest;
1211
import org.springframework.test.annotation.Rollback;
1312
import org.springframework.test.context.ActiveProfiles;
14-
import org.springframework.test.context.junit4.SpringRunner;
1513
import org.springframework.transaction.annotation.Transactional;
1614

1715
import java.util.Date;
1816
import java.util.List;
1917

20-
import static org.junit.Assert.assertTrue;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
19+
2120

22-
@RunWith(SpringRunner.class)
2321
@SpringBootTest
2422
@Transactional
2523
@Rollback
2624
@ActiveProfiles("test")
25+
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2726
public class LogMapperTest {
2827

29-
3028
@Autowired
3129
private LogMapper logMapper;
3230

@@ -39,7 +37,7 @@ public class LogMapperTest {
3937
private Integer userId = 1;
4038
private String username = "super";
4139

42-
@Before
40+
@BeforeAll
4341
public void setUp() throws Exception {
4442
LogDO logDO = new LogDO();
4543
logDO.setPermission(permission);
@@ -76,7 +74,4 @@ public void testFindLogsByUsernameAndRange1() {
7674
assertTrue(logs.size() == 0);
7775
}
7876

79-
@After
80-
public void tearDown() throws Exception {
81-
}
8277
}

0 commit comments

Comments
 (0)