From bf51d0b709a80d985f1c295e92e549db9f9d5592 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 23 Feb 2024 09:08:45 +0100
Subject: [PATCH] OZG-4717 Removed TestService

---
 .../AdminExceptionHandlerITCase.java          | 33 ++++++++++++++-----
 .../common/errorhandling/HelperService.java   | 15 ---------
 .../errorhandling/TestErrorController.java    | 11 -------
 3 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 src/test/java/de/ozgcloud/admin/common/errorhandling/HelperService.java

diff --git a/src/test/java/de/ozgcloud/admin/common/errorhandling/AdminExceptionHandlerITCase.java b/src/test/java/de/ozgcloud/admin/common/errorhandling/AdminExceptionHandlerITCase.java
index ed27fe46..6b8a2689 100644
--- a/src/test/java/de/ozgcloud/admin/common/errorhandling/AdminExceptionHandlerITCase.java
+++ b/src/test/java/de/ozgcloud/admin/common/errorhandling/AdminExceptionHandlerITCase.java
@@ -3,12 +3,17 @@ package de.ozgcloud.admin.common.errorhandling;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
+import java.util.Set;
 import java.util.stream.Stream;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -18,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
@@ -67,10 +71,6 @@ public class AdminExceptionHandlerITCase {
 			return AdminExceptionHandler.STATUS_BY_EXCEPTION.entrySet().stream().map(kv -> Arguments.of(kv.getKey(), kv.getValue()));
 		}
 
-		@SneakyThrows
-		private ResultActions performGet() {
-			return mockMvc.perform(get(RootController.PATH));
-		}
 	}
 
 	@Nested
@@ -78,11 +78,26 @@ public class AdminExceptionHandlerITCase {
 		@Test
 		@SneakyThrows
 		void shouldHaveInfoInBody() {
-			var result = mockMvc
-					.perform(post("/api/test-error").content("{ \"string\" : \"\" }").contentType(MediaType.APPLICATION_JSON).with(csrf()));
+			when(modelAssembler.toModel(any())).thenAnswer((a) -> {
+				var validationObject = ValidatedClass.builder().build();
+				throw new ConstraintViolationException(getConstraintViolations(validationObject));
+			});
+
+			var result = performGet();
 
-			assertThat(result.andReturn().getResponse().getContentAsString()).contains("validatedClass.string");
+			assertThat(result.andReturn().getResponse().getContentAsString()).contains("string: Empty field");
 		}
+
+		private <T> Set<ConstraintViolation<T>> getConstraintViolations(T object) {
+			Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
+			return validator.validate(object);
+		}
+
+	}
+
+	@SneakyThrows
+	private ResultActions performGet() {
+		return mockMvc.perform(get(RootController.PATH));
 	}
 
 }
diff --git a/src/test/java/de/ozgcloud/admin/common/errorhandling/HelperService.java b/src/test/java/de/ozgcloud/admin/common/errorhandling/HelperService.java
deleted file mode 100644
index 43847acb..00000000
--- a/src/test/java/de/ozgcloud/admin/common/errorhandling/HelperService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.ozgcloud.admin.common.errorhandling;
-
-import jakarta.validation.Valid;
-
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@Validated
-class HelperService {
-
-	ValidatedClass returnValidObject(@Valid ValidatedClass validatedClass) {
-		return validatedClass;
-	}
-}
diff --git a/src/test/java/de/ozgcloud/admin/common/errorhandling/TestErrorController.java b/src/test/java/de/ozgcloud/admin/common/errorhandling/TestErrorController.java
index c467a2ae..c1044604 100644
--- a/src/test/java/de/ozgcloud/admin/common/errorhandling/TestErrorController.java
+++ b/src/test/java/de/ozgcloud/admin/common/errorhandling/TestErrorController.java
@@ -26,24 +26,18 @@ import java.util.Map;
 
 import jakarta.validation.ConstraintViolationException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import de.ozgcloud.common.errorhandling.TechnicalException;
-import io.micrometer.common.lang.NonNullApi;
 
 @RestController
 @RequestMapping("/api/test-error")
 class TestErrorController {
-	@Autowired
-	private HelperService service;
 
 	@FunctionalInterface
 	interface ExceptionProducer {
@@ -66,9 +60,4 @@ class TestErrorController {
 				Class.forName(errorClassName)).produceException();
 	}
 
-	@PostMapping
-	public ValidatedClass postMethodName(@RequestBody ValidatedClass object) {
-		return service.returnValidObject(object);
-	}
-
 }
-- 
GitLab