Flytt testkode til fellesmodul (#556)

navikt · Jun 10, 2024 · 0ca08ec · 0ca08ec
1 parent ea846ed
commit 0ca08ec
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 33 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -34,5 +34,4 @@ dependencies {
     testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
     testImplementation("io.lettuce:lettuce-core:$lettuceVersion")
     testImplementation("no.nav.security:mock-oauth2-server:$mockOauth2ServerVersion")
-    testImplementation(project(":felles-test"))
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -66,7 +66,7 @@ subprojects {
     )
 
     tasks {
-        if (!project.erFellesModul() && !project.erFellesDatabaseModul() && !project.erFellesTestModul()) {
+        if (!project.erFellesModul() && !project.erFellesDatabaseModul()) {
             named<Jar>("jar") {
                 archiveBaseName.set("app")
 
@@ -116,9 +116,7 @@ subprojects {
     dependencies {
         if (!erFellesModul()) {
             implementation(project(":felles"))
-        }
-        if (!erFellesTestModul()) {
-            testImplementation(project(":felles-test"))
+            testImplementation(testFixtures(project(":felles")))
         }
 
         implementation("no.nav.helsearbeidsgiver:domene-inntektsmelding:$hagDomeneInntektsmeldingVersion")
@@ -272,9 +270,6 @@ fun Project.erFellesModul(): Boolean =
 fun Project.erFellesDatabaseModul(): Boolean =
     name == "felles-db-exposed"
 
-fun Project.erFellesTestModul(): Boolean =
-    name == "felles-test"
-
 fun List<String>.containsAny(vararg others: String): Boolean =
     this.intersect(others.toSet()).isNotEmpty()
 

diff --git a/db/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/db/RepositoryTest.kt b/db/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/db/RepositoryTest.kt
@@ -9,7 +9,7 @@ import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
-import no.nav.helsearbeidsgiver.felles.db.test.exposed.FunSpecWithDb
+import no.nav.helsearbeidsgiver.felles.db.exposed.test.FunSpecWithDb
 import no.nav.helsearbeidsgiver.inntektsmelding.db.tabell.ForespoerselEntitet
 import no.nav.helsearbeidsgiver.inntektsmelding.db.tabell.InntektsmeldingEntitet
 import org.jetbrains.exposed.sql.Database

diff --git a/db/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/db/SelvbestemtImRepoTest.kt b/db/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/db/SelvbestemtImRepoTest.kt
@@ -9,7 +9,7 @@ import io.kotest.matchers.shouldNotBe
 import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Inntekt
 import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Inntektsmelding
 import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Naturalytelse
-import no.nav.helsearbeidsgiver.felles.db.test.exposed.FunSpecWithDb
+import no.nav.helsearbeidsgiver.felles.db.exposed.test.FunSpecWithDb
 import no.nav.helsearbeidsgiver.felles.test.mock.mockInntektsmeldingV1
 import no.nav.helsearbeidsgiver.inntektsmelding.db.tabell.SelvbestemtInntektsmeldingEntitet
 import no.nav.helsearbeidsgiver.utils.test.date.oktober

diff --git a/...r/felles/db/test/exposed/FunSpecWithDb.kt → ...r/felles/db/exposed/test/FunSpecWithDb.kt b/...r/felles/db/test/exposed/FunSpecWithDb.kt → ...r/felles/db/exposed/test/FunSpecWithDb.kt
@@ -1,4 +1,4 @@
-package no.nav.helsearbeidsgiver.felles.db.test.exposed
+package no.nav.helsearbeidsgiver.felles.db.exposed.test
 
 import com.zaxxer.hikari.HikariConfig
 import io.kotest.core.spec.style.FunSpec

diff --git a/felles-test/build.gradle.kts b/felles-test/build.gradle.kts
diff --git a/felles/build.gradle.kts b/felles/build.gradle.kts
@@ -1,10 +1,25 @@
+val kotestVersion: String by project
 val lettuceVersion: String by project
+val mockkVersion: String by project
 val rapidsAndRiversVersion: String by project
 val slf4jVersion: String by project
+val utilsVersion: String by project
+
+plugins {
+    id("java-test-fixtures")
+}
 
 dependencies {
     api("com.github.navikt:rapids-and-rivers:$rapidsAndRiversVersion")
     api("org.slf4j:slf4j-api:$slf4jVersion")
 
     implementation("io.lettuce:lettuce-core:$lettuceVersion")
+
+    testFixturesApi("com.github.navikt:rapids-and-rivers:$rapidsAndRiversVersion")
+    testFixturesApi("io.lettuce:lettuce-core:$lettuceVersion")
+
+    testFixturesImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
+    testFixturesImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")
+    testFixturesImplementation("io.mockk:mockk:$mockkVersion")
+    testFixturesImplementation(testFixtures("no.nav.helsearbeidsgiver:utils:$utilsVersion"))
 }
diff --git a/...lles/test/mock/RandomDigitStringKtTest.kt → ...lles/test/mock/RandomDigitStringKtTest.kt b/...lles/test/mock/RandomDigitStringKtTest.kt → ...lles/test/mock/RandomDigitStringKtTest.kt
diff --git a/...arbeidsgiver/felles/test/json/ReadFail.kt → ...arbeidsgiver/felles/test/json/ReadFail.kt b/...arbeidsgiver/felles/test/json/ReadFail.kt → ...arbeidsgiver/felles/test/json/ReadFail.kt
diff --git a/...beidsgiver/felles/test/mock/GyldigData.kt → ...beidsgiver/felles/test/mock/GyldigData.kt b/...beidsgiver/felles/test/mock/GyldigData.kt → ...beidsgiver/felles/test/mock/GyldigData.kt
diff --git a/...arbeidsgiver/felles/test/mock/MockData.kt → ...arbeidsgiver/felles/test/mock/MockData.kt b/...arbeidsgiver/felles/test/mock/MockData.kt → ...arbeidsgiver/felles/test/mock/MockData.kt
diff --git a/...r/felles/test/mock/MockInntektsmelding.kt → ...r/felles/test/mock/MockInntektsmelding.kt b/...r/felles/test/mock/MockInntektsmelding.kt → ...r/felles/test/mock/MockInntektsmelding.kt
diff --git a/...rbeidsgiver/felles/test/mock/MockRedis.kt → ...rbeidsgiver/felles/test/mock/MockRedis.kt b/...rbeidsgiver/felles/test/mock/MockRedis.kt → ...rbeidsgiver/felles/test/mock/MockRedis.kt
diff --git a/...giver/felles/test/mock/MockRedisClient.kt → ...giver/felles/test/mock/MockRedisClient.kt b/...giver/felles/test/mock/MockRedisClient.kt → ...giver/felles/test/mock/MockRedisClient.kt
diff --git a/...ver/felles/test/mock/RandomDigitString.kt → ...ver/felles/test/mock/RandomDigitString.kt b/...ver/felles/test/mock/RandomDigitString.kt → ...ver/felles/test/mock/RandomDigitString.kt
diff --git a/...elles/test/rapidsrivers/TestRapidUtils.kt → ...elles/test/rapidsrivers/TestRapidUtils.kt b/...elles/test/rapidsrivers/TestRapidUtils.kt → ...elles/test/rapidsrivers/TestRapidUtils.kt
diff --git a/integrasjonstest/build.gradle.kts b/integrasjonstest/build.gradle.kts
@@ -18,9 +18,6 @@ dependencies {
     testImplementation(project(":brreg"))
     testImplementation(project(":db"))
     testImplementation(project(":distribusjon"))
-    testImplementation(project(":felles"))
-    testImplementation(project(":felles-db-exposed"))
-    testImplementation(project(":felles-test"))
     testImplementation(project(":forespoersel-besvart"))
     testImplementation(project(":forespoersel-marker-besvart"))
     testImplementation(project(":forespoersel-mottatt"))
@@ -35,6 +32,10 @@ dependencies {
     testImplementation(project(":tilgangservice"))
     testImplementation(project(":trengerservice"))
 
+    testImplementation(project(":felles"))
+    testImplementation(project(":felles-db-exposed"))
+
+    testImplementation(testFixtures(project(":felles")))
     testImplementation(testFixtures(project(":felles-db-exposed")))
 
     // Klienter

diff --git a/...st/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/notifikasjon/db/SelvbestemtRepoTest.kt b/...st/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/notifikasjon/db/SelvbestemtRepoTest.kt
@@ -4,7 +4,7 @@ import io.kotest.assertions.throwables.shouldThrowExactly
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.ints.shouldBeExactly
 import io.kotest.matchers.shouldBe
-import no.nav.helsearbeidsgiver.felles.db.test.exposed.FunSpecWithDb
+import no.nav.helsearbeidsgiver.felles.db.exposed.test.FunSpecWithDb
 import no.nav.helsearbeidsgiver.inntektsmelding.notifikasjon.sakLevetid
 import org.jetbrains.exposed.exceptions.ExposedSQLException
 import org.jetbrains.exposed.sql.Database