fix tests for windoofs

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

Author: nidi3

graphviz-java/src/test/java/guru/nidi/graphviz/engine/AbstractGraphvizEngineTest.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 
+import static guru.nidi.graphviz.service.SystemUtils.uriPathOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
@@ -45,7 +46,7 @@ void vizExecWithOptions() {
         final String vizResult = engineUnderTest.jsVizExec("digraph{ a -> b}", options);
 
         assertThat(vizResult, is("totalMemory=320000;render('digraph{ a -> b}',{format:'svg',engine:'dot',totalMemory:'320000',"
-                + "yInvert:true,basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
+                + "yInvert:true,basedir:'" + uriPathOf(new File(".")) + "',images:[]});"));
     }
 
     @Test
@@ -56,6 +57,6 @@ void vizExecWithoutOptions() {
         final String vizResult = engineUnderTest.jsVizExec("digraph{ a -> b}", options);
 
         assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot',"
-                + "basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
+                + "basedir:'" + uriPathOf(new File(".")) + "',images:[]});"));
     }
 }

graphviz-java/src/test/java/guru/nidi/graphviz/engine/GraphvizTest.java

@@ -32,6 +32,7 @@
 import static guru.nidi.graphviz.engine.Rasterizer.NONE;
 import static guru.nidi.graphviz.model.Factory.graph;
 import static guru.nidi.graphviz.model.Factory.node;
+import static guru.nidi.graphviz.service.SystemUtils.uriPathOf;
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -81,23 +82,23 @@ void withTotalMemory() {
         final Graph graph = graph().with(node("a").link("b"));
         final String result = Graphviz.fromGraph(graph).totalMemory(32000).render(SVG).toString();
         assertThat(result, is("totalMemory=32000;render('graph {\\n\"a\" -- \"b\"\\n}',"
-                + "{format:'svg',engine:'dot',totalMemory:'32000',basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
+                + "{format:'svg',engine:'dot',totalMemory:'32000',basedir:'" + uriPathOf(new File(".")) + "',images:[]});"));
     }
 
     @Test
     void withoutTotalMemory() {
         final Graph graph = graph().with(node("a").link("b"));
         final String result = Graphviz.fromGraph(graph).render(SVG).toString();
         assertThat(result, is("render('graph {\\n\"a\" -- \"b\"\\n}',"
-                + "{format:'svg',engine:'dot',basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
+                + "{format:'svg',engine:'dot',basedir:'" + uriPathOf(new File(".")) + "',images:[]});"));
     }
 
     @Test
     void withYInvert() {
         final Graph graph = graph().with(node("a").link("b"));
         final String result = Graphviz.fromGraph(graph).yInvert(true).render(SVG).toString();
         assertThat(result, is("render('graph {\\n\"a\" -- \"b\"\\n}',"
-                + "{format:'svg',engine:'dot',yInvert:true,basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
+                + "{format:'svg',engine:'dot',yInvert:true,basedir:'" + uriPathOf(new File(".")) + "',images:[]});"));
     }
 
     @Test

graphviz-java/src/test/java/guru/nidi/graphviz/engine/OptionsTest.java

@@ -66,27 +66,27 @@ void fromJsonTwoImages() {
     @Test
     void toJsonMinimal() {
         final String s = Options.create().engine(Engine.DOT).format(Format.PNG).toJson(false);
-        assertEquals("{format:'svg',engine:'dot',basedir:'" + new File(".").getAbsolutePath() + "',images:[]}", s);
+        assertEquals("{format:'svg',engine:'dot',basedir:'" + uriPathOf(new File(".")) + "',images:[]}", s);
     }
 
     @Test
     void toJsonEmptyImages() {
         final File basedir = new File("/hula");
         final String s = Options.create().engine(Engine.DOT).format(Format.PNG).totalMemory(42).yInvert(true).basedir(basedir).toJson(false);
-        assertEquals("{format:'svg',engine:'dot',totalMemory:'42',yInvert:true,basedir:'" + basedir.getAbsolutePath() + "',images:[]}", s);
+        assertEquals("{format:'svg',engine:'dot',totalMemory:'42',yInvert:true,basedir:'" + uriPathOf(basedir) + "',images:[]}", s);
     }
 
     @Test
     void toJsonOneImage() {
         final String s = Options.create().engine(Engine.DOT).format(Format.PNG).basedir(new File("example")).image("ex1.png").toJson(false);
-        assertEquals("{format:'svg',engine:'dot',basedir:'" + new File("example").getAbsolutePath() + "',images:[" +
+        assertEquals("{format:'svg',engine:'dot',basedir:'" + uriPathOf(new File("example")) + "',images:[" +
                 "{path:'" + uriPathOf(new File("example/ex1.png")) + "',width:'550px',height:'100px'}]}", s);
     }
 
     @Test
     void toJsonTwoImages() {
         final String s = Options.create().engine(Engine.DOT).format(Format.PNG).basedir(new File("example")).image("ex1.png").image("ex2.png").toJson(false);
-        assertEquals("{format:'svg',engine:'dot',basedir:'" + new File("example").getAbsolutePath() + "',images:["
+        assertEquals("{format:'svg',engine:'dot',basedir:'" + uriPathOf(new File("example")) + "',images:["
                 + "{path:'" + uriPathOf(new File("example/ex1.png")) + "',width:'550px',height:'100px'},"
                 + "{path:'" + uriPathOf(new File("example/ex2.png")) + "',width:'900px',height:'964px'}]}", s);
     }