From ae86250d55872ea4fa30625f8885d9b503284fc0 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Thu, 3 Feb 2022 11:41:00 +0100 Subject: Fix path separator for resource URLs on Windows platforms --- .../org/openslx/libvirt/xml/LibvirtXmlTestResources.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/test/java/org/openslx/libvirt') diff --git a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlTestResources.java b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlTestResources.java index 693a442..20d2376 100644 --- a/src/test/java/org/openslx/libvirt/xml/LibvirtXmlTestResources.java +++ b/src/test/java/org/openslx/libvirt/xml/LibvirtXmlTestResources.java @@ -5,24 +5,28 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import org.openslx.util.Resources; + public final class LibvirtXmlTestResources { - private static final String LIBVIRT_PREFIX_PATH = File.separator + "libvirt"; - private static final String LIBVIRT_PREFIX_PATH_XML = LIBVIRT_PREFIX_PATH + File.separator + "xml"; + private static final String LIBVIRT_PREFIX_PATH = Resources.PATH_SEPARATOR + "libvirt"; + private static final String LIBVIRT_PREFIX_PATH_XML = LIBVIRT_PREFIX_PATH + Resources.PATH_SEPARATOR + "xml"; private static final String LIBVIRT_TEMP_PREFIX = "libvirt-"; private static final String LIBVIRT_TEMP_SUFFIX = ".xml"; public static File getLibvirtXmlFile( String libvirtXmlFileName ) { - String libvirtXmlPath = LibvirtXmlTestResources.LIBVIRT_PREFIX_PATH_XML + File.separator + libvirtXmlFileName; + String libvirtXmlPath = LibvirtXmlTestResources.LIBVIRT_PREFIX_PATH_XML + Resources.PATH_SEPARATOR + + libvirtXmlFileName; URL libvirtXml = LibvirtXmlTestResources.class.getResource( libvirtXmlPath ); return new File( libvirtXml.getFile() ); } public static InputStream getLibvirtXmlStream( String libvirtXmlFileName ) { - String libvirtXmlPath = LibvirtXmlTestResources.LIBVIRT_PREFIX_PATH_XML + File.separator + libvirtXmlFileName; + String libvirtXmlPath = LibvirtXmlTestResources.LIBVIRT_PREFIX_PATH_XML + Resources.PATH_SEPARATOR + + libvirtXmlFileName; return LibvirtXmlTestResources.class.getResourceAsStream( libvirtXmlPath ); } -- cgit v1.2.3-55-g7522