diff --git a/spring-boot/spring-boot-testing/gradlew b/spring-boot/spring-boot-testing/gradlew old mode 100644 new mode 100755 diff --git a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/RegisterRestControllerTest.java b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/RegisterRestControllerTest.java index f7006ca..f4531d8 100644 --- a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/RegisterRestControllerTest.java +++ b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/RegisterRestControllerTest.java @@ -88,9 +88,8 @@ class RegisterRestControllerTest { UserResource expectedResponseBody = user; String actualResponseBody = mvcResult.getResponse().getContentAsString(); - assertThat(objectMapper.writeValueAsString(expectedResponseBody)) - .isEqualToIgnoringWhitespace(actualResponseBody); - + assertThat(actualResponseBody).isEqualToIgnoringWhitespace( + objectMapper.writeValueAsString(expectedResponseBody)); } @Test @@ -121,8 +120,8 @@ class RegisterRestControllerTest { UserResource expected = user; UserResource actualResponseBody = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), UserResource.class); - assertThat(expected.getName()).isEqualTo(actualResponseBody.getName()); - assertThat(expected.getEmail()).isEqualTo(actualResponseBody.getEmail()); + assertThat(actualResponseBody.getName()).isEqualTo(expected.getName()); + assertThat(actualResponseBody.getEmail()).isEqualTo(expected.getEmail()); } @@ -153,7 +152,7 @@ class RegisterRestControllerTest { ErrorResult expectedErrorResponse = new ErrorResult("name", "must not be null"); String actualResponseBody = mvcResult.getResponse().getContentAsString(); String expectedResponseBody = objectMapper.writeValueAsString(expectedErrorResponse); - assertThat(expectedResponseBody).isEqualToIgnoringWhitespace(actualResponseBody); + assertThat(actualResponseBody).isEqualToIgnoringWhitespace(expectedResponseBody); } @Test diff --git a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/ResponseBodyMatchers.java b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/ResponseBodyMatchers.java index 0278c06..da4ac6a 100644 --- a/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/ResponseBodyMatchers.java +++ b/spring-boot/spring-boot-testing/src/test/java/io/reflectoring/testing/web/ResponseBodyMatchers.java @@ -16,7 +16,7 @@ public class ResponseBodyMatchers { return mvcResult -> { String json = mvcResult.getResponse().getContentAsString(); T actualObject = objectMapper.readValue(json, targetClass); - assertThat(expectedObject).isEqualToComparingFieldByField(actualObject); + assertThat(actualObject).isEqualToComparingFieldByField(expectedObject); }; }