fix tests

Signed-off-by: Stefan Niederhauser <[email protected]>

Author: nidi3

graphviz-java/src/main/java/guru/nidi/graphviz/engine/Options.java

@@ -28,7 +28,6 @@
 import static guru.nidi.graphviz.engine.GraphvizLoader.readAsBytes;
 import static guru.nidi.graphviz.engine.StringFunctions.replaceNonWordChars;
 import static guru.nidi.graphviz.engine.TempFiles.tempDir;
-import static guru.nidi.graphviz.service.SystemUtils.relativeUriPathOf;
 import static guru.nidi.graphviz.service.SystemUtils.uriPathOf;
 import static java.lang.Integer.parseInt;
 import static java.util.Locale.ENGLISH;
@@ -148,7 +147,7 @@ public String originalImagePath(String processPath) {
     private String completePath(String path) {
         return isUrl(path) || new File(path).isAbsolute() || basedir.getPath().equals(".")
                 ? path
-                : relativeUriPathOf(new File(basedir, path).getPath());
+                : uriPathOf(new File(basedir, path).getPath());
     }
 
     static boolean isUrl(String path) {
@@ -219,9 +218,9 @@ static Image create(String path, String completePath) {
                          final OutputStream out = new FileOutputStream(file)) {
                         out.write(readAsBytes(in));
                     }
-                    System.out.println("******************" + file + " " + file.exists());
                     final BufferedImage image = ImageIO.read(file);
-                    return new Image(path, file.getAbsolutePath(), image.getWidth(), image.getHeight());
+                    System.out.println("******************" + file + " " + uriPathOf(file) + " " + file.exists() + " " + image.getWidth());
+                    return new Image(path, uriPathOf(file), image.getWidth(), image.getHeight());
                 }
                 final BufferedImage image = ImageIO.read(new File(completePath));
                 return new Image(completePath, uriPathOf(new File(completePath)), image.getWidth(), image.getHeight());

graphviz-java/src/main/java/guru/nidi/graphviz/service/SystemUtils.java

@@ -69,12 +69,11 @@ public static Path pathOf(String path) {
         return Paths.get(IS_OS_WINDOWS ? path.replace("\"", "") : path);
     }
 
-    public static String relativeUriPathOf(String path) {
-        return IS_OS_WINDOWS ? path.replace('\\', '/') : path;
-    }
-
     public static String uriPathOf(String path) {
-        return IS_OS_WINDOWS ? "/" + path.replace('\\', '/') : path;
+        if (IS_OS_WINDOWS) {
+            return (path.substring(1, 3).equals(":\\") ? "/" : "") + path.replace('\\', '/');
+        }
+        return path;
     }
 
     public static String uriPathOf(File path) {