Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev saksbehandlingstid fire #304

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Dev saksbehandlingstid fire #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9c6d53
ny format med ny saksbehandlingstid
qtips Aug 29, 2024
ee8b20c
fjerner bruk av junit 4! Tester som bruker det funker ikke.
qtips Aug 29, 2024
888d95d
Oppdaterer tester med ny frist
qtips Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ configurations {
compileOnly {
extendsFrom(configurations.annotationProcessor.get())
}
testCompileOnly {
exclude(group="junit", module = "junit")
}
}

val graphQLKotlinVersion = "7.1.4"
val springCloudVersion = "4.1.4"
val springdocVersion = "2.6.0"
val logstashLogbackEncoderVersion = "8.0"
val tokenSupportVersion = "4.1.7"
val k9FormatVersion = "9.5.0"
val k9FormatVersion = "9.5.2"
val retryVersion = "2.0.7"
val zalandoVersion = "0.27.0"
val postgresqlVersion = "42.7.3"
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/no/nav/sifinnsynapi/dokumentoversikt/DokumentControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import no.nav.sifinnsynapi.Routes
import no.nav.sifinnsynapi.config.SecurityConfiguration
import no.nav.sifinnsynapi.util.CallIdGenerator
import no.nav.sifinnsynapi.utils.hentToken
import org.junit.Assert
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
Expand Down Expand Up @@ -49,7 +49,7 @@ internal class DokumentControllerTest {

@BeforeAll
internal fun setUp() {
Assert.assertNotNull(mockOAuth2Server)
assertNotNull(mockOAuth2Server)
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/no/nav/sifinnsynapi/drift/DriftControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import no.nav.sifinnsynapi.soknad.DebugDTO
import no.nav.sifinnsynapi.util.CallIdGenerator
import no.nav.sifinnsynapi.utils.hentToken
import org.intellij.lang.annotations.Language
import org.junit.Assert.assertNotNull
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
Expand Down
2 changes: 0 additions & 2 deletions src/test/kotlin/no/nav/sifinnsynapi/k9sak/K9SakServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenService
import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
import no.nav.sifinnsynapi.common.AktørId
import no.nav.sifinnsynapi.utils.hentToken
import org.junit.Assert
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock
Expand Down
2 changes: 1 addition & 1 deletion ...test/kotlin/no/nav/sifinnsynapi/konsument/k9sak/KafkaHendelseKonsumentIntegrasjonsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import no.nav.sifinnsynapi.soknad.InnsendingService
import no.nav.sifinnsynapi.utils.*
import org.apache.kafka.clients.producer.Producer
import org.awaitility.kotlin.await
import org.junit.Assert.*
import org.junit.jupiter.api.*
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.extension.ExtendWith
import org.slf4j.Logger
import org.slf4j.LoggerFactory
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/no/nav/sifinnsynapi/sak/SakServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ class SakServiceTest {
@Test
fun `Forvent saksbehandlingstid oppgitt i uker`() {
val saksbehandlingstid = sakService.hentGenerellSaksbehandlingstid()
Assertions.assertThat(saksbehandlingstid.saksbehandlingstidUker).isEqualTo(5)
Assertions.assertThat(saksbehandlingstid.saksbehandlingstidUker).isEqualTo(4)
}

private fun lagDokumentDto(journalpostId: String) = DokumentDTO(
Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/no/nav/sifinnsynapi/sak/behandling/SaksbehandlingstidUtlederTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package no.nav.sifinnsynapi.sak.behandling

import no.nav.k9.innsyn.sak.*
import no.nav.k9.søknad.felles.Kildesystem
import org.junit.Test
import org.junit.jupiter.api.Test
import org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat
import java.time.LocalDate
import java.time.Period
Expand All @@ -25,7 +25,7 @@ class SaksbehandlingstidUtlederTest {
)
val saksbehandlingsfrist = SaksbehandlingstidUtleder.utled(behandling,(null))

assertThat(saksbehandlingsfrist).isEqualTo(tidligsteMottattTidspunkt.plusWeeks(6))
assertThat(saksbehandlingsfrist).isEqualTo(tidligsteMottattTidspunkt.plusWeeks(4))
}

@Test
Expand Down Expand Up @@ -55,7 +55,7 @@ class SaksbehandlingstidUtlederTest {
lagSøknad(tidligsteMottattTidspunkt.plusMonths(20), Kildesystem.SØKNADSDIALOG)
))
val saksbehandlingsfrist = SaksbehandlingstidUtleder.utled(behandling)
assertThat(saksbehandlingsfrist).isEqualTo(tidligsteSøknadsTidspunkt.plusWeeks(6))
assertThat(saksbehandlingsfrist).isEqualTo(tidligsteSøknadsTidspunkt.plusWeeks(4))

}

Expand Down
8 changes: 4 additions & 4 deletions src/test/kotlin/no/nav/sifinnsynapi/soknad/InnsendingServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import no.nav.sifinnsynapi.utils.*
import org.assertj.core.api.Assertions.assertThat
import org.awaitility.kotlin.await
import org.json.JSONObject
import org.junit.Assert
import org.junit.jupiter.api.*
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
Expand Down Expand Up @@ -236,7 +236,7 @@ internal class InnsendingServiceTest {

// forvent at søknadene blir slått sammen.
val søknad: Søknad? = innsendingService.slåSammenSøknaderFor(hovedSøkerAktørId, barn1AktørId)
Assert.assertNotNull(søknad)
assertNotNull(søknad)

val ytelse = søknad!!.getYtelse<PleiepengerSyktBarn>()
val sammenslåttTilsynsordning = ytelse.tilsynsordning
Expand Down Expand Up @@ -351,7 +351,7 @@ internal class InnsendingServiceTest {

await.atMost(Duration.ofSeconds(10)).ignoreException(LegacySøknadNotFoundException::class.java).untilAsserted {
val bytes = innsendingService.hentArbeidsgiverMeldingFil(søknadId, organisasjonsnummer)
Assertions.assertNotNull(bytes)
assertNotNull(bytes)
assertk.assertThat(bytes).isNotEmpty()
assertk.assertThat(bytes).size().isGreaterThan(1000)
}
Expand Down Expand Up @@ -401,7 +401,7 @@ internal class InnsendingServiceTest {

await.atMost(Duration.ofSeconds(10)).ignoreException(LegacySøknadNotFoundException::class.java).untilAsserted {
val bytes = innsendingService.hentArbeidsgiverMeldingFil(søknadId, organisasjonsnummer)
Assertions.assertNotNull(bytes)
assertNotNull(bytes)
assertk.assertThat(bytes).isNotEmpty()
assertk.assertThat(bytes).size().isGreaterThan(1000)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/no/nav/sifinnsynapi/soknad/SøknadControllerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import no.nav.sifinnsynapi.oppslag.AdressebeskyttelseGradering
import no.nav.sifinnsynapi.oppslag.BarnOppslagDTO
import no.nav.sifinnsynapi.util.CallIdGenerator
import no.nav.sifinnsynapi.utils.hentToken
import org.junit.Assert.assertNotNull
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/no/nav/sifinnsynapi/soknad/SøknadRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import no.nav.k9.søknad.Søknad
import no.nav.k9.søknad.felles.personopplysninger.Søker
import no.nav.k9.søknad.felles.type.NorskIdentitetsnummer
import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
import org.junit.Assert.*
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
Expand Down
Loading