Skip to content

Commit 1ecb2ff

Browse files
committed
Fix linting
1 parent 02561fd commit 1ecb2ff

File tree

2 files changed

+47
-37
lines changed

2 files changed

+47
-37
lines changed

router-openapi-request-validator/src/test/kotlin/io/moia/router/openapi/OpenApiValidatorTest.kt

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import org.assertj.core.api.BDDAssertions.thenThrownBy
1010
import org.junit.jupiter.api.Test
1111

1212
class OpenApiValidatorTest {
13-
1413
val testHandler = TestRequestHandler()
1514

1615
val validator = OpenApiValidator("openapi.yml")
1716

1817
@Test
1918
fun `should handle and validate request`() {
20-
val request = GET("/tests")
21-
.withHeaders(mapOf("Accept" to "application/json"))
19+
val request =
20+
GET("/tests")
21+
.withHeaders(mapOf("Accept" to "application/json"))
2222

2323
val response = testHandler.handleRequest(request, mockk())
2424

@@ -29,8 +29,9 @@ class OpenApiValidatorTest {
2929

3030
@Test
3131
fun `should fail on undocumented request`() {
32-
val request = GET("/tests-not-documented")
33-
.withHeaders(mapOf("Accept" to "application/json"))
32+
val request =
33+
GET("/tests-not-documented")
34+
.withHeaders(mapOf("Accept" to "application/json"))
3435

3536
val response = testHandler.handleRequest(request, mockk())
3637

@@ -40,37 +41,39 @@ class OpenApiValidatorTest {
4041

4142
@Test
4243
fun `should fail on invalid schema`() {
43-
val request = GET("/tests")
44-
.withHeaders(mapOf("Accept" to "application/json"))
44+
val request =
45+
GET("/tests")
46+
.withHeaders(mapOf("Accept" to "application/json"))
4547

46-
val response = TestInvalidRequestHandler()
47-
.handleRequest(request, mockk())
48+
val response =
49+
TestInvalidRequestHandler()
50+
.handleRequest(request, mockk())
4851

4952
thenThrownBy { validator.assertValid(request, response) }.isInstanceOf(OpenApiValidator.ApiInteractionInvalid::class.java)
5053
}
5154

5255
class TestRequestHandler : RequestHandler() {
53-
5456
data class TestResponse(val name: String)
5557

56-
override val router = Router.router {
57-
GET("/tests") { _: Request<Unit> ->
58-
ResponseEntity.ok(TestResponse("Hello"))
58+
override val router =
59+
Router.router {
60+
GET("/tests") { _: Request<Unit> ->
61+
ResponseEntity.ok(TestResponse("Hello"))
62+
}
63+
GET("/tests-not-documented") { _: Request<Unit> ->
64+
ResponseEntity.ok(TestResponse("Hello"))
65+
}
5966
}
60-
GET("/tests-not-documented") { _: Request<Unit> ->
61-
ResponseEntity.ok(TestResponse("Hello"))
62-
}
63-
}
6467
}
6568

6669
class TestInvalidRequestHandler : RequestHandler() {
67-
6870
data class TestResponseInvalid(val invalid: String)
6971

70-
override val router = Router.router {
71-
GET("/tests") { _: Request<Unit> ->
72-
ResponseEntity.ok(TestResponseInvalid("Hello"))
72+
override val router =
73+
Router.router {
74+
GET("/tests") { _: Request<Unit> ->
75+
ResponseEntity.ok(TestResponseInvalid("Hello"))
76+
}
7377
}
74-
}
7578
}
7679
}

router-openapi-request-validator/src/test/kotlin/io/moia/router/openapi/ValidatingRequestRouterWrapperTest.kt

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import org.assertj.core.api.BDDAssertions.thenThrownBy
1212
import org.junit.jupiter.api.Test
1313

1414
class ValidatingRequestRouterWrapperTest {
15-
1615
@Test
1716
fun `should return response on successful validation`() {
18-
val response = ValidatingRequestRouterWrapper(TestRequestHandler(), "openapi.yml")
19-
.handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
17+
val response =
18+
ValidatingRequestRouterWrapper(TestRequestHandler(), "openapi.yml")
19+
.handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
2020

2121
then(response.statusCode).isEqualTo(200)
2222
}
@@ -43,8 +43,12 @@ class ValidatingRequestRouterWrapperTest {
4343

4444
@Test
4545
fun `should skip validation`() {
46-
val response = ValidatingRequestRouterWrapper(InvalidTestRequestHandler(), "openapi.yml")
47-
.handleRequestSkippingRequestAndResponseValidation(GET("/path-not-documented").withAcceptHeader("application/json"), mockk())
46+
val response =
47+
ValidatingRequestRouterWrapper(InvalidTestRequestHandler(), "openapi.yml")
48+
.handleRequestSkippingRequestAndResponseValidation(
49+
GET("/path-not-documented").withAcceptHeader("application/json"),
50+
mockk(),
51+
)
4852
then(response.statusCode).isEqualTo(404)
4953
}
5054

@@ -54,7 +58,7 @@ class ValidatingRequestRouterWrapperTest {
5458
ValidatingRequestRouterWrapper(
5559
delegate = OpenApiValidatorTest.TestRequestHandler(),
5660
specUrlOrPayload = "openapi.yml",
57-
additionalRequestValidationFunctions = listOf({ _ -> throw RequestValidationFailedException() })
61+
additionalRequestValidationFunctions = listOf({ _ -> throw RequestValidationFailedException() }),
5862
)
5963
.handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
6064
}
@@ -67,29 +71,32 @@ class ValidatingRequestRouterWrapperTest {
6771
ValidatingRequestRouterWrapper(
6872
delegate = OpenApiValidatorTest.TestRequestHandler(),
6973
specUrlOrPayload = "openapi.yml",
70-
additionalResponseValidationFunctions = listOf({ _, _ -> throw ResponseValidationFailedException() })
74+
additionalResponseValidationFunctions = listOf({ _, _ -> throw ResponseValidationFailedException() }),
7175
)
7276
.handleRequest(GET("/tests").withAcceptHeader("application/json"), mockk())
7377
}
7478
.isInstanceOf(ResponseValidationFailedException::class.java)
7579
}
7680

7781
private class RequestValidationFailedException : RuntimeException("request validation failed")
82+
7883
private class ResponseValidationFailedException : RuntimeException("request validation failed")
7984

8085
private class TestRequestHandler : RequestHandler() {
81-
override val router = router {
82-
GET("/tests") { _: Request<Unit> ->
83-
ResponseEntity.ok("""{"name": "some"}""")
86+
override val router =
87+
router {
88+
GET("/tests") { _: Request<Unit> ->
89+
ResponseEntity.ok("""{"name": "some"}""")
90+
}
8491
}
85-
}
8692
}
8793

8894
private class InvalidTestRequestHandler : RequestHandler() {
89-
override val router = router {
90-
GET("/tests") { _: Request<Unit> ->
91-
ResponseEntity.notFound(Unit)
95+
override val router =
96+
router {
97+
GET("/tests") { _: Request<Unit> ->
98+
ResponseEntity.notFound(Unit)
99+
}
92100
}
93-
}
94101
}
95102
}

0 commit comments

Comments
 (0)