diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..4add054 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,14 @@ +name: Test + +on: [pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-java@v1 + with: + java-version: '11.x' + - name: test and build + run: ./gradlew -Pversion="1.$(echo $GITHUB_SHA | cut -c1-7)" build test diff --git a/build.gradle.kts b/build.gradle.kts index bcd16d0..a208deb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ group = "no.nav.sykepenger.kontrakter" version = "${dateFormat.format(Date())}-$gitHash" plugins { - kotlin("jvm") version "1.3.50" + kotlin("jvm") version "1.5.30" java id("maven-publish") } @@ -74,4 +74,12 @@ configure { from(components["java"]) } } +} + +tasks.named("test") { + include("no/nav/inntektsmelding/**") +} + +tasks.test { + useJUnitPlatform() } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2fbb39c..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Aug 21 09:00:38 CEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt b/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt index cbb1483..c491575 100644 --- a/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt +++ b/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt @@ -12,13 +12,13 @@ import org.junit.jupiter.api.Test import java.math.BigDecimal import java.time.LocalDate -internal class JacksonJsonConfigTest { +class JacksonJsonConfigTest { val objectMapper: ObjectMapper = JacksonJsonConfig.opprettObjectMapper() companion object { private val foersteJanuar = LocalDate.of(2019,1,1) - private val andreJanuar = LocalDate.of(2019,1,1) + private val andreJanuar = LocalDate.of(2019,1,2) } @Test @@ -38,7 +38,8 @@ internal class JacksonJsonConfigTest { arkivreferanse = "AR123", ferieperioder = emptyList(), mottattDato = foersteJanuar.atStartOfDay(), - foersteFravaersdag = foersteJanuar + foersteFravaersdag = foersteJanuar, + naerRelasjon = true ) val serialisertInntektsmelding = objectMapper.writeValueAsString(inntektsmelding) @@ -89,7 +90,8 @@ internal class JacksonJsonConfigTest { ) ), mottattDato = foersteJanuar.atStartOfDay(), - foersteFravaersdag = foersteJanuar + foersteFravaersdag = foersteJanuar, + naerRelasjon = true ) val serialisertInntektsmelding = objectMapper.writeValueAsString(inntektsmelding)