Skip to content

Commit 1e8cac1

Browse files
stigusstigus
committed
Fjernet disabled tester
#deploy-test-bruker-service #deploy-test-pdl-forvalter #deploy-test-frontend
1 parent 8f5b4f8 commit 1e8cac1

File tree

4 files changed

+0
-237
lines changed

4 files changed

+0
-237
lines changed

‎apps/pdl-forvalter/src/test/java/no/nav/pdl/forvalter/service/RelasjonerAlderServiceTest.java

-67
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
44
import no.nav.testnav.libs.data.pdlforvalter.v1.FoedselDTO;
5-
import no.nav.testnav.libs.data.pdlforvalter.v1.ForelderBarnRelasjonDTO;
65
import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO;
7-
import no.nav.testnav.libs.data.pdlforvalter.v1.PersonRequestDTO;
8-
import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO;
96
import org.junit.jupiter.api.BeforeEach;
10-
import org.junit.jupiter.api.Disabled;
117
import org.junit.jupiter.api.Test;
128
import org.junit.jupiter.api.extension.ExtendWith;
139
import org.mockito.InjectMocks;
@@ -23,7 +19,6 @@
2319
import static org.hamcrest.CoreMatchers.equalTo;
2420
import static org.hamcrest.CoreMatchers.is;
2521
import static org.hamcrest.MatcherAssert.assertThat;
26-
import static org.mockito.Mockito.doReturn;
2722

2823
@ExtendWith(MockitoExtension.class)
2924
class RelasjonerAlderServiceTest {
@@ -42,68 +37,6 @@ void setup() {
4237
fixedClock = Clock.fixed(LOCAL_DATE.atStartOfDay(ZoneId.systemDefault()).toInstant(), ZoneId.systemDefault());
4338
}
4439

45-
@Test
46-
@Disabled("Denne feiler av og til og trenger oppdatering")
47-
void personAlderBarn23Forelder41() {
48-
49-
doReturn(fixedClock.instant()).when(clock).instant();
50-
doReturn(fixedClock.getZone()).when(clock).getZone();
51-
52-
var bestilling = BestillingRequestDTO.builder()
53-
.person(PersonDTO.builder()
54-
.forelderBarnRelasjon(List.of(
55-
ForelderBarnRelasjonDTO.builder()
56-
.minRolleForPerson(ForelderBarnRelasjonDTO.Rolle.FORELDER)
57-
.nyRelatertPerson(PersonRequestDTO.builder()
58-
.foedtFoer(LocalDateTime.of(LocalDate.now(clock).getYear() - 23,
59-
LocalDate.now(clock).getMonthValue(), LocalDate.now(clock).getDayOfMonth(), 1, 1))
60-
.build())
61-
.build()
62-
))
63-
.sivilstand(List.of(
64-
SivilstandDTO.builder()
65-
.type(SivilstandDTO.Sivilstand.GIFT)
66-
.build()
67-
))
68-
.build())
69-
.build();
70-
var oppdatertBestilling = relasjonerAlderService.fixRelasjonerAlder(bestilling);
71-
assertThat(oppdatertBestilling.getFoedtFoer().toLocalDate(),
72-
is(equalTo(LocalDate.now(clock).minusYears(18 + 23))));
73-
assertThat(oppdatertBestilling.getPerson().getSivilstand().getFirst().getNyRelatertPerson().getFoedtFoer().toLocalDate(),
74-
is(equalTo(LocalDate.now(clock).minusYears(18 + 23))));
75-
}
76-
77-
@Test
78-
@Disabled("Denne feiler av og til og trenger oppdatering")
79-
void personAlderBarn23Besteforeldre() {
80-
81-
doReturn(fixedClock.instant()).when(clock).instant();
82-
doReturn(fixedClock.getZone()).when(clock).getZone();
83-
84-
var bestilling = BestillingRequestDTO.builder()
85-
.person(PersonDTO.builder()
86-
.forelderBarnRelasjon(List.of(
87-
ForelderBarnRelasjonDTO.builder()
88-
.minRolleForPerson(ForelderBarnRelasjonDTO.Rolle.FORELDER)
89-
.nyRelatertPerson(PersonRequestDTO.builder()
90-
.foedtFoer(LocalDateTime.of(LocalDate.now(clock).getYear() - 23,
91-
LocalDate.now(clock).getMonthValue(), LocalDate.now(clock).getDayOfMonth(), 1, 1))
92-
.build())
93-
.build(),
94-
ForelderBarnRelasjonDTO.builder()
95-
.minRolleForPerson(ForelderBarnRelasjonDTO.Rolle.BARN)
96-
.build()
97-
))
98-
.build())
99-
.build();
100-
var oppdatertBestilling = relasjonerAlderService.fixRelasjonerAlder(bestilling);
101-
assertThat(oppdatertBestilling.getFoedtFoer().toLocalDate(),
102-
is(equalTo(LocalDate.now(clock).minusYears(18 + 23))));
103-
assertThat(oppdatertBestilling.getPerson().getForelderBarnRelasjon().get(1).getNyRelatertPerson().getFoedtFoer().toLocalDate(),
104-
is(equalTo(LocalDate.now(clock).minusYears(18 + 23 + 36))));
105-
}
106-
10740
@Test
10841
void personMedFoedselsdag() {
10942

‎apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java

-121
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,19 @@
77
import no.nav.registre.sdforvalter.consumer.rs.kodeverk.response.KodeverkResponse;
88
import no.nav.registre.sdforvalter.database.model.AaregModel;
99
import no.nav.registre.sdforvalter.database.repository.AaregRepository;
10-
import no.nav.testnav.libs.dto.aareg.v1.Arbeidsforhold;
1110
import no.nav.testnav.libs.securitycore.domain.AccessToken;
1211
import no.nav.testnav.libs.securitycore.domain.ServerProperties;
1312
import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
1413
import no.nav.testnav.libs.testing.JsonWiremockHelper;
1514
import org.junit.jupiter.api.AfterEach;
1615
import org.junit.jupiter.api.BeforeAll;
17-
import org.junit.jupiter.api.Disabled;
1816
import org.junit.jupiter.api.Test;
1917
import org.junit.jupiter.api.extension.ExtendWith;
2018
import org.springframework.beans.factory.annotation.Autowired;
2119
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
2220
import org.springframework.boot.test.context.SpringBootTest;
2321
import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
2422
import org.springframework.context.annotation.Import;
25-
import org.springframework.http.HttpStatus;
2623
import org.springframework.http.MediaType;
2724
import org.springframework.test.context.ActiveProfiles;
2825
import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -87,72 +84,6 @@ private AaregModel createAaregModel() {
8784
return model;
8885
}
8986

90-
@Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
91-
@Test
92-
void shouldInitiateAaregFromDatabase() throws Exception {
93-
final AaregModel aaregModel = createAaregModel();
94-
aaregRepository.save(aaregModel);
95-
96-
var arbeidsforholdmelding = objectMapper.readValue(syntString, syntResponse);
97-
98-
when(tokenExchange.exchange(any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("dummy")));
99-
100-
JsonWiremockHelper
101-
.builder(objectMapper)
102-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidstaker/arbeidsforhold")
103-
.withResponseBody(Collections.emptyList())
104-
.stubGet();
105-
106-
JsonWiremockHelper
107-
.builder(objectMapper)
108-
.withUrlPathMatching("(.*)/synt-aareg/api/v1/generate_aareg")
109-
.withRequestBody(Collections.singletonList(FNR))
110-
.withResponseBody(arbeidsforholdmelding)
111-
.stubPost(HttpStatus.OK);
112-
113-
JsonWiremockHelper
114-
.builder(objectMapper)
115-
.withUrlPathMatching("(.*)/kodeverk/api/v1/kodeverk/Yrker/koder")
116-
.withResponseBody(kodeverkResponse)
117-
.stubGet();
118-
119-
JsonWiremockHelper
120-
.builder(objectMapper)
121-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidsforhold")
122-
.withResponseBody(Arbeidsforhold.builder().build())
123-
.stubPost(HttpStatus.OK);
124-
125-
mvc.perform(post("/api/v1/orkestrering/aareg/" + MILJOE)
126-
.contentType(MediaType.APPLICATION_JSON).with(jwt()))
127-
.andExpect(status().isOk());
128-
129-
JsonWiremockHelper
130-
.builder(objectMapper)
131-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidstaker/arbeidsforhold")
132-
.withResponseBody(Collections.emptyList())
133-
.verifyGet();
134-
135-
JsonWiremockHelper
136-
.builder(objectMapper)
137-
.withUrlPathMatching("(.*)/synt-aareg/api/v1/generate_aareg")
138-
.withRequestBody(Collections.singletonList(FNR))
139-
.withResponseBody(arbeidsforholdmelding)
140-
.verifyPost();
141-
142-
JsonWiremockHelper
143-
.builder(objectMapper)
144-
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
145-
.withResponseBody(kodeverkResponse)
146-
.verifyGet();
147-
148-
JsonWiremockHelper
149-
.builder(objectMapper)
150-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidsforhold")
151-
.withResponseBody(Arbeidsforhold.builder().build())
152-
.verifyPost();
153-
154-
}
155-
15687
@Test
15788
void shouldNotOppretteAaregWhenAlreadyExists() throws Exception {
15889
final AaregModel aaregModel = createAaregModel();
@@ -180,56 +111,4 @@ void shouldNotOppretteAaregWhenAlreadyExists() throws Exception {
180111
.verifyGet();
181112

182113
}
183-
184-
@Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
185-
@Test
186-
void shouldNotOppretteAaregIfSyntError() throws Exception {
187-
final AaregModel aaregModel = createAaregModel();
188-
aaregRepository.save(aaregModel);
189-
190-
when(tokenExchange.exchange(any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("dummy")));
191-
192-
JsonWiremockHelper
193-
.builder(objectMapper)
194-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidstaker/arbeidsforhold")
195-
.withResponseBody(Collections.emptyList())
196-
.stubGet();
197-
198-
JsonWiremockHelper
199-
.builder(objectMapper)
200-
.withUrlPathMatching("(.*)/synt-aareg/api/v1/generate_aareg")
201-
.withRequestBody(Collections.singletonList(FNR))
202-
.withResponseBody("error")
203-
.stubPost(HttpStatus.OK);
204-
205-
JsonWiremockHelper
206-
.builder(objectMapper)
207-
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
208-
.withResponseBody(kodeverkResponse)
209-
.stubGet();
210-
211-
mvc.perform(post("/api/v1/orkestrering/aareg/" + MILJOE)
212-
.contentType(MediaType.APPLICATION_JSON).with(jwt()))
213-
.andExpect(status().isOk());
214-
215-
JsonWiremockHelper
216-
.builder(objectMapper)
217-
.withUrlPathMatching("(.*)/aareg/test/api/v1/arbeidstaker/arbeidsforhold")
218-
.withResponseBody(Collections.emptyList())
219-
.verifyGet();
220-
221-
JsonWiremockHelper
222-
.builder(objectMapper)
223-
.withUrlPathMatching("(.*)/synt-aareg/api/v1/generate_aareg")
224-
.withRequestBody(Collections.singletonList(FNR))
225-
.withResponseBody("error")
226-
.verifyPost();
227-
228-
JsonWiremockHelper
229-
.builder(objectMapper)
230-
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
231-
.withResponseBody(kodeverkResponse)
232-
.verifyGet();
233-
}
234-
235114
}

‎libs/security-core/src/test/java/no/nav/testnav/libs/securitycore/domain/ApplicationContextTest.java

-27
This file was deleted.

‎proxies/yrkesskade-proxy/src/test/java/no/nav/testnav/proxies/yrkesskadeproxy/ApplicationContextTest.java

-22
This file was deleted.

0 commit comments

Comments
 (0)