Skip to content
Snippets Groups Projects
Commit c96a1f1e authored by Andreas Romeyke's avatar Andreas Romeyke
Browse files

- adapted to changed ValidationResourceResolver

parent 1c42246a
Branches
Tags
No related merge requests found
...@@ -67,10 +67,9 @@ public class TestValidateSchema { ...@@ -67,10 +67,9 @@ public class TestValidateSchema {
@org.junit.Test @org.junit.Test
public void schema_valid() { public void schema_valid() {
ValidationResultHandle resultHandle = new ValidationResultHandle();
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true); ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
ValidationResultHandle logger = new ValidationResultHandle(); var v = new ValidateSchema(validationResourceResolver, resultHandle);
var v = new ValidateSchema(validationResourceResolver, logger);
assertNotNull( "validator schema sucessfully instantiated", v); assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false; var has_exception = false;
var res = false; var res = false;
...@@ -81,15 +80,16 @@ public class TestValidateSchema { ...@@ -81,15 +80,16 @@ public class TestValidateSchema {
e.printStackTrace(); e.printStackTrace();
has_exception = true; has_exception = true;
} }
System.out.println( resultHandle.getLog());
assertFalse("schema validation should not raise an exception", has_exception ); assertFalse("schema validation should not raise an exception", has_exception );
assertTrue("schema validation should return true for sucessful validation", res); assertTrue("schema validation should return true for sucessful validation", res);
} }
@org.junit.Test @org.junit.Test
public void schema_invalid() { public void schema_invalid() {
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true); ValidationResultHandle resultHandle = new ValidationResultHandle();
ValidationResultHandle logger = new ValidationResultHandle(); ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
var v = new ValidateSchema(validationResourceResolver, logger); var v = new ValidateSchema(validationResourceResolver, resultHandle);
assertNotNull( "validator schema sucessfully instantiated", v); assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false; var has_exception = false;
var res = false; var res = false;
...@@ -115,9 +115,9 @@ public class TestValidateSchema { ...@@ -115,9 +115,9 @@ public class TestValidateSchema {
nssm.add(val); nssm.add(val);
} }
} }
ValidationResultHandle logger = new ValidationResultHandle(); ValidationResultHandle resultHandle = new ValidationResultHandle();
ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, true); ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, resultHandle);
var v = new ValidateSchema(validationResourceResolver, logger); var v = new ValidateSchema(validationResourceResolver, resultHandle);
assertNotNull( "validator schema sucessfully instantiated", v); assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false; var has_exception = false;
var res = false; var res = false;
......
...@@ -157,7 +157,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin { ...@@ -157,7 +157,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
}; };
validationCatalogResolver = new ValidationCatalogResolver(catalogs,validationLogger); validationCatalogResolver = new ValidationCatalogResolver(catalogs,validationLogger);
loadNamespaceSchemaMap( initp.get("schemacatalog").trim() ); loadNamespaceSchemaMap( initp.get("schemacatalog").trim() );
validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, debug); validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, validationLogger);
} }
private XmlInfoRecord getXMLinfo(Document doc) { private XmlInfoRecord getXMLinfo(Document doc) {
...@@ -318,6 +318,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin { ...@@ -318,6 +318,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
dbf.setFeature("http://xml.org/sax/features/validation", false); dbf.setFeature("http://xml.org/sax/features/validation", false);
dbf.setValidating(false); dbf.setValidating(false);
dbf.setSchema(null); dbf.setSchema(null);
//dbf.setXIncludeAware(true); //dbf.setXIncludeAware(true);
dbf.setNamespaceAware(true); dbf.setNamespaceAware(true);
DocumentBuilder db = dbf.newDocumentBuilder(); DocumentBuilder db = dbf.newDocumentBuilder();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment