Fixed tests.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java

@@ -43,7 +43,7 @@ public class ValidationError {
             example = "/SCL/Substation[1]/VoltageLevel[1]/Bay[5]")
     @XmlElement(name = "XPath",
             namespace = SCL_VALIDATOR_SERVICE_V1_NS_URI)
-    private String xPath;
+    private String xpath;
 
     public String getMessage() {
         return message;
@@ -77,11 +77,11 @@ public void setColumnNumber(Integer columnNumber) {
         this.columnNumber = columnNumber;
     }
 
-    public String getXPath() {
-        return xPath;
+    public String getXpath() {
+        return xpath;
     }
 
-    public void setXPath(String xPath) {
-        this.xPath = xPath;
+    public void setXpath(String xPath) {
+        this.xpath = xPath;
     }
 }

validator/src/main/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandler.java

@@ -39,7 +39,7 @@ public void warning(SAXParseException exception) throws SAXException {
 
         LOGGER.debug("XSD Validation - warning: '{}' (XPath {})",
                 validationError.getMessage(),
-                validationError.getXPath());
+                validationError.getXpath());
     }
 
     @Override
@@ -49,7 +49,7 @@ public void error(SAXParseException exception) throws SAXException {
 
         LOGGER.debug("XSD Validation - error: '{}' (XPath {})",
                 validationError.getMessage(),
-                validationError.getXPath());
+                validationError.getXpath());
     }
 
     @Override
@@ -59,15 +59,15 @@ public void fatalError(SAXParseException exception) throws SAXException {
 
         LOGGER.debug("XSD Validation - fatal error, stopping: '{}' (XPath {})",
                 validationError.getMessage(),
-                validationError.getXPath());
+                validationError.getXpath());
     }
 
     private ValidationError createValidationError(SAXParseException exception) throws SAXException {
         var validationError = new ValidationError();
         var xsdMessage = exception.getMessage();
         validationError.setMessage(getMessage(xsdMessage));
         validationError.setRuleName(getRuleName(xsdMessage));
-        validationError.setXPath(getXPath(getCurrentNode()));
+        validationError.setXpath(getXPath(getCurrentNode()));
         return validationError;
     }
 

validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandlerTest.java

@@ -91,7 +91,7 @@ void fatalError_WhenCalled_ThenNewValidationErrorAddedToList() throws SAXExcepti
     private void assertValidationError(List<ValidationError> errorList, String message) throws SAXException {
         assertEquals(1, errorList.size());
         assertEquals(message, errorList.get(0).getMessage());
-        assertEquals("/SCL", errorList.get(0).getXPath());
+        assertEquals("/SCL", errorList.get(0).getXpath());
         assertNull(errorList.get(0).getLineNumber());
         assertNull(errorList.get(0).getColumnNumber());
 

validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDValidatorTest.java

@@ -44,7 +44,7 @@ void validate_WhenCalledWithSclDataWithXsdValidationErrors_ThenErrorsAreRetrieve
             var error = errorList.get(2);
             assertEquals("Attribute 'name' must appear on element 'BDA'.", error.getMessage());
             assertEquals("XSD/cvc-complex-type.4", error.getRuleName());
-            assertEquals("/SCL/DataTypeTemplates[1]/DAType[1]/BDA[2]", error.getXPath());
+            assertEquals("/SCL/DataTypeTemplates[1]/DAType[1]/BDA[2]", error.getXpath());
         }
     }
 
@@ -64,13 +64,13 @@ void validate_WhenCalledWithSclDataWithCompasXsdValidationErrors_ThenErrorsAreRe
             assertEquals("Value 'INVALID' is not facet-valid with respect to enumeration '[SSD, IID, ICD, SCD, CID, " +
                     "SED, ISD, STD]'. It must be a value from the enumeration.", error.getMessage());
             assertEquals("XSD/cvc-enumeration-valid", error.getRuleName());
-            assertEquals("/SCL/Private[1]/compas:SclFileType[1]", error.getXPath());
+            assertEquals("/SCL/Private[1]/compas:SclFileType[1]", error.getXpath());
 
             error = errorList.get(2);
             assertEquals("Value 'Invalid Label' is not facet-valid with respect to pattern '[A-Za-z][0-9A-Za-z_-]*' " +
                     "for type 'tCompasLabel'.", error.getMessage());
             assertEquals("XSD/cvc-pattern-valid", error.getRuleName());
-            assertEquals("/SCL/Private[1]/compas:Labels[1]/compas:Label[1]", error.getXPath());
+            assertEquals("/SCL/Private[1]/compas:Labels[1]/compas:Label[1]", error.getXpath());
         }
     }