From c96a1f1e664f2b9309388f36e22621e4b9673a83 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Wed, 19 Jul 2023 18:45:55 +0200
Subject: [PATCH] - adapted to changed ValidationResourceResolver
---
.../plugin/Validation/TestValidateSchema.java | 20 +++++++++----------
.../plugin/XmlFormatValidationPlugin.java | 3 ++-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
index 28d24e9..24b030b 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
@@ -67,10 +67,9 @@ public class TestValidateSchema {
@org.junit.Test
public void schema_valid() {
-
- ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
- ValidationResultHandle logger = new ValidationResultHandle();
- var v = new ValidateSchema(validationResourceResolver, logger);
+ ValidationResultHandle resultHandle = new ValidationResultHandle();
+ ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
+ var v = new ValidateSchema(validationResourceResolver, resultHandle);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
@@ -81,15 +80,16 @@ public class TestValidateSchema {
e.printStackTrace();
has_exception = true;
}
+ System.out.println( resultHandle.getLog());
assertFalse("schema validation should not raise an exception", has_exception );
assertTrue("schema validation should return true for sucessful validation", res);
}
@org.junit.Test
public void schema_invalid() {
- ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
- ValidationResultHandle logger = new ValidationResultHandle();
- var v = new ValidateSchema(validationResourceResolver, logger);
+ ValidationResultHandle resultHandle = new ValidationResultHandle();
+ ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
+ var v = new ValidateSchema(validationResourceResolver, resultHandle);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
@@ -115,9 +115,9 @@ public class TestValidateSchema {
nssm.add(val);
}
}
- ValidationResultHandle logger = new ValidationResultHandle();
- ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, true);
- var v = new ValidateSchema(validationResourceResolver, logger);
+ ValidationResultHandle resultHandle = new ValidationResultHandle();
+ ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm, resultHandle);
+ var v = new ValidateSchema(validationResourceResolver, resultHandle);
assertNotNull( "validator schema sucessfully instantiated", v);
var has_exception = false;
var res = false;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
index e53b18a..8fd9c28 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
@@ -157,7 +157,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
};
validationCatalogResolver = new ValidationCatalogResolver(catalogs,validationLogger);
loadNamespaceSchemaMap( initp.get("schemacatalog").trim() );
- validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, debug);
+ validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, validationLogger);
}
private XmlInfoRecord getXMLinfo(Document doc) {
@@ -318,6 +318,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
dbf.setFeature("http://xml.org/sax/features/validation", false);
dbf.setValidating(false);
dbf.setSchema(null);
+
//dbf.setXIncludeAware(true);
dbf.setNamespaceAware(true);
DocumentBuilder db = dbf.newDocumentBuilder();
--
GitLab