Tester setup-gradle.

chris-santa · chris-santa · commit 7e60aec90639 · 2024-01-31T10:55:39.000+01:00
diff --git a/.github/workflows/deploy-branch-gh-cli.yaml b/.github/workflows/deploy-branch-gh-cli.yaml
@@ -30,6 +30,9 @@ jobs:
           java-version: 17
           distribution: 'temurin'
 
+      - name: Sett opp gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Bygg prosjekt
         run: ./gradlew assemble
 
diff --git a/.github/workflows/deploy-branch.yaml b/.github/workflows/deploy-branch.yaml
diff --git a/.github/workflows/deploy-revision-dispatch.yaml b/.github/workflows/deploy-revision-dispatch.yaml
@@ -31,6 +31,9 @@ jobs:
           java-version: 17
           distribution: 'temurin'
 
+      - name: Sett opp gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Bygg prosjekt
         run: ./gradlew assemble
 
diff --git a/.github/workflows/on-push-to-main.yaml b/.github/workflows/on-push-to-main.yaml
@@ -32,6 +32,11 @@ jobs:
           java-version: 17
           distribution: 'temurin'
 
+      - name: Sett opp gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          dependency-graph: generate-and-submit
+
       - name: Bygg prosjekt og kjør tester
         run: ./gradlew build
 
diff --git a/.github/workflows/on-push-to-other-branches.yaml b/.github/workflows/on-push-to-other-branches.yaml
@@ -25,5 +25,8 @@ jobs:
           java-version: 17
           distribution: 'temurin'
 
+      - name: Sett opp gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Bygg og test prosjekt
         run: ./gradlew build
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,8 +52,8 @@ dependencies {
     testImplementation(Kotest.assertionsCore)
     testImplementation(Kotest.runnerJunit5)
     testImplementation(Ktor.Test.serverTestHost)
-    implementation(TmsKtorTokenSupport.idportenSidecarMock)
-    implementation(TmsKtorTokenSupport.tokenXValidationMock)
+    testImplementation(TmsKtorTokenSupport.idportenSidecarMock)
+    testImplementation(TmsKtorTokenSupport.tokenXValidationMock)
     testImplementation(Mockk.mockk)
 }
 
diff --git a/src/main/kotlin/no/nav/tms/varsel/api/ZonedDateTimeSerializer.kt b/src/main/kotlin/no/nav/tms/varsel/api/ZonedDateTimeSerializer.kt
diff --git a/src/main/kotlin/no/nav/tms/varsel/api/varsel/AktiveVarsler.kt b/src/main/kotlin/no/nav/tms/varsel/api/varsel/AktiveVarsler.kt
@@ -1,13 +1,8 @@
-@file:UseSerializers(ZonedDateTimeSerializer::class)
-
 package no.nav.tms.varsel.api.varsel
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
-import no.nav.tms.varsel.api.ZonedDateTimeSerializer
 import java.time.ZonedDateTime
 
-@Serializable
 data class AktivtVarsel(
     @Deprecated("Use varselId") val eventId: String,
     val varselId: String,
@@ -36,7 +31,6 @@ data class AktivtVarsel(
     }
 }
 
-@Serializable
 data class AktiveVarsler(
     val beskjeder: List<AktivtVarsel>,
     val oppgaver: List<AktivtVarsel>,
diff --git a/src/main/kotlin/no/nav/tms/varsel/api/varsel/InaktivtVarsel.kt b/src/main/kotlin/no/nav/tms/varsel/api/varsel/InaktivtVarsel.kt
@@ -1,13 +1,7 @@
-@file:UseSerializers(ZonedDateTimeSerializer::class)
-
 package no.nav.tms.varsel.api.varsel
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
-import no.nav.tms.varsel.api.ZonedDateTimeSerializer
 import java.time.ZonedDateTime
 
-@Serializable
 data class InaktivtVarsel(
     val type: VarselType,
     @Deprecated("Use varselId") val eventId: String,
diff --git a/src/main/kotlin/no/nav/tms/varsel/api/varsel/VarselConsumer.kt b/src/main/kotlin/no/nav/tms/varsel/api/varsel/VarselConsumer.kt
@@ -1,15 +1,10 @@
-@file:UseSerializers(ZonedDateTimeSerializer::class)
-
 package no.nav.tms.varsel.api.varsel
 
 import io.ktor.client.HttpClient
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.http.*
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import no.nav.tms.token.support.tokendings.exchange.TokendingsService
-import no.nav.tms.varsel.api.ZonedDateTimeSerializer
 import java.time.ZonedDateTime
 
 class VarselConsumer(
@@ -56,7 +51,6 @@ class VarselConsumer(
     }
 }
 
-@Serializable
 data class Varsel(
     val type: VarselType,
     val varselId: String,
@@ -69,7 +63,6 @@ data class Varsel(
     val inaktivert: ZonedDateTime?
 )
 
-@Serializable
 data class VarselInnhold(
     val spraakkode: String,
     val tekst: String,
diff --git a/src/main/kotlin/no/nav/tms/varsel/api/varsel/VarselbjelleVarsler.kt b/src/main/kotlin/no/nav/tms/varsel/api/varsel/VarselbjelleVarsler.kt
@@ -1,13 +1,9 @@
-@file:UseSerializers(ZonedDateTimeSerializer::class)
 package no.nav.tms.varsel.api.varsel
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
-import no.nav.tms.varsel.api.ZonedDateTimeSerializer
 import java.time.ZonedDateTime
 
-
-@Serializable
 data class VarselbjelleVarsler(
     val beskjeder: List<VarselbjelleVarsel>,
     val oppgaver: List<VarselbjelleVarsel>,
@@ -27,7 +23,6 @@ data class VarselbjelleVarsler(
     }
 }
 
-@Serializable
 data class VarselbjelleVarsel(
     val eventId: String,
     val varselId: String,
diff --git a/src/test/kotlin/no/nav/tms/varsel/api/VarselRoutesTest.kt b/src/test/kotlin/no/nav/tms/varsel/api/VarselRoutesTest.kt
@@ -1,5 +1,6 @@
 package no.nav.tms.varsel.api
 
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
 import io.kotest.matchers.shouldBe
 import io.ktor.client.*
@@ -31,9 +32,12 @@ import no.nav.tms.varsel.api.varsel.InaktivtVarsel
 import no.nav.tms.varsel.api.varsel.VarselType
 import org.junit.jupiter.api.Test
 import java.time.ZonedDateTime
+import com.fasterxml.jackson.module.kotlin.readValue
 
 class VarselRoutesTest {
 
+    private val objectMapper = jacksonObjectMapper().jsonConfig()
+
     @Test
     fun `Henter inaktiverte varsler`() = varselRoutesTest { client ->
         val varsler = listOf(
@@ -55,7 +59,7 @@ class VarselRoutesTest {
         response.status shouldBe HttpStatusCode.OK
         response.status shouldBe HttpStatusCode.OK
 
-        val inaktiveVarsler: List<InaktivtVarsel> = response.body()
+        val inaktiveVarsler: List<InaktivtVarsel> = response.bodyFromJson()
         inaktiveVarsler.size shouldBe 6
         inaktiveVarsler.map { it.type } shouldContainExactlyInAnyOrder listOf(
             VarselType.beskjed,
@@ -98,7 +102,8 @@ class VarselRoutesTest {
         val response = client.get("/aktive")
         response.status shouldBe HttpStatusCode.OK
 
-        val aktiveVarsler = Json.decodeFromString<AktiveVarsler>(response.bodyAsText())
+        val aktiveVarsler: AktiveVarsler = response.bodyFromJson()
+
         aktiveVarsler.beskjeder.size shouldBe 1
         aktiveVarsler.oppgaver.size shouldBe 2
         aktiveVarsler.innbokser.size shouldBe 3
@@ -130,7 +135,8 @@ class VarselRoutesTest {
         val response = client.get("/aktive")
         response.status shouldBe HttpStatusCode.OK
 
-        val aktiveVarsler = Json.decodeFromString<AktiveVarsler>(response.bodyAsText())
+        val aktiveVarsler: AktiveVarsler = response.bodyFromJson()
+
         aktiveVarsler.beskjeder.size shouldBe 1
         aktiveVarsler.oppgaver.size shouldBe 1
         aktiveVarsler.innbokser.size shouldBe 0
@@ -165,7 +171,7 @@ class VarselRoutesTest {
 
         response.status shouldBe HttpStatusCode.OK
 
-        val antallVarsler: AntallVarsler = response.body()
+        val antallVarsler: AntallVarsler = response.bodyFromJson()
         antallVarsler.beskjeder shouldBe 1
         antallVarsler.oppgaver shouldBe 2
         antallVarsler.innbokser shouldBe 3
@@ -215,7 +221,7 @@ class VarselRoutesTest {
             authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
         )
 
-        val aktiveVarsler: AktiveVarsler = client.get("/aktive").body()
+        val aktiveVarsler: AktiveVarsler = client.get("/aktive").bodyFromJson()
         aktiveVarsler.beskjeder.size shouldBe 1
         aktiveVarsler.oppgaver.size shouldBe 0
         aktiveVarsler.innbokser.size shouldBe 0
@@ -230,7 +236,7 @@ class VarselRoutesTest {
             eksternVarslingKanaler shouldBe beskjed.eksternVarslingKanaler
         }
 
-        val inaktiveVarsler: List<InaktivtVarsel> = client.get("/inaktive").body()
+        val inaktiveVarsler: List<InaktivtVarsel> = client.get("/inaktive").bodyFromJson()
         inaktiveVarsler.size shouldBe 1
 
         inaktiveVarsler.first().apply {
@@ -303,4 +309,6 @@ class VarselRoutesTest {
             }
         }.let { block(it) }
     }
+
+    private suspend inline fun <reified T> HttpResponse.bodyFromJson(): T = objectMapper.readValue(bodyAsText())
 }
diff --git a/src/test/kotlin/no/nav/tms/varsel/api/VarselbjelleRoutesTest.kt b/src/test/kotlin/no/nav/tms/varsel/api/VarselbjelleRoutesTest.kt
@@ -1,18 +1,21 @@
 package no.nav.tms.varsel.api
 
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
 import io.kotest.matchers.shouldBe
 import io.ktor.client.request.get
-import io.ktor.client.statement.bodyAsText
+import io.ktor.client.statement.*
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.testing.testApplication
-import kotlinx.serialization.json.Json
 import no.nav.tms.token.support.idporten.sidecar.mock.LevelOfAssurance
 import no.nav.tms.varsel.api.varsel.VarselType
 import no.nav.tms.varsel.api.varsel.VarselbjelleVarsler
 import org.junit.jupiter.api.Test
 
 class VarselbjelleRoutesTest {
 
+    private val objectMapper = jacksonObjectMapper().jsonConfig()
+
     @Test
     fun `Varsel har riktige felter`() = testApplication {
         val expectedBeskjed = VarselTestData.varsel(type = VarselType.beskjed)
@@ -32,7 +35,7 @@ class VarselbjelleRoutesTest {
 
             client.get("/varselbjelle/varsler").apply {
                 status shouldBe HttpStatusCode.OK
-                val varselbjellevarsler = Json.decodeFromString<VarselbjelleVarsler>(bodyAsText())
+                val varselbjellevarsler: VarselbjelleVarsler = bodyFromJson()
                 varselbjellevarsler.beskjeder.size shouldBe 2
                 varselbjellevarsler.oppgaver.size shouldBe 3
                 val beskjed = varselbjellevarsler.beskjeder.first { it.varselId == expectedBeskjed.varselId }
@@ -69,7 +72,7 @@ class VarselbjelleRoutesTest {
 
             client.get("/bjellevarsler").apply {
                 status shouldBe HttpStatusCode.OK
-                val varselbjellevarsler = Json.decodeFromString<VarselbjelleVarsler>(bodyAsText())
+                val varselbjellevarsler: VarselbjelleVarsler = bodyFromJson()
                 varselbjellevarsler.beskjeder.size shouldBe 2
                 varselbjellevarsler.oppgaver.size shouldBe 3
                 val beskjed = varselbjellevarsler.beskjeder.first { it.eventId == expectedBeskjed.varselId }
@@ -105,4 +108,6 @@ class VarselbjelleRoutesTest {
             }
         }
     }
+
+    private suspend inline fun <reified T> HttpResponse.bodyFromJson(): T = objectMapper.readValue(bodyAsText())
 }
