Modified the unit test

This commit is contained in:
kimyonghwa
2019-05-10 10:27:03 +09:00
parent 189e741ded
commit 69f3053371
3 changed files with 15 additions and 16 deletions

View File

@@ -51,12 +51,12 @@ public class UserController {
@ApiOperation(value = "회원 수정", notes = "회원정보를 수정한다") @ApiOperation(value = "회원 수정", notes = "회원정보를 수정한다")
@PutMapping(value = "/user") @PutMapping(value = "/user")
public SingleResult<User> modify( public SingleResult<User> modify(
@ApiParam(value = "회원번호", required = true) @RequestParam long msrl,
@ApiParam(value = "회원이름", required = true) @RequestParam String name) { @ApiParam(value = "회원이름", required = true) @RequestParam String name) {
User user = User.builder()
.msrl(msrl) Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
.name(name) String id = authentication.getName();
.build(); User user = userJpaRepo.findByUid(id).orElseThrow(CUserNotFoundException::new);
user.setName(name);
return responseService.getSingleResult(userJpaRepo.save(user)); return responseService.getSingleResult(userJpaRepo.save(user));
} }

View File

@@ -3,10 +3,7 @@ package com.rest.api.entity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.rest.api.entity.common.CommonDateEntity; import com.rest.api.entity.common.CommonDateEntity;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
@@ -20,6 +17,7 @@ import java.util.stream.Collectors;
@Builder // builder를 사용할수 있게 합니다. @Builder // builder를 사용할수 있게 합니다.
@Entity // jpa entity임을 알립니다. @Entity // jpa entity임을 알립니다.
@Getter // user 필드값의 getter를 자동으로 생성합니다. @Getter // user 필드값의 getter를 자동으로 생성합니다.
@Setter
@NoArgsConstructor // 인자없는 생성자를 자동으로 생성합니다. @NoArgsConstructor // 인자없는 생성자를 자동으로 생성합니다.
@AllArgsConstructor // 인자를 모두 갖춘 생성자를 자동으로 생성합니다. @AllArgsConstructor // 인자를 모두 갖춘 생성자를 자동으로 생성합니다.
@Table(name = "user") // 'user' 테이블과 매핑됨을 명시 @Table(name = "user") // 'user' 테이블과 매핑됨을 명시

View File

@@ -47,7 +47,7 @@ public class UserControllerTest {
@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()); //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");
@@ -75,8 +75,8 @@ public class UserControllerTest {
.get("/v1/users") .get("/v1/users")
.header("X-AUTH-TOKEN", "XXXXXXXXXX")) .header("X-AUTH-TOKEN", "XXXXXXXXXX"))
.andDo(print()) .andDo(print())
.andExpect(status().isOk()) .andExpect(status().is3xxRedirection())
.andExpect(forwardedUrl("/exception/entrypoint")); .andExpect(redirectedUrl("/exception/entrypoint"));
} }
@Test @Test
@@ -86,8 +86,8 @@ public class UserControllerTest {
.get("/v1/users")) .get("/v1/users"))
//.header("X-AUTH-TOKEN", token)) //.header("X-AUTH-TOKEN", token))
.andDo(print()) .andDo(print())
.andExpect(status().isOk()) .andExpect(status().is3xxRedirection())
.andExpect(forwardedUrl("/exception/accessdenied")); .andExpect(redirectedUrl("/exception/accessdenied"));
} }
@Test @Test
@@ -115,7 +115,7 @@ public class UserControllerTest {
@Test @Test
public void modify() throws Exception { public void modify() throws Exception {
MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
params.add("msrl", "1"); params.add("uid", "happydaddy@naver.com");
params.add("name", "행복전도사"); params.add("name", "행복전도사");
mockMvc.perform(MockMvcRequestBuilders mockMvc.perform(MockMvcRequestBuilders
.put("/v1/user") .put("/v1/user")
@@ -123,7 +123,8 @@ public class UserControllerTest {
.params(params)) .params(params))
.andDo(print()) .andDo(print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$.success").value(true)); .andExpect(jsonPath("$.success").value(true))
.andExpect(jsonPath("$.data.name").value("행복전도사"));
} }
@Test @Test