diff --git a/pom.xml b/pom.xml index 6c950523..d445fd4d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.entur netex-validator-java - 12.0.12-SNAPSHOT + 12.1.0-SNAPSHOT netex-validator-java Library for validating NeTEx datasets against the Nordic NeTEx Profile. diff --git a/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java b/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java index 87bda7d4..e1d2124b 100644 --- a/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java +++ b/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactory.java @@ -54,6 +54,7 @@ public class DefaultServiceFrameValidationTreeFactory implements ValidationTreeF "PASSENGER_STOP_ASSIGNMENT_3"; public static final String CODE_DESTINATION_DISPLAY_1 = "DESTINATION_DISPLAY_1"; public static final String CODE_DESTINATION_DISPLAY_2 = "DESTINATION_DISPLAY_2"; + public static final String CODE_DESTINATION_DISPLAY_3 = "DESTINATION_DISPLAY_3"; public static final String CODE_SERVICE_LINK_1 = "SERVICE_LINK_1"; public static final String CODE_SERVICE_LINK_2 = "SERVICE_LINK_2"; public static final String CODE_SERVICE_LINK_3 = "SERVICE_LINK_3"; @@ -219,6 +220,15 @@ public ValidationTreeBuilder builder() { Severity.ERROR ) ) + .withRule( + new ValidateNotExist( + "destinationDisplays/DestinationDisplay/variants/DestinationDisplayVariant[not(@id)]", + CODE_DESTINATION_DISPLAY_3, + "DestinationDisplay missing id on DestinationDisplayVariant", + "Missing id on DestinationDisplayVariant", + Severity.WARNING + ) + ) .withRuleForLineFile( new ValidateExactlyOne( "lines/*[self::Line or self::FlexibleLine]", diff --git a/src/test/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java b/src/test/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java index a24ea26a..a1006a05 100644 --- a/src/test/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java +++ b/src/test/java/org/entur/netex/validation/validator/xpath/tree/DefaultServiceFrameValidationTreeFactoryTest.java @@ -47,6 +47,9 @@ class DefaultServiceFrameValidationTreeFactoryTest { + + + @@ -281,7 +284,8 @@ static Stream ruleCodes() { CODE_PASSENGER_STOP_ASSIGNMENT_2, CODE_PASSENGER_STOP_ASSIGNMENT_3, CODE_DESTINATION_DISPLAY_1, - CODE_DESTINATION_DISPLAY_2 + CODE_DESTINATION_DISPLAY_2, + CODE_DESTINATION_DISPLAY_3 ); }