diff --git a/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerITCase.java b/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerITCase.java index 11a6898574967d35aca1330b64adf1176efb9d92..e965505fc19fda822757ed5b189c88fb9a1d7484 100644 --- a/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerITCase.java +++ b/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerITCase.java @@ -7,6 +7,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import java.util.Set; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotEmpty; + import org.apache.commons.lang3.StringUtils; import org.assertj.core.util.Arrays; import org.junit.jupiter.api.Nested; @@ -21,11 +27,6 @@ import org.springframework.test.web.servlet.ResultActions; import de.ozgcloud.admin.RootController; import de.ozgcloud.admin.RootModelAssembler; import de.ozgcloud.common.test.ITCase; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.constraints.NotEmpty; import lombok.Builder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerTest.java b/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerTest.java index bce4393f3896c53e8762b8ce44d0073ffdd29cd3..367ed8afd534aa2c443453447e060011b6c1bd22 100644 --- a/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerTest.java +++ b/src/test/java/de/ozgcloud/admin/common/errorhandling/ExceptionControllerTest.java @@ -21,7 +21,7 @@ */ package de.ozgcloud.admin.common.errorhandling; -import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @@ -39,6 +39,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.jayway.jsonpath.JsonPath; + import de.ozgcloud.common.errorhandling.TechnicalException; import lombok.SneakyThrows; @@ -292,7 +294,7 @@ class ExceptionControllerTest { void shouldContainErrorMessage() { var result = doPerformGet(); - result.andExpect(content().string(containsString("Functional error: error message"))); + assertTrue(getDetailFromResponseContent(result).contains("Functional error: error message")); } @SneakyThrows @@ -300,7 +302,7 @@ class ExceptionControllerTest { void shouldContainExceptionId() { var result = doPerformGet(); - result.andExpect(content().string(containsString("(ExceptionId: "))); + assertTrue(getDetailFromResponseContent(result).contains("(ExceptionId: ")); } } @@ -370,7 +372,7 @@ class ExceptionControllerTest { void shouldContainErrorMessage() { var result = doPerformGet(); - result.andExpect(content().string(containsString("error message"))); + assertTrue(getDetailFromResponseContent(result).contains("error message")); } @SneakyThrows @@ -378,7 +380,7 @@ class ExceptionControllerTest { void shouldContainExceptionId() { var result = doPerformGet(); - result.andExpect(content().string(containsString("(ExceptionId: "))); + assertTrue(getDetailFromResponseContent(result).contains("(ExceptionId: ")); } } @@ -403,6 +405,11 @@ class ExceptionControllerTest { return mockMvc.perform(get(TEST_ERROR_ENDPOINT)); } } + + @SneakyThrows + private String getDetailFromResponseContent(ResultActions resultActions) { + return JsonPath.read(resultActions.andReturn().getResponse().getContentAsString(), "$.detail"); + } } @RestController