-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bumped several libs and plugin (#183)
- Loading branch information
Showing
10 changed files
with
274 additions
and
290 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/kotlin/no/nav/syfo/application/metrics/HttpRequestMonitorInterceptor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,82 +1,77 @@ | ||
| package no.nav.syfo | ||
|
|
||
| import io.ktor.http.HttpMethod | ||
| import io.ktor.client.request.* | ||
| import io.ktor.client.statement.* | ||
| import io.ktor.http.HttpStatusCode | ||
| import io.ktor.server.routing.routing | ||
| import io.ktor.server.testing.TestApplicationEngine | ||
| import io.ktor.server.testing.handleRequest | ||
| import io.ktor.util.InternalAPI | ||
| import io.ktor.server.testing.* | ||
| import no.nav.syfo.application.ApplicationState | ||
| import no.nav.syfo.application.api.registerNaisApi | ||
| import org.junit.jupiter.api.Assertions.assertEquals | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| internal class SelfTest { | ||
|
|
||
| @InternalAPI | ||
| @Test | ||
| internal fun `Returns ok on is_alive`() { | ||
| with(TestApplicationEngine()) { | ||
| start() | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = true | ||
| applicationState.alive = true | ||
| application.routing { registerNaisApi(applicationState) } | ||
|
|
||
| with(handleRequest(HttpMethod.Get, "/internal/is_alive")) { | ||
| assertEquals(HttpStatusCode.OK, response.status()) | ||
| assertEquals("I'm alive! :)", response.content) | ||
| testApplication { | ||
| application { | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = true | ||
| applicationState.alive = true | ||
| routing { registerNaisApi(applicationState) } | ||
| } | ||
|
|
||
| val response = client.get("/internal/is_alive") | ||
|
|
||
| assertEquals(HttpStatusCode.OK, response.status) | ||
| assertEquals("I'm alive! :)", response.bodyAsText()) | ||
| } | ||
| } | ||
|
|
||
| @InternalAPI | ||
| @Test | ||
| internal fun `Returns ok in is_ready`() { | ||
| with(TestApplicationEngine()) { | ||
| start() | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = true | ||
| applicationState.alive = true | ||
| application.routing { registerNaisApi(applicationState) } | ||
|
|
||
| with(handleRequest(HttpMethod.Get, "/internal/is_ready")) { | ||
| assertEquals(HttpStatusCode.OK, response.status()) | ||
| assertEquals("I'm ready! :)", response.content) | ||
| testApplication { | ||
| application { | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = true | ||
| applicationState.alive = true | ||
| routing { registerNaisApi(applicationState) } | ||
| } | ||
| val response = client.get("/internal/is_ready") | ||
| assertEquals(HttpStatusCode.OK, response.status) | ||
| assertEquals("I'm ready! :)", response.bodyAsText()) | ||
| } | ||
| } | ||
|
|
||
| @InternalAPI | ||
| @Test | ||
| internal fun `Returns internal server error when liveness check fails`() { | ||
| with(TestApplicationEngine()) { | ||
| start() | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = false | ||
| applicationState.alive = false | ||
| application.routing { registerNaisApi(applicationState) } | ||
|
|
||
| with(handleRequest(HttpMethod.Get, "/internal/is_alive")) { | ||
| assertEquals(HttpStatusCode.InternalServerError, response.status()) | ||
| assertEquals("I'm dead x_x", response.content) | ||
| testApplication { | ||
| application { | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = false | ||
| applicationState.alive = false | ||
| routing { registerNaisApi(applicationState) } | ||
| } | ||
|
|
||
| val response = client.get("/internal/is_alive") | ||
| assertEquals(HttpStatusCode.InternalServerError, response.status) | ||
| assertEquals("I'm dead x_x", response.bodyAsText()) | ||
| } | ||
| } | ||
|
|
||
| @InternalAPI | ||
| @Test | ||
| internal fun `Returns internal server error when readyness check fails`() { | ||
| with(TestApplicationEngine()) { | ||
| start() | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = false | ||
| applicationState.alive = false | ||
| application.routing { registerNaisApi(applicationState) } | ||
| with(handleRequest(HttpMethod.Get, "/internal/is_ready")) { | ||
| assertEquals(HttpStatusCode.InternalServerError, response.status()) | ||
| assertEquals("Please wait! I'm not ready :(", response.content) | ||
| testApplication { | ||
| application { | ||
| val applicationState = ApplicationState() | ||
| applicationState.ready = false | ||
| applicationState.alive = false | ||
| routing { registerNaisApi(applicationState) } | ||
| } | ||
| val response = client.get("/internal/is_ready") | ||
| assertEquals(HttpStatusCode.InternalServerError, response.status) | ||
| assertEquals("Please wait! I'm not ready :(", response.bodyAsText()) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.