From 3efc4bea90274f100cae4209a402d9c14ca21da8 Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Wed, 23 Feb 2022 15:04:00 +0100 Subject: [PATCH 1/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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..e30b99f 100644 --- a/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt +++ b/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt @@ -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) From a6124b2e7e29ec9f6eb15afa8d05507b915e02f0 Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Wed, 23 Feb 2022 15:05:30 +0100 Subject: [PATCH 2/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..bcc1f3e --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,14 @@ +name: Publiser + +on: [pull_request] + +jobs: + build_and_release: + 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 From f413f9a9b90ce9af182fabf98caed034043bfa8f Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Wed, 23 Feb 2022 15:05:52 +0100 Subject: [PATCH 3/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcc1f3e..b3a90f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Publiser +name: Test on: [pull_request] From 2c7a2b569c6c20573dbf5e09827e225a604ad016 Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Wed, 23 Feb 2022 15:07:29 +0100 Subject: [PATCH 4/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3a90f8..45b091a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Test on: [pull_request] jobs: - build_and_release: + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 4da811f8426480e4eebb5b2e58212d850d66e486 Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Wed, 23 Feb 2022 15:07:45 +0100 Subject: [PATCH 5/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45b091a..4add054 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,4 +11,4 @@ jobs: with: java-version: '11.x' - name: test and build - run: ./gradlew -Pversion="1.$(echo $GITHUB_SHA | cut -c1-7)" build + run: ./gradlew -Pversion="1.$(echo $GITHUB_SHA | cut -c1-7)" build test From 4922c3eb191f6c103219f13c5e026af828c913e1 Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Thu, 24 Feb 2022 08:51:07 +0100 Subject: [PATCH 6/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 10 +++++++++- gradle/wrapper/gradle-wrapper.properties | 5 ++--- .../kontrakt/serde/JacksonJsonConfigTest.kt | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) 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 e30b99f..5f8c02f 100644 --- a/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt +++ b/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt @@ -12,12 +12,12 @@ 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 foersteJanuar = LocalDate.of(2019,5,1) private val andreJanuar = LocalDate.of(2019,1,1) } From def61b91ba175b1384ef68a0ed1968edb44f614d Mon Sep 17 00:00:00 2001 From: Morten Laukvik Date: Thu, 24 Feb 2022 09:00:24 +0100 Subject: [PATCH 7/7] =?UTF-8?q?N=C3=A6r=20relasjon=20fiks=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5f8c02f..c491575 100644 --- a/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt +++ b/src/test/kotlin/no/nav/inntektsmelding/kontrakt/serde/JacksonJsonConfigTest.kt @@ -17,8 +17,8 @@ class JacksonJsonConfigTest { val objectMapper: ObjectMapper = JacksonJsonConfig.opprettObjectMapper() companion object { - private val foersteJanuar = LocalDate.of(2019,5,1) - private val andreJanuar = LocalDate.of(2019,1,1) + private val foersteJanuar = LocalDate.of(2019,1,1) + private val andreJanuar = LocalDate.of(2019,1,2) } @Test