From 470a70ea74337bb53f70d79a40647a387455d7bb Mon Sep 17 00:00:00 2001 From: Eric Degenetais Date: Tue, 5 Mar 2024 12:20:55 +0100 Subject: [PATCH 1/3] As the service calls getPs, we need to stub that too. --- .../psc/toggle/service/TogglePsRefsTest.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java index 25e912d..886a3dc 100644 --- a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java +++ b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java @@ -15,9 +15,12 @@ */ package fr.ans.psc.toggle.service; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.junit5.WireMockExtension; import static com.github.tomakehurst.wiremock.client.WireMock.*; +import fr.ans.psc.model.Ps; import static org.junit.jupiter.api.Assertions.assertEquals; import fr.ans.psc.toggle.ToggleManagerApplication; @@ -58,6 +61,15 @@ static void registerPgProperties(DynamicPropertyRegistry propertiesRegistry) { void successfulToggle() { httpApiMockServer.stubFor(put("/v2/toggle") .willReturn(aResponse().withStatus(200))); + httpApiMockServer.stubFor(get("/v2/ps/810107517681") + .willReturn(okJson("{\"nationalId\": \"810107517681\","+ + "\"nationalIdRef\": \"0016054827\"}"))); + httpApiMockServer.stubFor(get("/v2/ps/10107583576") + .willReturn(okJson("{\"nationalId\": \"10107583576\","+ + "\"nationalIdRef\": \"016054801\"}"))); + httpApiMockServer.stubFor(get("/v2/ps/10107518424") + .willReturn(okJson("{\"nationalId\": \"10107518424\","+ + "\"nationalIdRef\": \"016041030\"}"))); ClassLoader cl = Thread.currentThread().getContextClassLoader(); String rootpath = cl.getResource(".").getPath(); @@ -71,7 +83,7 @@ void successfulToggle() { @Test @DisplayName("should handle 4xx return codes") - void toggleWithErrors() { + void toggleWithErrors() throws JsonProcessingException { httpApiMockServer.stubFor(put("/v2/toggle").withRequestBody(equalToJson( "{\"returnStatus\":100," + "\"nationalIdRef\":\"0016041030\"," + @@ -95,6 +107,10 @@ void toggleWithErrors() { "\"activated\":null," + "\"deactivated\":null}")) .willReturn(aResponse().withStatus(200))); + + httpApiMockServer.stubFor(get("/v2/ps/810107517681") + .willReturn(okJson("{\"nationalId\": \"810107517681\","+ + "\"nationalIdRef\": \"0016054827\"}"))); ClassLoader cl = Thread.currentThread().getContextClassLoader(); String rootpath = cl.getResource(".").getPath(); From 4d8e63041f0a9a054acba75a15a89d84873d98f8 Mon Sep 17 00:00:00 2001 From: Eric Degenetais Date: Tue, 5 Mar 2024 12:24:23 +0100 Subject: [PATCH 2/3] =?UTF-8?q?[Code=20QA]=20Nettoyage=20imports.=20MArqua?= =?UTF-8?q?ge=20des=20m=C3=A9thodes=20de=20test=20en=20public.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/ans/psc/toggle/service/TogglePsRefsTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java index 886a3dc..813be9d 100644 --- a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java +++ b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java @@ -15,12 +15,9 @@ */ package fr.ans.psc.toggle.service; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.junit5.WireMockExtension; import static com.github.tomakehurst.wiremock.client.WireMock.*; -import fr.ans.psc.model.Ps; import static org.junit.jupiter.api.Assertions.assertEquals; import fr.ans.psc.toggle.ToggleManagerApplication; @@ -52,13 +49,13 @@ public class TogglePsRefsTest { static WireMockExtension httpApiMockServer = WireMockExtension.newInstance().build(); @DynamicPropertySource - static void registerPgProperties(DynamicPropertyRegistry propertiesRegistry) { + public static void registerPgProperties(DynamicPropertyRegistry propertiesRegistry) { propertiesRegistry.add("api.base.url", () -> httpApiMockServer.baseUrl()); } @Test @DisplayName("should successfully toggle PsRefs") - void successfulToggle() { + public void successfulToggle() { httpApiMockServer.stubFor(put("/v2/toggle") .willReturn(aResponse().withStatus(200))); httpApiMockServer.stubFor(get("/v2/ps/810107517681") @@ -83,7 +80,7 @@ void successfulToggle() { @Test @DisplayName("should handle 4xx return codes") - void toggleWithErrors() throws JsonProcessingException { + public void toggleWithErrors() { httpApiMockServer.stubFor(put("/v2/toggle").withRequestBody(equalToJson( "{\"returnStatus\":100," + "\"nationalIdRef\":\"0016041030\"," + From 59597d00b62e7cb5bca3cba81dffe4802ae02ab7 Mon Sep 17 00:00:00 2001 From: Eric Degenetais Date: Tue, 5 Mar 2024 12:33:07 +0100 Subject: [PATCH 3/3] FIX : had forgtten the 8 prefix in data to indicate id type. --- .../java/fr/ans/psc/toggle/service/TogglePsRefsTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java index 813be9d..a51759a 100644 --- a/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java +++ b/psc-toggle-manager/src/test/java/fr/ans/psc/toggle/service/TogglePsRefsTest.java @@ -61,11 +61,11 @@ public void successfulToggle() { httpApiMockServer.stubFor(get("/v2/ps/810107517681") .willReturn(okJson("{\"nationalId\": \"810107517681\","+ "\"nationalIdRef\": \"0016054827\"}"))); - httpApiMockServer.stubFor(get("/v2/ps/10107583576") - .willReturn(okJson("{\"nationalId\": \"10107583576\","+ + httpApiMockServer.stubFor(get("/v2/ps/810107583576") + .willReturn(okJson("{\"nationalId\": \"810107583576\","+ "\"nationalIdRef\": \"016054801\"}"))); - httpApiMockServer.stubFor(get("/v2/ps/10107518424") - .willReturn(okJson("{\"nationalId\": \"10107518424\","+ + httpApiMockServer.stubFor(get("/v2/ps/810107518424") + .willReturn(okJson("{\"nationalId\": \"810107518424\","+ "\"nationalIdRef\": \"016041030\"}"))); ClassLoader cl = Thread.currentThread().getContextClassLoader();