Skip to content

Commit 2e95f37

Browse files
committed
Migrate junit4 to junit5
1 parent c797b85 commit 2e95f37

File tree

3 files changed

+69
-78
lines changed

3 files changed

+69
-78
lines changed

SpringBootTest/src/test/java/com/example/MockMvcTest.java

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,41 @@
44
import com.example.service.BasicService;
55
import com.example.web.BasicController;
66
import com.fasterxml.jackson.databind.ObjectMapper;
7-
import org.junit.Test;
8-
import org.junit.runner.RunWith;
7+
import org.junit.jupiter.api.Test;
98
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
1110
import org.springframework.boot.test.mock.mockito.MockBean;
1211
import org.springframework.http.MediaType;
13-
import org.springframework.test.context.junit4.SpringRunner;
1412
import org.springframework.test.web.servlet.MockMvc;
1513

1614
import static org.mockito.BDDMockito.given;
1715
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
1816
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
1917
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
2018

21-
@RunWith(SpringRunner.class)
2219
@WebMvcTest(BasicController.class)
2320
public class MockMvcTest {
2421

25-
@Autowired
26-
private MockMvc mvc;
22+
@Autowired
23+
private MockMvc mvc;
2724

28-
@MockBean
29-
private BasicService service;
25+
@MockBean
26+
private BasicService service;
3027

31-
@Autowired
32-
private ObjectMapper mapper;
28+
@Autowired
29+
private ObjectMapper mapper;
3330

34-
@Test
35-
public void test() throws Exception {
36-
TestMessage message = new TestMessage("wonchul", 0);
37-
String result = mapper.writeValueAsString(message);
31+
@Test
32+
public void test() throws Exception {
33+
TestMessage message = new TestMessage("wonchul", 0);
34+
String result = mapper.writeValueAsString(message);
3835

39-
given(service.jsonTest())
40-
.willReturn(message);
36+
given(service.jsonTest())
37+
.willReturn(message);
4138

42-
mvc.perform(get("/jsonTest")
43-
.accept(MediaType.APPLICATION_JSON_UTF8))
44-
.andExpect(status().isOk())
45-
.andExpect(content().json(result));
46-
}
39+
mvc.perform(get("/jsonTest")
40+
.accept(MediaType.APPLICATION_JSON))
41+
.andExpect(status().isOk())
42+
.andExpect(content().json(result));
43+
}
4744
}
Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
11
package com.example;
22

33
import com.example.service.BasicService;
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.boot.test.context.SpringBootTest.WebEnvironment;
98
import org.springframework.boot.test.mock.mockito.MockBean;
109
import org.springframework.boot.test.web.client.TestRestTemplate;
11-
import org.springframework.test.context.junit4.SpringRunner;
1210

1311
import static org.assertj.core.api.Assertions.assertThat;
1412
import static org.mockito.BDDMockito.given;
1513

16-
@RunWith(SpringRunner.class)
1714
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
1815
public class MockTest {
1916

20-
@Autowired
21-
TestRestTemplate restTemplate;
17+
@Autowired
18+
TestRestTemplate restTemplate;
2219

23-
@MockBean
24-
BasicService service;
20+
@MockBean
21+
BasicService service;
2522

26-
@Test
27-
public void test() {
28-
given(service.test(0))
29-
.willReturn("Spring Boot Service Test");
23+
@Test
24+
public void test() {
25+
given(service.test(0))
26+
.willReturn("Spring Boot Service Test");
3027

31-
String result = restTemplate.getForObject("/test?flag=0", String.class);
32-
assertThat(result)
33-
.isEqualTo("Spring Boot Service Test");
34-
}
28+
String result = restTemplate.getForObject("/test?flag=0", String.class);
29+
assertThat(result)
30+
.isEqualTo("Spring Boot Service Test");
31+
}
3532

36-
@Test
37-
public void mockTest() {
38-
given(service.test(0))
39-
.willReturn("Spring Boot Service Test");
33+
@Test
34+
public void mockTest() {
35+
given(service.test(0))
36+
.willReturn("Spring Boot Service Test");
4037

41-
assertThat(service.test(0))
42-
.isEqualTo("Spring Boot Service Test");
43-
}
38+
assertThat(service.test(0))
39+
.isEqualTo("Spring Boot Service Test");
40+
}
4441
}
Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,52 @@
11
package com.example;
22

3-
import org.junit.*;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.*;
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

108
import static org.assertj.core.api.Assertions.assertThat;
119

12-
@RunWith(SpringRunner.class)
1310
@SpringBootTest
1411
public class SimpleTest {
1512

16-
private static final Logger logger = LoggerFactory.getLogger(SimpleTest.class);
13+
private static final Logger logger = LoggerFactory.getLogger(SimpleTest.class);
1714

18-
@BeforeClass
19-
public static void onBeforeClass() {
20-
logger.info("================= onBeforeClass()");
21-
}
15+
@BeforeAll
16+
public static void onBeforeClass() {
17+
logger.info("================= onBeforeClass()");
18+
}
2219

23-
@AfterClass
24-
public static void onAfterClass() {
25-
logger.info("================= onAfterClass()");
26-
}
20+
@AfterAll
21+
public static void onAfterClass() {
22+
logger.info("================= onAfterClass()");
23+
}
2724

28-
@Before
29-
public void onBefore() {
30-
logger.info("================= onBefore()");
31-
}
25+
@BeforeEach
26+
public void onBefore() {
27+
logger.info("================= onBefore()");
28+
}
3229

33-
@After
34-
public void onAfter() {
35-
logger.info("================= onAfter()");
36-
}
30+
@AfterEach
31+
public void onAfter() {
32+
logger.info("================= onAfter()");
33+
}
3734

38-
@Test
39-
public void test1() {
40-
logger.info("================= test1()");
41-
assertThat(add(0, 0)).isEqualTo(0);
35+
@Test
36+
public void test1() {
37+
logger.info("================= test1()");
38+
assertThat(add(0, 0)).isEqualTo(0);
4239

4340
// assertThat(33).as("check %s's age", "Won Chul").isEqualTo(33);
44-
}
41+
}
4542

46-
@Test
47-
public void test2() {
48-
logger.info("================= test2()");
49-
assertThat(add(1, 2)).isEqualTo(3);
50-
}
43+
@Test
44+
public void test2() {
45+
logger.info("================= test2()");
46+
assertThat(add(1, 2)).isEqualTo(3);
47+
}
5148

52-
public double add(double num1, double num2) {
53-
return num1 + num2;
54-
}
49+
public double add(double num1, double num2) {
50+
return num1 + num2;
51+
}
5552
}

0 commit comments

Comments
 (0)