Fjerne bruk av Constants.kt 1/n

navikt · Oct 30, 2023 · 42ca224 · 42ca224
1 parent d364ecf
commit 42ca224
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/common-kotlin.gradle.kts b/buildSrc/src/main/kotlin/common-kotlin.gradle.kts
@@ -16,11 +16,6 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    testImplementation(Junit5.api)
-    testImplementation(Junit5.params)
-    testImplementation(KoTest.assertions)
-    testImplementation(KoTest.runner)
-    testRuntimeOnly(Junit5.engine)
 }
 
 java {
@@ -81,9 +76,5 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     kotlinGradle {
         ktlint()
     }
-    // Workaround for <https://github.com/diffplug/spotless/issues/1644>
-    // using idea found at
-    // <https://github.com/diffplug/spotless/issues/1527#issuecomment-1409142798>.
-    lineEndings = LineEnding.PLATFORM_NATIVE // or any other except GIT_ATTRIBUTES
 }
 
diff --git a/image-utils/build.gradle.kts b/image-utils/build.gradle.kts
@@ -12,4 +12,5 @@ dependencies {
     testImplementation(Junit5.api)
     testImplementation("org.slf4j:slf4j-simple:2.0.9")
     testRuntimeOnly(Junit5.engine)
+    testImplementation(libs.kotest.assertions.core)
 }
diff --git a/ktor-client-auth-bearer/build.gradle.kts b/ktor-client-auth-bearer/build.gradle.kts
@@ -6,4 +6,6 @@ dependencies {
     implementation(Ktor.library("client-auth-jvm"))
     testImplementation(Ktor.library("client"))
     testImplementation(Ktor.library("client-mock-jvm"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit.get()}")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${libs.versions.junit.get()}")
 }
diff --git a/ktor-client-metrics/build.gradle.kts b/ktor-client-metrics/build.gradle.kts
@@ -6,4 +6,6 @@ dependencies {
     implementation(Prometheus.common)
     testImplementation(Ktor2.Client.library("mock-jvm"))
     testImplementation(KoTest.assertions)
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit.get()}")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${libs.versions.junit.get()}")
 }
diff --git a/ktor-utils/build.gradle.kts b/ktor-utils/build.gradle.kts
@@ -7,4 +7,5 @@ dependencies {
     implementation("commons-codec:commons-codec:1.12")
     testImplementation(Ktor.ktorTest)
     testImplementation(kotlin("test"))
+    testImplementation(libs.kotest.assertions.core)
 }
diff --git a/oauth2-klient/build.gradle.kts b/oauth2-klient/build.gradle.kts
@@ -20,6 +20,9 @@ dependencies {
     testImplementation(Ktor2.Client.library("mock"))
     testImplementation(KoTest.assertions)
     testImplementation("io.kotest:kotest-assertions-ktor:4.4.3")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit.get()}")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${libs.versions.junit.get()}")
+
     // FOr E2E
     testImplementation("io.kubernetes:client-java:16.0.0")
 }
diff --git a/pdl-klient/build.gradle.kts b/pdl-klient/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     testImplementation("io.kubernetes:client-java:18.0.0")
     testRuntimeOnly(Junit5.engine)
     testRuntimeOnly("ch.qos.logback:logback-classic:1.4.5")
+    testImplementation(libs.kotest.assertions.core)
 }
 
 tasks.withType<org.gradle.jvm.tasks.Jar> { duplicatesStrategy = DuplicatesStrategy.INCLUDE }
diff --git a/pdl-klient/src/test/kotlin/no/nav/dagpenger/pdl/integration/PDLIntegrationTest.kt b/pdl-klient/src/test/kotlin/no/nav/dagpenger/pdl/integration/PDLIntegrationTest.kt
@@ -1,6 +1,5 @@
 package no.nav.dagpenger.pdl.integration
 
-import io.kotest.common.runBlocking
 import io.kotest.matchers.shouldBe
 import io.ktor.http.HttpHeaders
 import io.kubernetes.client.openapi.ApiClient
@@ -9,6 +8,7 @@ import io.kubernetes.client.openapi.apis.CoreV1Api
 import io.kubernetes.client.openapi.models.V1Secret
 import io.kubernetes.client.util.ClientBuilder
 import io.kubernetes.client.util.KubeConfig
+import kotlinx.coroutines.runBlocking
 import no.nav.dagpenger.oauth2.CachedOauth2Client
 import no.nav.dagpenger.oauth2.OAuth2Config
 import no.nav.dagpenger.pdl.createPersonOppslagBolk

diff --git a/soap-client/build.gradle.kts b/soap-client/build.gradle.kts
@@ -23,4 +23,6 @@ dependencies {
     testImplementation("org.apache.cxf:cxf-rt-transports-http:$cxfVersion")
     testImplementation(tjenestespesifikasjon("ytelseskontrakt-v3-tjenestespesifikasjon"))
     testImplementation(Mockk.mockk)
+    testImplementation(libs.kotest.assertions.core)
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit.get()}")
 }
diff --git a/sts-klient/build.gradle.kts b/sts-klient/build.gradle.kts
@@ -16,4 +16,7 @@ dependencies {
 
     testImplementation("ch.qos.logback:logback-classic:1.2.3")
     testImplementation(Ktor2.Client.library("mock"))
+    testImplementation(libs.kotest.assertions.core)
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${libs.versions.junit.get()}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${libs.versions.junit.get()}")
 }