minor changes

This commit is contained in:
Tom Hombergs
2019-01-21 06:36:50 +01:00
parent 8d8937c6bf
commit 86e8458980
2 changed files with 16 additions and 5 deletions

View File

@@ -31,6 +31,17 @@ class RegisterRestControllerTest {
@MockBean
private RegisterUseCase registerUseCase;
@Test
void whenValidUrlAndMethodAndContentType_thenReturns200() throws Exception {
UserResource user = new UserResource("Zaphod", "zaphod@galaxy.net");
mockMvc.perform(post("/forums/42/register")
.contentType("application/json"))
.andExpect(status().isOk());
}
@Test
void whenValidInput_thenReturns200() throws Exception {
@@ -107,10 +118,10 @@ class RegisterRestControllerTest {
.andExpect(status().isOk())
.andReturn();
UserResource expectedResponseBody = user;
UserResource expected = user;
UserResource actualResponseBody = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), UserResource.class);
assertThat(expectedResponseBody.getName()).isEqualTo(actualResponseBody.getName());
assertThat(expectedResponseBody.getEmail()).isEqualTo(actualResponseBody.getEmail());
assertThat(expected.getName()).isEqualTo(actualResponseBody.getName());
assertThat(expected.getEmail()).isEqualTo(actualResponseBody.getEmail());
}
@@ -154,7 +165,7 @@ class RegisterRestControllerTest {
.param("sendWelcomeMail", "true")
.content(objectMapper.writeValueAsString(user)))
.andExpect(status().isBadRequest())
.andExpect(responseBody().containsErrorMessageForField("name", "must not be null"));
.andExpect(responseBody().containsError("name", "must not be null"));
}
}

View File

@@ -20,7 +20,7 @@ public class ResponseBodyMatchers {
};
}
public ResultMatcher containsErrorMessageForField(String expectedFieldName, String expectedMessage) {
public ResultMatcher containsError(String expectedFieldName, String expectedMessage) {
return mvcResult -> {
String json = mvcResult.getResponse().getContentAsString();
ErrorResult errorResult = objectMapper.readValue(json, ErrorResult.class);