Fix linting

moia-oss · Jun 3, 2024 · 1ecb2ff · 1ecb2ff
1 parent 02561fd
commit 1ecb2ff
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 37 deletions.
diff --git a/...-openapi-request-validator/src/test/kotlin/io/moia/router/openapi/OpenApiValidatorTest.kt b/...-openapi-request-validator/src/test/kotlin/io/moia/router/openapi/OpenApiValidatorTest.kt
@@ -10,15 +10,15 @@ import org.assertj.core.api.BDDAssertions.thenThrownBy
 import org.junit.jupiter.api.Test
 
 class OpenApiValidatorTest {
-
     val testHandler = TestRequestHandler()
 
     val validator = OpenApiValidator("openapi.yml")
 
     @Test
     fun `should handle and validate request`() {
-        val request = GET("/tests")
-            .withHeaders(mapOf("Accept" to "application/json"))
+        val request =
+            GET("/tests")
+                .withHeaders(mapOf("Accept" to "application/json"))
 
         val response = testHandler.handleRequest(request, mockk())
 
@@ -29,8 +29,9 @@ class OpenApiValidatorTest {
 
     @Test
     fun `should fail on undocumented request`() {
-        val request = GET("/tests-not-documented")
-            .withHeaders(mapOf("Accept" to "application/json"))
+        val request =
+            GET("/tests-not-documented")
+                .withHeaders(mapOf("Accept" to "application/json"))
 
         val response = testHandler.handleRequest(request, mockk())
 
@@ -40,37 +41,39 @@ class OpenApiValidatorTest {
 
     @Test
     fun `should fail on invalid schema`() {
-        val request = GET("/tests")
-            .withHeaders(mapOf("Accept" to "application/json"))
+        val request =
+            GET("/tests")
+                .withHeaders(mapOf("Accept" to "application/json"))
 
-        val response = TestInvalidRequestHandler()
-            .handleRequest(request, mockk())
+        val response =
+            TestInvalidRequestHandler()
+                .handleRequest(request, mockk())
 
         thenThrownBy { validator.assertValid(request, response) }.isInstanceOf(OpenApiValidator.ApiInteractionInvalid::class.java)
     }
 
     class TestRequestHandler : RequestHandler() {
-
         data class TestResponse(val name: String)
 
-        override val router = Router.router {
-            GET("/tests") { _: Request<Unit> ->
-                ResponseEntity.ok(TestResponse("Hello"))
+        override val router =
+            Router.router {
+                GET("/tests") { _: Request<Unit> ->
+                    ResponseEntity.ok(TestResponse("Hello"))
+                }
+                GET("/tests-not-documented") { _: Request<Unit> ->
+                    ResponseEntity.ok(TestResponse("Hello"))
+                }
             }
-            GET("/tests-not-documented") { _: Request<Unit> ->
-                ResponseEntity.ok(TestResponse("Hello"))
-            }
-        }
     }
 
     class TestInvalidRequestHandler : RequestHandler() {
-
         data class TestResponseInvalid(val invalid: String)
 
-        override val router = Router.router {
-            GET("/tests") { _: Request<Unit> ->
-                ResponseEntity.ok(TestResponseInvalid("Hello"))
+        override val router =
+            Router.router {
+                GET("/tests") { _: Request<Unit> ->
+                    ResponseEntity.ok(TestResponseInvalid("Hello"))
+                }
             }
-        }
     }
 }
diff --git a/...st-validator/src/test/kotlin/io/moia/router/openapi/ValidatingRequestRouterWrapperTest.kt b/...st-validator/src/test/kotlin/io/moia/router/openapi/ValidatingRequestRouterWrapperTest.kt
@@ -12,11 +12,11 @@ import org.assertj.core.api.BDDAssertions.thenThrownBy
 import org.junit.jupiter.api.Test
 
 class ValidatingRequestRouterWrapperTest {
-
     @Test
     fun `should return response on successful validation`() {
-        val response = ValidatingRequestRouterWrapper(TestRequestHandler(), "openapi.yml")
-            .handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
+        val response =
+            ValidatingRequestRouterWrapper(TestRequestHandler(), "openapi.yml")
+                .handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
 
         then(response.statusCode).isEqualTo(200)
     }
@@ -43,8 +43,12 @@ class ValidatingRequestRouterWrapperTest {
 
     @Test
     fun `should skip validation`() {
-        val response = ValidatingRequestRouterWrapper(InvalidTestRequestHandler(), "openapi.yml")
-            .handleRequestSkippingRequestAndResponseValidation(GET("/path-not-documented").withAcceptHeader("application/json"), mockk())
+        val response =
+            ValidatingRequestRouterWrapper(InvalidTestRequestHandler(), "openapi.yml")
+                .handleRequestSkippingRequestAndResponseValidation(
+                    GET("/path-not-documented").withAcceptHeader("application/json"),
+                    mockk(),
+                )
         then(response.statusCode).isEqualTo(404)
     }
 
@@ -54,7 +58,7 @@ class ValidatingRequestRouterWrapperTest {
             ValidatingRequestRouterWrapper(
                 delegate = OpenApiValidatorTest.TestRequestHandler(),
                 specUrlOrPayload = "openapi.yml",
-                additionalRequestValidationFunctions = listOf({ _ -> throw RequestValidationFailedException() })
+                additionalRequestValidationFunctions = listOf({ _ -> throw RequestValidationFailedException() }),
             )
                 .handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
         }
@@ -67,29 +71,32 @@ class ValidatingRequestRouterWrapperTest {
             ValidatingRequestRouterWrapper(
                 delegate = OpenApiValidatorTest.TestRequestHandler(),
                 specUrlOrPayload = "openapi.yml",
-                additionalResponseValidationFunctions = listOf({ _, _ -> throw ResponseValidationFailedException() })
+                additionalResponseValidationFunctions = listOf({ _, _ -> throw ResponseValidationFailedException() }),
             )
                 .handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
         }
             .isInstanceOf(ResponseValidationFailedException::class.java)
     }
 
     private class RequestValidationFailedException : RuntimeException("request validation failed")
+
     private class ResponseValidationFailedException : RuntimeException("request validation failed")
 
     private class TestRequestHandler : RequestHandler() {
-        override val router = router {
-            GET("/tests") { _: Request<Unit> ->
-                ResponseEntity.ok("""{"name": "some"}""")
+        override val router =
+            router {
+                GET("/tests") { _: Request<Unit> ->
+                    ResponseEntity.ok("""{"name": "some"}""")
+                }
             }
-        }
     }
 
     private class InvalidTestRequestHandler : RequestHandler() {
-        override val router = router {
-            GET("/tests") { _: Request<Unit> ->
-                ResponseEntity.notFound(Unit)
+        override val router =
+            router {
+                GET("/tests") { _: Request<Unit> ->
+                    ResponseEntity.notFound(Unit)
+                }
             }
-        }
     }
 }