Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 196e173a by Tony Chemit at 2024-06-26T08:31:50+02:00 Fix one validator which used system locale to translate a type (instead of using the decoratorService locale) - - - - - 2cb15c22 by Tony Chemit at 2024-06-26T08:32:13+02:00 Fix ValidateServiceFixtures (assert arguments are flipped) - - - - - 2 changed files: - core/services/test/src/main/java/fr/ird/observe/services/service/ValidateServiceFixtures.java - toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/referential/IdDtoReferentialDisabledFieldValidationSupport.java Changes: ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/ValidateServiceFixtures.java ===================================== @@ -115,7 +115,7 @@ public class ValidateServiceFixtures extends GeneratedValidateServiceFixtures { } private void assertResult(ValidationResult actual, ValidationResult expected) { - Assert.assertEquals(actual.getNodes().size(), expected.getNodes().size()); + Assert.assertEquals(expected.getNodes().size(), actual.getNodes().size()); Iterator<ValidationResultDto> expectedIterator = expected.getNodes().iterator(); for (ValidationResultDto actualNode : actual.getNodes()) { @@ -125,9 +125,9 @@ public class ValidateServiceFixtures extends GeneratedValidateServiceFixtures { } private void assertResult(ValidationResultDto actual, ValidationResultDto expected) { - Assert.assertEquals(actual.getDatum().getId(), expected.getDatum().getId()); - Assert.assertEquals(actual.getMessages(), expected.getMessages()); - Assert.assertEquals(actual.getChildCount(), expected.getChildCount()); + Assert.assertEquals(expected.getDatum().getId(), actual.getDatum().getId()); + Assert.assertEquals(expected.getMessages(), actual.getMessages()); + Assert.assertEquals(expected.getChildCount(), actual.getChildCount()); if (actual.getChildren() != null) { Iterator<ValidationResultDto> actualChildren = actual.getChildren().iterator(); Iterator<ValidationResultDto> expectedChildren = expected.getChildren().iterator(); ===================================== toolkit/api-validation/src/main/java/fr/ird/observe/validation/validators/referential/IdDtoReferentialDisabledFieldValidationSupport.java ===================================== @@ -106,7 +106,8 @@ public abstract class IdDtoReferentialDisabledFieldValidationSupport extends Nui referenceValue = referentialDtoReference.toString(); } else { if (referenceType == null) { - referenceType = I18nDecoratorHelper.getType(referentialDtoReference.getReferenceType()); + DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); + referenceType = I18nDecoratorHelper.getType(decoratorService.getReferentialLocale().getLocale(), referentialDtoReference.getReferenceType()); } } try { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa8ce8cce35d5bf8b9614d9a3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa8ce8cce35d5bf8b9614d9a3... You're receiving this email because of your account on gitlab.com.