Skip to content

Commit

Permalink
Legg til stubmetoder i test-felles og oppdater equals sjekk for grun…
Browse files Browse the repository at this point in the history
…nlagdto (#66)
  • Loading branch information
ugur93 authored Feb 15, 2024
1 parent ea404be commit c5f8025
Show file tree
Hide file tree
Showing 7 changed files with 3,527 additions and 25 deletions.
27 changes: 8 additions & 19 deletions bidrag-commons-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,16 @@
<java.version>21</java.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>no.nav.bidrag</groupId>
<artifactId>bidrag-commons-felles</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<scope>compile</scope>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -95,19 +87,16 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk-jvm</artifactId>
<version>${mockk.version}</version>
<scope>test</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.kotest</groupId>
<artifactId>kotest-runner-junit5-jvm</artifactId>
<scope>test</scope>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package no.nav.bidrag.commons.web.mock

import com.fasterxml.jackson.module.kotlin.readValue
import io.mockk.every
import io.mockk.mockkObject
import io.mockk.mockkStatic
import no.nav.bidrag.commons.service.KodeverkProvider
import no.nav.bidrag.commons.service.finnVisningsnavn
import no.nav.bidrag.commons.service.finnVisningsnavnLønnsbeskrivelse
import no.nav.bidrag.commons.service.finnVisningsnavnSkattegrunnlag
import no.nav.bidrag.commons.service.sjablon.SjablonProvider
import no.nav.bidrag.commons.service.sjablon.Sjablontall
import no.nav.bidrag.transport.felles.commonObjectmapper

class Stubs

fun stubKodeverkProvider() {
mockkObject(KodeverkProvider)
mockkStatic(::finnVisningsnavnSkattegrunnlag)
mockkStatic(::finnVisningsnavnLønnsbeskrivelse)
mockkStatic(::finnVisningsnavn)
every { finnVisningsnavn(any()) } returns "Visningsnavn"
every {
finnVisningsnavnLønnsbeskrivelse(any())
} returns "Visningsnavn lønnsbeskrivelse"
every { finnVisningsnavnSkattegrunnlag(any()) } returns "Visningsnavn skattegrunnlag"
}

fun stubSjablonProvider() {
mockkObject(SjablonProvider)
every {
SjablonProvider.hentSjablontall()
} returns sjablonResponse()
}

fun sjablonResponse(): List<Sjablontall> {
val fil = hentFil("/__files/sjablon.json")
return commonObjectmapper.readValue(fil)
}

fun hentFil(filsti: String) =
Stubs::class.java.getResource(
filsti,
) ?: throw RuntimeException("Fant ingen fil på sti $filsti")
Loading

0 comments on commit c5f8025

Please sign in to comment.