From 4317a82d74d8b8518a5dbb6b3675aec3f912802e Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Sat, 30 Jan 2021 12:00:35 +0100 Subject: Add automatic RelaxNG schema validation for Libvirt domain XML documents --- .../java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java') diff --git a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java index 1b6e5a5..75b934e 100644 --- a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java +++ b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlDocumentTest.java @@ -9,11 +9,9 @@ import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - import org.apache.commons.io.FileUtils; import org.apache.log4j.Level; import org.apache.log4j.LogManager; @@ -30,7 +28,7 @@ class LibvirtXmlDocumentStub extends LibvirtXmlDocument super( xml ); } - public LibvirtXmlDocumentStub( File xml, Source rngSchema ) + public LibvirtXmlDocumentStub( File xml, InputStream rngSchema ) throws LibvirtXmlDocumentException, LibvirtXmlSerializationException, LibvirtXmlValidationException { super( xml, rngSchema ); @@ -70,8 +68,8 @@ public class LibvirtXmlDocumentTest try { File xmlFile = LibvirtXmlTestResources.getLibvirtXmlFile( xmlFileName ); - Source rngSchemaSource = new StreamSource( LibvirtXmlResources.getLibvirtRng( rngSchemaFileName ) ); - document = new LibvirtXmlDocumentStub( xmlFile, rngSchemaSource ); + InputStream rngSchema = LibvirtXmlResources.getLibvirtRng( rngSchemaFileName ); + document = new LibvirtXmlDocumentStub( xmlFile, rngSchema ); } catch ( LibvirtXmlDocumentException | LibvirtXmlSerializationException e ) { String errorMsg = new String( "Cannot prepare requested Libvirt XML file from the resources folder" ); fail( errorMsg ); -- cgit v1.2.3-55-g7522