Skip to content

Commit 43fa1a7

Browse files
committed
Migrate junit4 to junit5
1 parent 5494f9f commit 43fa1a7

File tree

20 files changed

+362
-416
lines changed

20 files changed

+362
-416
lines changed

SpringBootAsync/src/main/kotlin/com/example/kotlin/web/BasicController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class BasicController (val service: BasicService) {
1818

1919
private val webClient = WebClient.builder()
2020
.baseUrl("https://api.github.com")
21-
.defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)
21+
.defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
2222
.build()
2323

2424
@GetMapping("/async")

SpringBootConfigurable/src/test/java/com/example/java/AccountTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
@SpringBootTest
1818
@Transactional
1919
@Import({ConfigurableConfig.class, SecurityConfig.class})
20-
public class AccountTest {
20+
class AccountTest {
2121

2222
@PersistenceContext
2323
private EntityManager entityManager;
2424

2525
@DisplayName("Account 비밀번호 리셋 테스트")
2626
@Test
27-
public void test() {
27+
void test() {
2828
// given
2929
Account account = new Account("heowc", "1234");
3030
entityManager.persist(account);

SpringBootEvent/src/test/java/com/heowc/PasswordChangingServiceTest.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22

33
import com.heowc.domain.*;
44
import com.heowc.service.PasswordChangingService;
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
5+
import org.junit.jupiter.api.Test;
76
import org.springframework.beans.factory.annotation.Autowired;
87
import org.springframework.boot.test.context.SpringBootTest;
9-
import org.springframework.test.context.junit4.SpringRunner;
108

119
import static org.assertj.core.api.Assertions.assertThat;
1210
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1311

14-
@RunWith(SpringRunner.class)
1512
@SpringBootTest
16-
public class PasswordChangingServiceTest {
13+
class PasswordChangingServiceTest {
1714

1815
@Autowired
1916
private PasswordChangingService service;
@@ -22,7 +19,7 @@ public class PasswordChangingServiceTest {
2219
private MemberRepository repository;
2320

2421
@Test
25-
public void notFoundMemberId() {
22+
void notFoundMemberId() {
2623
// given
2724
repository.save(new Member("heowc1992", "1234"));
2825

@@ -34,7 +31,7 @@ public void notFoundMemberId() {
3431
}
3532

3633
@Test
37-
public void doesNotMatchedPassword() {
34+
void doesNotMatchedPassword() {
3835
// given
3936
repository.save(new Member("heowc1992", "1234"));
4037

@@ -46,7 +43,7 @@ public void doesNotMatchedPassword() {
4643
}
4744

4845
@Test
49-
public void changePassword() {
46+
void changePassword() {
5047
// given
5148
Member member = new Member("heowc1992", "1234");
5249
repository.save(member);

SpringBootGRpc/src/test/java/com/example/SpringBootGRpcApplicationTests.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,28 @@
33
import io.grpc.ManagedChannel;
44
import io.grpc.ManagedChannelBuilder;
55
import io.grpc.StatusRuntimeException;
6-
import org.junit.Before;
7-
import org.junit.Test;
8-
import org.junit.runner.RunWith;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.Test;
98
import org.slf4j.Logger;
109
import org.slf4j.LoggerFactory;
1110
import org.springframework.boot.test.context.SpringBootTest;
12-
import org.springframework.test.context.junit4.SpringRunner;
1311

14-
@RunWith(SpringRunner.class)
1512
@SpringBootTest
16-
public class SpringBootGRpcApplicationTests {
13+
class SpringBootGRpcApplicationTests {
1714

1815
private static final Logger logger = LoggerFactory.getLogger(SpringBootGRpcApplicationTests.class);
1916

2017
private ManagedChannel channel;
2118

22-
@Before
23-
public void init() {
19+
@BeforeEach
20+
void init() {
2421
channel = ManagedChannelBuilder.forAddress("localhost", 6565)
2522
.usePlaintext()
2623
.build();
2724
}
2825

2926
@Test
30-
public void test() {
27+
void test() {
3128
MessageSenderGrpc.MessageSenderBlockingStub messageSenderBlockingStub = MessageSenderGrpc.newBlockingStub(channel);
3229

3330
MessageSenderProto.MessageRequest messageRequest = MessageSenderProto.MessageRequest.newBuilder()
Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package com.tistory.heowc;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.slf4j.Logger;
65
import org.slf4j.LoggerFactory;
76
import org.springframework.boot.test.context.SpringBootTest;
8-
import org.springframework.test.context.junit4.SpringRunner;
97

10-
@RunWith(SpringRunner.class)
118
@SpringBootTest
12-
public class SpringBootLogStashApplicationTests {
9+
class SpringBootLogStashApplicationTests {
1310

14-
private static final Logger logger = LoggerFactory.getLogger(SpringBootLogStashApplicationTests.class);
15-
16-
@Test
17-
public void test_log() {
18-
logger.info("test1");
19-
logger.info("test2");
20-
logger.info("test3");
21-
logger.info("test4");
22-
logger.info("test5");
23-
}
11+
private static final Logger logger = LoggerFactory.getLogger(SpringBootLogStashApplicationTests.class);
12+
13+
@Test
14+
void test_log() {
15+
logger.info("test1");
16+
logger.info("test2");
17+
logger.info("test3");
18+
logger.info("test4");
19+
logger.info("test5");
20+
}
2421
}

SpringBootMybatis/src/test/java/com/tistory/heowc/UserDaoTests.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@
22

33
import com.tistory.heowc.dao.UserDao;
44
import com.tistory.heowc.domain.User;
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
5+
import org.junit.jupiter.api.Test;
76
import org.springframework.beans.factory.annotation.Autowired;
87
import org.springframework.boot.test.context.SpringBootTest;
9-
import org.springframework.test.context.junit4.SpringRunner;
108
import org.springframework.transaction.annotation.Transactional;
119

1210
import static org.assertj.core.api.Assertions.assertThat;
1311

14-
@RunWith(SpringRunner.class)
1512
@SpringBootTest
1613
@Transactional
17-
public class UserDaoTests {
14+
class UserDaoTests {
1815

1916
@Autowired
2017
private UserDao userDao;
2118

2219
@Test
23-
public void test_insert() {
20+
void test_insert() {
2421
// given
2522
User user = new User(2L, "wonchul", "seoul");
2623

@@ -35,7 +32,7 @@ public void test_insert() {
3532
}
3633

3734
@Test
38-
public void test_update() {
35+
void test_update() {
3936
// given
4037
User user = new User(1L, "wonchul", "seoul");
4138
Long idx = userDao.insert(user);
@@ -53,7 +50,7 @@ public void test_update() {
5350
}
5451

5552
@Test
56-
public void test_delete() {
53+
void test_delete() {
5754
// given
5855
User user = new User(1L, "wonchul", "seoul");
5956
Long idx = userDao.insert(user);

SpringBootMybatis/src/test/java/com/tistory/heowc/UserMapperTests.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,22 @@
22

33
import com.tistory.heowc.domain.User;
44
import com.tistory.heowc.mapper.UserMapper;
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
5+
import org.junit.jupiter.api.Test;
76
import org.springframework.beans.factory.annotation.Autowired;
87
import org.springframework.boot.test.context.SpringBootTest;
9-
import org.springframework.test.context.junit4.SpringRunner;
108
import org.springframework.transaction.annotation.Transactional;
119

1210
import static org.assertj.core.api.Assertions.assertThat;
1311

14-
@RunWith(SpringRunner.class)
1512
@SpringBootTest
1613
@Transactional
17-
public class UserMapperTests {
14+
class UserMapperTests {
1815

1916
@Autowired
2017
private UserMapper userMapper;
2118

2219
@Test
23-
public void test_insert() {
20+
void test_insert() {
2421
// given
2522
User user = new User(2L, "wonchul", "seoul");
2623

@@ -35,7 +32,7 @@ public void test_insert() {
3532
}
3633

3734
@Test
38-
public void test_update() {
35+
void test_update() {
3936
// given
4037
User user = new User(1L, "wonchul", "seoul");
4138
userMapper.insert(user);
@@ -53,7 +50,7 @@ public void test_update() {
5350
}
5451

5552
@Test
56-
public void test_delete() {
53+
void test_delete() {
5754
// given
5855
User user = new User(1L, "wonchul", "seoul");
5956
userMapper.insert(user);
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.tistory.heowc;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.test.context.junit4.SpringRunner;
75

8-
@RunWith(SpringRunner.class)
96
@SpringBootTest
10-
public class SpringBootNoticeApplicationTests {
7+
class SpringBootNoticeApplicationTests {
118

12-
@Test
13-
public void contextLoads() {
14-
}
9+
@Test
10+
void contextLoads() {
11+
}
1512

1613
}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.example;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.test.context.junit4.SpringRunner;
75

8-
@RunWith(SpringRunner.class)
96
@SpringBootTest
10-
public class SpringBootOath2ApplicationTests {
7+
class SpringBootOath2ApplicationTests {
118

12-
@Test
13-
public void contextLoads() {
14-
}
9+
@Test
10+
void contextLoads() {
11+
}
1512

1613
}

0 commit comments

Comments
 (0)