diff --git a/pom.xml b/pom.xml index d66349e4..f479d645 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ ${packaging.mode} fr.insee.rmes magma - 0.2.3 + 0.3.0 magma Metadata management API @@ -21,7 +21,7 @@ war - 11 + 17 21.0.1 20230227 4.2.3 diff --git a/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java b/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java index 0e083f72..a11e2498 100644 --- a/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java +++ b/src/test/java/fr/insee/rmes/services/codelists/CodeListImplTest.java @@ -24,49 +24,53 @@ @ExtendWith(MockitoExtension.class) class CodeListImplTest { - public static final String RDF_OUTPUT_EXPECTED = " [\n" + - " {\n" + - " \"notation\": \"ISO-639\",\n" + - " \"statutValidation\": \"Publiée\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SURVEY_UNIT\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SURVEY_STATUS\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_FREQ\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_COLLECTION_MODE\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SOURCE_CATEGORY\"\n" + - " }\n" + - " ]"; - - public static final String RDF_OUTPUT = " [\n" + - " {\n" + - " \"notation\": \"ISO-639\",\n" + - " \"statutValidation\": \"Validated\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SURVEY_UNIT\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SURVEY_STATUS\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_FREQ\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_COLLECTION_MODE\"\n" + - " },\n" + - " {\n" + - " \"notation\": \"CL_SOURCE_CATEGORY\"\n" + - " }\n" + - " ]"; + public static final String RDF_OUTPUT_EXPECTED = """ + [ + { + "notation": "ISO-639", + "statutValidation": "Publiée" + }, + { + "notation": "CL_SURVEY_UNIT" + }, + { + "notation": "CL_SURVEY_STATUS" + }, + { + "notation": "CL_FREQ" + }, + { + "notation": "CL_COLLECTION_MODE" + }, + { + "notation": "CL_SOURCE_CATEGORY" + } + ] + """; + + public static final String RDF_OUTPUT = """ + [ + { + "notation": "ISO-639", + "statutValidation": "Validated" + }, + { + "notation": "CL_SURVEY_UNIT" + }, + { + "notation": "CL_SURVEY_STATUS" + }, + { + "notation": "CL_FREQ" + }, + { + "notation": "CL_COLLECTION_MODE" + }, + { + "notation": "CL_SOURCE_CATEGORY" + } + ] + """; public static final String CODELIST_TEST_WITH_STATUT_VALIDATION = "{\"dateMiseAJour\":\"2023-01-01T00:00:00\",\"dateCreation\":\"2023-01-01T00:00:00\",\"statutValidation\":\"Provisoire, jamais publiée\",\"id\":\"CL_TEST\"}"; public static final String CODELIST_TEST_WITHOUT_STATUT_VALIDATION = "{\"dateMiseAJour\":\"2023-01-01T00:00:00\",\"dateCreation\":\"2023-01-01T00:00:00\",\"id\":\"CL_TEST\"}";