Merge pull request #45 from navikt/tms-dependency-admin_9d1f1d7

chris-santa · web-flow · commit 4acd122f06d8 · 2025-06-17T14:45:02.000+02:00
Dependencies - manuelle endringer kreves
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -50,9 +50,8 @@ dependencies {
     testImplementation(Ktor.Test.clientMock)
     testImplementation(Ktor.Test.serverTestHost)
     testImplementation(TmsKtorTokenSupport.azureValidationMock)
-    testImplementation(Kluent.kluent)
+    testImplementation(Kotest.assertionsCore)
     testImplementation(Mockk.mockk)
-    testImplementation(TmsTestUtils.testUtils)
 
     testRuntimeOnly(Jjwt.impl)
 }
diff --git a/buildSrc/src/main/kotlin/default/dependencies.kt b/buildSrc/src/main/kotlin/default/dependencies.kt
@@ -90,7 +90,7 @@ interface KotestDefaults: DependencyGroup {
 
 interface KotlinDefaults: DependencyGroup {
     override val groupId get() = "org.jetbrains.kotlin"
-    override val version get() = "2.1.20"
+    override val version get() = "2.1.21"
 
     val reflect get() = dependency("kotlin-reflect")
 }
@@ -208,7 +208,7 @@ interface TestContainersDefaults: DependencyGroup {
 
 interface TmsCommonLibDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.common"
-    override val version get() = "5.0.1"
+    override val version get() = "5.0.3"
 
     val metrics get() = dependency("metrics")
     val observability get() = dependency("observability")
@@ -219,14 +219,14 @@ interface TmsCommonLibDefaults: DependencyGroup {
 
 interface TmsKafkaToolsDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.kafka"
-    override val version get() = "2.1.1"
+    override val version get() = "2.1.4"
 
     val kafkaApplication get() = dependency("kafka-application")
 }
 
 interface TmsKtorTokenSupportDefaults: DependencyGroup {
     override val groupId get() = "no.nav.tms.token.support"
-    override val version get() = "5.0.1"
+    override val version get() = "5.0.4"
 
     val azureExchange get() = dependency("azure-exchange")
     val azureValidation get() = dependency("azure-validation")
diff --git a/src/test/kotlin/no/nav/tms/event/api/ApiTest.kt b/src/test/kotlin/no/nav/tms/event/api/ApiTest.kt
@@ -1,12 +1,11 @@
 package no.nav.tms.event.api
 
+import io.kotest.matchers.shouldBe
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
-import no.nav.tms.common.testutils.initExternalServices
 import no.nav.tms.event.api.varsel.*
-import org.amshove.kluent.shouldBeEqualTo
 import org.junit.jupiter.api.Test
 import java.time.ZonedDateTime
 
@@ -24,22 +23,26 @@ class ApiTest {
             )
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
-                testHostUrl,
-                VarselRouteProvider(
-                    type = "varsel",
-                    endpoint = "detaljert/aktive",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = responseBody,
-                ),
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
+                host = testHostUrl,
+                path = "/varsel/detaljert/aktive",
+                responseBody = responseBody,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                },
             )
 
             client.get("/varsel/aktive") {
-                header("fodselsnummer", "12345678910")
+                header("fodselsnummer", dummyFnr)
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertContent(bodyAsText(), expectedContent)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 
@@ -54,21 +57,26 @@ class ApiTest {
 
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
-                testHostUrl,
-                VarselRouteProvider(
-                    type = "varsel",
-                    endpoint = "/detaljert/inaktive",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = inaktivMockresponse,
-                ),
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
+                host = testHostUrl,
+                path = "/varsel/detaljert/inaktive",
+                responseBody = inaktivMockresponse,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                },
             )
+
             client.get("/varsel/inaktive") {
                 header("fodselsnummer", "12345678910")
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertContent(bodyAsText(), inaktiveExpectedResult)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 
@@ -83,27 +91,30 @@ class ApiTest {
 
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
-                testHostUrl,
-                VarselRouteProvider(
-                    type = "varsel",
-                    endpoint = "/detaljert/alle",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = alleMockresponse,
-                ),
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
+                host = testHostUrl,
+                path = "varsel/detaljert/alle",
+                responseBody = alleMockresponse,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                }
             )
+
             client.get("/varsel/alle") {
                 header("fodselsnummer", "12345678910")
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertContent(bodyAsText(), alleExpectedResult)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 }
 
-private fun List<Pair<String, DetaljertVarsel>>.mapExternalServiceResponse(): List<String> = map { it.first }
-
 private fun mockContent(
     opprettet: ZonedDateTime,
     inaktivert: ZonedDateTime? = null,
@@ -163,16 +174,16 @@ fun assertContent(
     expectedResult: List<DetaljertVarsel>,
 ) {
     val jsonObjects = objectmapper.readTree(content)
-    jsonObjects.size() shouldBeEqualTo expectedResult.size
+    jsonObjects.size() shouldBe expectedResult.size
     val expectedObject = expectedResult.first()
     jsonObjects.first().also { resultObject ->
-        resultObject["varselId"].textValue() shouldBeEqualTo expectedObject.varselId
-        resultObject["produsent"]["namespace"].textValue() shouldBeEqualTo expectedObject.produsent.namespace
-        resultObject["produsent"]["appnavn"].textValue() shouldBeEqualTo expectedObject.produsent.appnavn
-        resultObject["sensitivitet"].textValue() shouldBeEqualTo expectedObject.sensitivitet.name
-        resultObject["innhold"]["tekst"].textValue() shouldBeEqualTo expectedObject.innhold.tekst
-        resultObject["innhold"]["link"].textValue() shouldBeEqualTo expectedObject.innhold.link
-        resultObject["aktiv"].asBoolean() shouldBeEqualTo expectedObject.aktiv
+        resultObject["varselId"].textValue() shouldBe expectedObject.varselId
+        resultObject["produsent"]["namespace"].textValue() shouldBe expectedObject.produsent.namespace
+        resultObject["produsent"]["appnavn"].textValue() shouldBe expectedObject.produsent.appnavn
+        resultObject["sensitivitet"].textValue() shouldBe expectedObject.sensitivitet.name
+        resultObject["innhold"]["tekst"].textValue() shouldBe expectedObject.innhold.tekst
+        resultObject["innhold"]["link"].textValue() shouldBe expectedObject.innhold.link
+        resultObject["aktiv"].asBoolean() shouldBe expectedObject.aktiv
         assertZonedDateTime(resultObject, expectedObject.aktivFremTil, "aktivFremTil")
         assertZonedDateTime(resultObject, expectedObject.opprettet, "opprettet")
         assertZonedDateTime(resultObject, expectedObject.inaktivert, "inaktivert")
diff --git a/src/test/kotlin/no/nav/tms/event/api/LegacyApiTest.kt b/src/test/kotlin/no/nav/tms/event/api/LegacyApiTest.kt
@@ -1,12 +1,11 @@
 package no.nav.tms.event.api
 
+import io.kotest.matchers.shouldBe
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
-import no.nav.tms.common.testutils.initExternalServices
 import no.nav.tms.event.api.varsel.*
-import org.amshove.kluent.shouldBeEqualTo
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
@@ -30,22 +29,26 @@ class LegacyApiTest {
             )
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
                 testHostUrl,
-                VarselRouteProvider(
-                    type = type,
-                    endpoint = "/detaljert/aktive",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = aktiveMockresponse,
-                ),
+                path = "$type/detaljert/aktive",
+                responseBody = aktiveMockresponse,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                },
             )
 
             client.get("/$type/aktive") {
-                header("fodselsnummer", "12345678910")
+                header("fodselsnummer", dummyFnr)
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertLegacyContent(bodyAsText(), aktiveExpectedResult)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 
@@ -63,21 +66,25 @@ class LegacyApiTest {
 
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
-                testHostUrl,
-                VarselRouteProvider(
-                    type = type,
-                    endpoint = "/detaljert/inaktive",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = inaktivMockresponse,
-                ),
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
+                host = testHostUrl,
+                path = "/$type/detaljert/inaktive",
+                responseBody = inaktivMockresponse,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                },
             )
             client.get("/$type/inaktive") {
-                header("fodselsnummer", "12345678910")
+                header("fodselsnummer", dummyFnr)
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertLegacyContent(bodyAsText(), inaktiveExpectedResult)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 
@@ -95,21 +102,26 @@ class LegacyApiTest {
 
         testApplication {
             eventApiSetup(testHostUrl)
-            initExternalServices(
-                testHostUrl,
-                VarselRouteProvider(
-                    type = type,
-                    endpoint = "/detaljert/alle",
-                    fnrHeaderShouldBe = dummyFnr,
-                    responseBody = alleMockresponse,
-                ),
+
+            var fnrHeader: String? = null
+
+            setupExternalVarselRoute(
+                host = testHostUrl,
+                path = "/$type/detaljert/alle",
+                responseBody = alleMockresponse,
+                requestPeek = {
+                    fnrHeader = it.headers["ident"]
+                },
             )
+
             client.get("/$type/all") {
-                header("fodselsnummer", "12345678910")
+                header("fodselsnummer", dummyFnr)
             }.apply {
-                status shouldBeEqualTo HttpStatusCode.OK
+                status shouldBe HttpStatusCode.OK
                 assertLegacyContent(bodyAsText(), alleExpectedResult)
             }
+
+            fnrHeader shouldBe dummyFnr
         }
     }
 }
@@ -119,17 +131,17 @@ private fun assertLegacyContent(
     expectedResult: List<LegacyVarsel>,
 ) {
     val jsonObjects = objectmapper.readTree(content)
-    jsonObjects.size() shouldBeEqualTo expectedResult.size
+    jsonObjects.size() shouldBe expectedResult.size
     val expectedObject = expectedResult.first()
     jsonObjects.first().also { resultObject ->
-        resultObject["fodselsnummer"].textValue() shouldBeEqualTo expectedObject.fodselsnummer
-        resultObject["grupperingsId"].textValue() shouldBeEqualTo expectedObject.grupperingsId
-        resultObject["eventId"].textValue() shouldBeEqualTo expectedObject.eventId
-        resultObject["produsent"].textValue() shouldBeEqualTo expectedObject.produsent
-        resultObject["sikkerhetsnivaa"].asInt() shouldBeEqualTo expectedObject.sikkerhetsnivaa
-        resultObject["tekst"].textValue() shouldBeEqualTo expectedObject.tekst
-        resultObject["link"].textValue() shouldBeEqualTo expectedObject.link
-        resultObject["aktiv"].asBoolean() shouldBeEqualTo expectedObject.aktiv
+        resultObject["fodselsnummer"].textValue() shouldBe expectedObject.fodselsnummer
+        resultObject["grupperingsId"].textValue() shouldBe expectedObject.grupperingsId
+        resultObject["eventId"].textValue() shouldBe expectedObject.eventId
+        resultObject["produsent"].textValue() shouldBe expectedObject.produsent
+        resultObject["sikkerhetsnivaa"].asInt() shouldBe expectedObject.sikkerhetsnivaa
+        resultObject["tekst"].textValue() shouldBe expectedObject.tekst
+        resultObject["link"].textValue() shouldBe expectedObject.link
+        resultObject["aktiv"].asBoolean() shouldBe expectedObject.aktiv
         assertZonedDateTime(resultObject, expectedObject.synligFremTil, "synligFremTil")
         assertZonedDateTime(resultObject, expectedObject.forstBehandlet, "forstBehandlet")
         assertZonedDateTime(resultObject, expectedObject.sistOppdatert, "sistOppdatert")
diff --git a/src/test/kotlin/no/nav/tms/event/api/TestApplication.kt b/src/test/kotlin/no/nav/tms/event/api/TestApplication.kt
diff --git a/src/test/kotlin/no/nav/tms/event/api/varsel/ApiFeilhåndteringTest.kt b/src/test/kotlin/no/nav/tms/event/api/varsel/ApiFeilhåndteringTest.kt
