diff --git a/src/test/java/com/rest/api/controller/v1/SignControllerTest.java b/src/test/java/com/rest/api/controller/v1/SignControllerTest.java index c21b831..b28322d 100644 --- a/src/test/java/com/rest/api/controller/v1/SignControllerTest.java +++ b/src/test/java/com/rest/api/controller/v1/SignControllerTest.java @@ -1,11 +1,15 @@ 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.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; 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.web.servlet.MockMvc; import org.springframework.transaction.annotation.Transactional; @@ -14,6 +18,7 @@ import org.springframework.util.MultiValueMap; import java.time.LocalDateTime; 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.result.MockMvcResultHandlers.print; @@ -29,6 +34,17 @@ public class SignControllerTest { @Autowired 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 public void signin() throws Exception { MultiValueMap params = new LinkedMultiValueMap<>(); @@ -95,8 +111,8 @@ public class SignControllerTest { .andExpect(jsonPath("$.code").value(-1004)); } - @Test - public void signUpProvider() throws Exception { + @Test @Ignore + public void signUpSocial() throws Exception { MultiValueMap params = new LinkedMultiValueMap<>(); params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw"); params.add("name", "kakaoKing!"); @@ -107,8 +123,8 @@ public class SignControllerTest { .andExpect(jsonPath("$.code").value(0)); } - @Test - public void signInProvider() throws Exception { + @Test @Ignore + public void signInSocial() throws Exception { MultiValueMap params = new LinkedMultiValueMap<>(); params.add("accessToken", "HizF3ir9522bMW3shkO0x0T9zBdXFCW1WsF56Qo9dVsAAAFqMwTqHw"); mockMvc.perform(post("/v1/signin/kakao").params(params)) diff --git a/src/test/java/com/rest/api/controller/v1/UserControllerTest.java b/src/test/java/com/rest/api/controller/v1/UserControllerTest.java index 1f54444..a4d410a 100644 --- a/src/test/java/com/rest/api/controller/v1/UserControllerTest.java +++ b/src/test/java/com/rest/api/controller/v1/UserControllerTest.java @@ -1,5 +1,8 @@ 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.Test; 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.test.autoconfigure.web.servlet.AutoConfigureMockMvc; 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.test.context.junit4.SpringRunner; 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.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.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @@ -29,10 +37,17 @@ public class UserControllerTest { @Autowired private MockMvc mockMvc; + @Autowired + private UserJpaRepo userJpaRepo; + + @Autowired + private PasswordEncoder passwordEncoder; + private String token; @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()); MultiValueMap params = new LinkedMultiValueMap<>(); params.add("id", "happydaddy@naver.com"); params.add("password", "1234"); @@ -50,6 +65,10 @@ public class UserControllerTest { token = jsonParser.parseMap(resultString).get("data").toString(); } + @After + public void tearDown() throws Exception { + } + @Test public void invalidToken() throws Exception { mockMvc.perform(MockMvcRequestBuilders @@ -109,8 +128,10 @@ public class UserControllerTest { @Test public void delete() throws Exception { + Optional user = userJpaRepo.findByUid("happydaddy@naver.com"); + assertTrue(user.isPresent()); mockMvc.perform(MockMvcRequestBuilders - .delete("/v1/user/2") + .delete("/v1/user/" + user.get().getMsrl()) .header("X-AUTH-TOKEN", token)) .andDo(print()) .andExpect(status().isOk()) diff --git a/src/test/java/com/rest/api/service/social/KakaoServiceTest.java b/src/test/java/com/rest/api/service/social/KakaoServiceTest.java index bd2f1da..a06288b 100644 --- a/src/test/java/com/rest/api/service/social/KakaoServiceTest.java +++ b/src/test/java/com/rest/api/service/social/KakaoServiceTest.java @@ -1,6 +1,7 @@ package com.rest.api.service.social; import com.rest.api.model.social.KakaoProfile; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +17,7 @@ public class KakaoServiceTest { @Autowired private KakaoService kakaoService; - @Test + @Test @Ignore public void whenGetKakaoProfile_thenReturnProfile() { String accessToken = "xjsMzpQtIr4w13FIQvL3R7BW7X4yvm1KmzXCTwopyWAAAAFqMxEcwA";