fix tests

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

Author: nidi3

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

@@ -35,10 +35,13 @@ public String execute(String src, Options options) {
     protected abstract String jsExecute(String jsCall);
 
     protected String jsVizExec(String src, Options options) {
-        final Entry<String, Options> srcAndOptions = preprocessCode(src, options);
+        if (src.startsWith("totalMemory") || src.startsWith("render")) {
+            return src;
+        }
         final String memory = options.totalMemory == null ? "" : "totalMemory=" + options.totalMemory + ";";
-        final String render = "render('" + srcAndOptions.getKey() + "'," + srcAndOptions.getValue().toJson(false) + ");";
-        return src.startsWith("render") ? src : (memory + render);
+        final Entry<String, Options> srcAndOpts = preprocessCode(src, options);
+        final String render = "render('" + srcAndOpts.getKey() + "'," + srcAndOpts.getValue().toJson(false) + ");";
+        return memory + render;
     }
 
     protected Entry<String, Options> preprocessCode(String src, Options options) {
@@ -71,7 +74,10 @@ protected String jsInitEnv() {
         return "var viz; var totalMemory = 16777216;"
                 + "function initViz(force){"
                 + "  if (force || !viz || viz.totalMemory !== totalMemory){"
-                + "    viz = new Viz({Module: function(){ return Viz.Module({TOTAL_MEMORY: totalMemory}); }, render: Viz.render});"
+                + "    viz = new Viz({"
+                + "      Module: function(){ return Viz.Module({TOTAL_MEMORY: totalMemory}); },"
+                + "      render: Viz.render"
+                + "    });"
                 + "    viz.totalMemory = totalMemory;"
                 + "  }"
                 + "  return viz;"

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

@@ -85,7 +85,8 @@ private static class Env implements AutoCloseable {
             v8.registerJavaMethod((receiver, parameters) -> {
                 final String rawMsg = parameters.getString(0);
                 final String msg = rawMsg.matches("TypeError: Module\\..*? is not a function")
-                        ? "Got Error: '" + rawMsg + "'. This is probably an out of memory error. Try using the totalMemory method."
+                        ? "Got Error: '" + rawMsg + "'. This is probably an out of memory error."
+                        + " Try using the totalMemory method."
                         : rawMsg;
                 resultHandler.setError(msg);
             }, "error");

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

@@ -47,7 +47,7 @@ void vizExecWithOptions() {
 
         final String vizResult = engineUnderTest.jsVizExec("digraph{ a -> b}", options);
 
-        assertThat(vizResult, is("render('digraph{ a -> b}',{format:'svg',engine:'dot',totalMemory:'320000',"
+        assertThat(vizResult, is("totalMemory=320000;render('digraph{ a -> b}',{format:'svg',engine:'dot',totalMemory:'320000',"
                 + "yInvert:true,basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }
 

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

@@ -65,7 +65,7 @@ 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 { graph [\"dpi\"=\"96\"] \"a\" -- \"b\" }',"
+        assertThat(result, is("totalMemory=32000;render('graph { graph [\"dpi\"=\"96\"] \"a\" -- \"b\" }',"
                 + "{format:'svg',engine:'dot',totalMemory:'32000',basedir:'" + new File(".").getAbsolutePath() + "',images:[]});"));
     }