Modify Unit Test

This commit is contained in:
kimyonghwa
2019-05-02 22:41:22 +09:00
parent a63177676b
commit e390958e9a
3 changed files with 44 additions and 6 deletions

View File

@@ -1,11 +1,15 @@
package com.rest.api.controller.v1; package com.rest.api.controller.v1;
import com.rest.api.entity.User;
import com.rest.api.repo.UserJpaRepo;
import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -14,6 +18,7 @@ import org.springframework.util.MultiValueMap;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Collections;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -29,6 +34,17 @@ public class SignControllerTest {
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;
@Autowired
private UserJpaRepo userJpaRepo;
@Autowired
private PasswordEncoder passwordEncoder;
@Before
public void setUp() throws Exception {
userJpaRepo.save(User.builder().uid("happydaddy@naver.com").name("happydaddy").password(passwordEncoder.encode("1234")).roles(Collections.singletonList("ROLE_USER")).build());
}
@Test @Test
public void signin() throws Exception { public void signin() throws Exception {
MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
@@ -95,8 +111,8 @@ public class SignControllerTest {
.andExpect(jsonPath("$.code").value(-1004)); .andExpect(jsonPath("$.code").value(-1004));
} }
@Test @Test @Ignore
public void signUpProvider() throws Exception { public void signUpSocial() throws Exception {
MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw"); params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw");
params.add("name", "kakaoKing!"); params.add("name", "kakaoKing!");
@@ -107,8 +123,8 @@ public class SignControllerTest {
.andExpect(jsonPath("$.code").value(0)); .andExpect(jsonPath("$.code").value(0));
} }
@Test @Test @Ignore
public void signInProvider() throws Exception { public void signInSocial() throws Exception {
MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw"); params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw");
mockMvc.perform(post("/v1/signin/kakao").params(params)) mockMvc.perform(post("/v1/signin/kakao").params(params))

View File

@@ -1,5 +1,8 @@
package com.rest.api.controller.v1; package com.rest.api.controller.v1;
import com.rest.api.entity.User;
import com.rest.api.repo.UserJpaRepo;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -7,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.json.JacksonJsonParser; import org.springframework.boot.json.JacksonJsonParser;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.test.context.support.WithMockUser; import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
@@ -16,6 +20,10 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import java.util.Collections;
import java.util.Optional;
import static org.junit.Assert.assertTrue;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -29,10 +37,17 @@ public class UserControllerTest {
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;
@Autowired
private UserJpaRepo userJpaRepo;
@Autowired
private PasswordEncoder passwordEncoder;
private String token; private String token;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
userJpaRepo.save(User.builder().uid("happydaddy@naver.com").name("happydaddy").password(passwordEncoder.encode("1234")).roles(Collections.singletonList("ROLE_USER")).build());
MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("id", "happydaddy@naver.com"); params.add("id", "happydaddy@naver.com");
params.add("password", "1234"); params.add("password", "1234");
@@ -50,6 +65,10 @@ public class UserControllerTest {
token = jsonParser.parseMap(resultString).get("data").toString(); token = jsonParser.parseMap(resultString).get("data").toString();
} }
@After
public void tearDown() throws Exception {
}
@Test @Test
public void invalidToken() throws Exception { public void invalidToken() throws Exception {
mockMvc.perform(MockMvcRequestBuilders mockMvc.perform(MockMvcRequestBuilders
@@ -109,8 +128,10 @@ public class UserControllerTest {
@Test @Test
public void delete() throws Exception { public void delete() throws Exception {
Optional<User> user = userJpaRepo.findByUid("happydaddy@naver.com");
assertTrue(user.isPresent());
mockMvc.perform(MockMvcRequestBuilders mockMvc.perform(MockMvcRequestBuilders
.delete("/v1/user/2") .delete("/v1/user/" + user.get().getMsrl())
.header("X-AUTH-TOKEN", token)) .header("X-AUTH-TOKEN", token))
.andDo(print()) .andDo(print())
.andExpect(status().isOk()) .andExpect(status().isOk())

View File

@@ -1,6 +1,7 @@
package com.rest.api.service.social; package com.rest.api.service.social;
import com.rest.api.model.social.KakaoProfile; import com.rest.api.model.social.KakaoProfile;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,7 @@ public class KakaoServiceTest {
@Autowired @Autowired
private KakaoService kakaoService; private KakaoService kakaoService;
@Test @Test @Ignore
public void whenGetKakaoProfile_thenReturnProfile() { public void whenGetKakaoProfile_thenReturnProfile() {
String accessToken = "xjsMzpQtIr4w13FIQvL3R7BW7X4yvm1KmzXCTwopyWAAAAFqMxEcwA"; String accessToken = "xjsMzpQtIr4w13FIQvL3R7BW7X4yvm1KmzXCTwopyWAAAAFqMxEcwA";