diff --git a/src/test/java/fr/abes/sudoc/controller/SudocControllerTest.java b/src/test/java/fr/abes/sudoc/controller/SudocControllerTest.java index 5426edc..45fdeee 100644 --- a/src/test/java/fr/abes/sudoc/controller/SudocControllerTest.java +++ b/src/test/java/fr/abes/sudoc/controller/SudocControllerTest.java @@ -3,10 +3,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import fr.abes.cbs.exception.CBSException; import fr.abes.sudoc.dto.SearchDatWebDto; +import fr.abes.sudoc.entity.notice.Controlfield; +import fr.abes.sudoc.entity.notice.NoticeXml; import fr.abes.sudoc.exception.ExceptionControllerHandler; +import fr.abes.sudoc.exception.IllegalPpnException; import fr.abes.sudoc.service.NoticeService; import fr.abes.sudoc.service.ProviderService; import fr.abes.sudoc.service.SudocService; +import org.assertj.core.util.Lists; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -78,7 +82,7 @@ void datToPpnTitreIsNull() throws Exception { @Test @DisplayName("datToPpn tryCatchWorks") - void datToPpnTryCatchWorks() throws Exception { + void datToPpnTryCatchWorks() throws Exception, IllegalPpnException { SearchDatWebDto searchDatRequest = new SearchDatWebDto(); searchDatRequest.setDate(2008); @@ -91,7 +95,18 @@ void datToPpnTryCatchWorks() throws Exception { ObjectMapper objectMapper = new ObjectMapper(); String jsonRequest = objectMapper.writeValueAsString(searchDatRequest); + Controlfield ctrlPpn = new Controlfield(); + ctrlPpn.setTag("001"); + ctrlPpn.setValue("123456789"); + Controlfield ctrlType = new Controlfield(); + ctrlType.setTag("008"); + ctrlType.setValue("Oax3"); + NoticeXml notice = new NoticeXml(); + notice.setLeader(" gam0 22 450 "); + notice.setControlfields(Lists.newArrayList(ctrlPpn, ctrlType)); + Mockito.when(service.getPpnFromDat(searchDatRequest.getDate(), searchDatRequest.getAuteur(), searchDatRequest.getTitre())).thenReturn(ppnList); + Mockito.when(noticeService.getNoticeByPpn("123456789")).thenReturn(notice); this.mockMvc.perform(post("/api/v1/dat2ppn") .accept(MediaType.APPLICATION_JSON_VALUE).characterEncoding(StandardCharsets.UTF_8) diff --git a/src/test/java/fr/abes/sudoc/service/SudocServiceTest.java b/src/test/java/fr/abes/sudoc/service/SudocServiceTest.java index 609a1cb..0b2c6c6 100644 --- a/src/test/java/fr/abes/sudoc/service/SudocServiceTest.java +++ b/src/test/java/fr/abes/sudoc/service/SudocServiceTest.java @@ -138,22 +138,4 @@ void getPpnFromDatAllIsNull() throws CBSException { Assertions.assertEquals( 0, result.size()); } - - @Test - @DisplayName("getPpnFromDatWithNotProviderChecking") - void getPpnFromDatWithNotProviderChecking() { - SearchDatWebDto searchDatWebDto = new SearchDatWebDto(); - searchDatWebDto.setDate(2022); - searchDatWebDto.setAuteur("John Doe"); - searchDatWebDto.setTitre("Sample Title"); - searchDatWebDto.setCheckProviderInNotices(false); - - //service.getPpnFromDat(searchDatWebDto.getDate(), searchDatWebDto.getAuteur(), searchDatWebDto.getTitre()); - } - - @Test - @DisplayName("getPpnFromDatWithProviderChecking") - void getPpnFromDatWithProviderChecking() { - - } }