fix tests

Author: nidi3

graphviz-java/example/ex7.png

@@ -89,7 +89,7 @@ public static Options fromJson(String json) {
         final Matcher basedir = BASE_DIR.matcher(json);
         final boolean hasBasedir = basedir.find();
         final Matcher imgs = IMAGES.matcher(json);
-        final boolean hasImgs = imgs.find();
+        final boolean hasImgs = imgs.find() && imgs.group(1).length() > 0;
         final String[] imgList = hasImgs ? imgs.group(1).split("},\\{") : new String[0];
 
         return new Options(

graphviz-java/example/ex8.png

@@ -17,6 +17,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.io.File;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
@@ -45,7 +47,8 @@ void vizExecWithOptions() {
 
         final String vizResult = engineUnderTest.jsVizExec("digraph{ a -> b}", options);
 
-        assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot',totalMemory:'320000',yInvert:true});"));
+        assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot',totalMemory:'320000',"
+                + "yInvert:true,basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }
 
     @Test
@@ -55,6 +58,7 @@ void vizExecWithoutOptions() {
 
         final String vizResult = engineUnderTest.jsVizExec("digraph{ a -> b}", options);
 
-        assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot'});"));
+        assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot',"
+                + "basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }
 }

graphviz-java/example/graphviz.png

@@ -18,6 +18,8 @@
 import guru.nidi.graphviz.model.Graph;
 import org.junit.jupiter.api.*;
 
+import java.io.File;
+
 import static guru.nidi.graphviz.model.Factory.graph;
 import static guru.nidi.graphviz.model.Factory.node;
 import static org.hamcrest.CoreMatchers.is;
@@ -63,15 +65,17 @@ void executeWithTotalMemory() {
         final Graph graph = graph().with(node("a").link("b"));
         final String result = Graphviz.fromGraph(graph).totalMemory(32000).render(Format.SVG).toString();
 
-        assertThat(result, is("render('graph { \"a\" -- \"b\" }',{format:'svg',engine:'dot',totalMemory:'32000'});"));
+        assertThat(result, is("render('graph { \"a\" -- \"b\" }',"
+                + "{format:'svg',engine:'dot',totalMemory:'32000',basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }
 
     @Test
     void executeWithoutTotalMemory() {
         final Graph graph = graph().with(node("a").link("b"));
         final String result = Graphviz.fromGraph(graph).render(Format.SVG).toString();
 
-        assertThat(result, is("render('graph { \"a\" -- \"b\" }',{format:'svg',engine:'dot'});"));
+        assertThat(result, is("render('graph { \"a\" -- \"b\" }',"
+                + "{format:'svg',engine:'dot',basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }
 
     private void assertThatGraphvizHasFields(Graphviz graphviz, int expectedHeight, int expectedWidth, double expectedScale) {

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

@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2015 Stefan Niederhauser ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package guru.nidi.graphviz.engine;
 
 import org.junit.jupiter.api.Test;
@@ -15,22 +30,32 @@ void fromJsonMinimal() {
     }
 
     @Test
-    void fromJsonEmptyImages() {
+    void fromJsonNoImage() {
         final Options options = Options.fromJson("{engine:'DOT',format:'PNG',totalMemory:'42',yInvert:true,basedir:'hula'}");
         final Options expected = Options.create().engine(Engine.DOT).format(Format.PNG).totalMemory(42).yInvert(true).basedir(new File("hula"));
         assertEquals(expected, options);
     }
 
+    @Test
+    void fromJsonEmptyImages() {
+        final Options options = Options.fromJson("{engine:'DOT',format:'PNG',totalMemory:'42',yInvert:true,basedir:'hula',images:[]}");
+        final Options expected = Options.create().engine(Engine.DOT).format(Format.PNG).totalMemory(42).yInvert(true).basedir(new File("hula"));
+        assertEquals(expected, options);
+    }
+
     @Test
     void fromJsonOneImage() throws IOException {
-        final Options options = Options.fromJson("{engine:'DOT',format:'PNG',images:[{path:'example/ex1.png',width:'550px',height:'100px'}]}");
+        final Options options = Options.fromJson("{engine:'DOT',format:'PNG',images:["
+                + "{path:'" + new File(".").getAbsolutePath() + "/example/ex1.png',width:'550px',height:'100px'}]}");
         final Options expected = Options.create().engine(Engine.DOT).format(Format.PNG).image("example/ex1.png");
         assertEquals(expected, options);
     }
 
     @Test
     void fromJsonTwoImages() throws IOException {
-        final Options options = Options.fromJson("{engine:'DOT',format:'PNG',images:[{path:'example/ex1.png',width:'550px',height:'100px'},{path:'example/ex2.png',width:'900px',height:'964px']}");
+        final Options options = Options.fromJson("{engine:'DOT',format:'PNG',images:["
+                + "{path:'" + new File(".").getAbsolutePath() + "/example/ex1.png',width:'550px',height:'100px'},"
+                + "{path:'" + new File(".").getAbsolutePath() + "/example/ex2.png',width:'900px',height:'964px']}");
         final Options expected = Options.create().engine(Engine.DOT).format(Format.PNG).image("example/ex1.png").image("example/ex2.png");
         assertEquals(expected, options);
     }
@@ -50,7 +75,8 @@ void toJsonEmptyImages() {
     @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:[{path:'" + new File("example/ex1.png").getAbsolutePath() + "',width:'550px',height:'100px'}]}", s);
+        assertEquals("{format:'svg',engine:'dot',basedir:'" + new File("example").getAbsolutePath() + "',images:[" +
+                "{path:'" + new File("example/ex1.png").getAbsolutePath() + "',width:'550px',height:'100px'}]}", s);
     }
 
     @Test

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

@@ -15,11 +15,11 @@
  */
 package guru.nidi.graphviz.model;
 
-import guru.nidi.graphviz.attribute.*;
 import guru.nidi.graphviz.attribute.Color;
 import guru.nidi.graphviz.attribute.Font;
 import guru.nidi.graphviz.attribute.Label;
 import guru.nidi.graphviz.attribute.Shape;
+import guru.nidi.graphviz.attribute.*;
 import guru.nidi.graphviz.engine.*;
 import org.junit.jupiter.api.*;
 

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

@@ -170,4 +170,24 @@ void ex6() throws IOException {
         g.fontAdjust(.87).render(Format.PNG).toFile(new File("example/ex6a.png"));
         //## end
     }
+
+    @Test
+    void ex7() throws IOException {
+        //## img
+        Graphviz.useEngine(new GraphvizCmdLineEngine());
+        Graphviz g = Graphviz.fromGraph(graph()
+                .with(node(Label.html("<table border='0'><tr><td><img src='graphviz.png' /></td></tr></table>"))));
+        g.basedir(new File("example")).render(Format.PNG).toFile(new File("example/ex7.png"));
+        //## img
+    }
+
+    @Test
+    void ex8() throws IOException {
+        //## image
+        Graphviz.useEngine(new GraphvizV8Engine());
+        Graphviz g = Graphviz.fromGraph(graph()
+                .with(node(" ").with(Size.std().margin(.8, .7), Image.of("graphviz.png"))));
+        g.basedir(new File("example")).render(Format.PNG).toFile(new File("example/ex8.png"));
+        //## image
+    }
 }