From 9a8e73d883d16f3dabda29adbed838c44f1ca430 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 5 Apr 2021 01:16:05 +0200 Subject: [PATCH] [DEBUG] start to work a little ==> nead to review API... --- .classpath | 14 +- lib/pngdecoder.jar | Bin 0 -> 13157 bytes src/module-info.java | 2 + src/org/atriasoft/esvg/Base.java | 26 ++-- src/org/atriasoft/esvg/EsvgDocument.java | 82 +++-------- src/org/atriasoft/esvg/Rectangle.java | 2 +- src/org/atriasoft/esvg/Renderer.java | 42 +----- src/org/atriasoft/esvg/esvg.cpp | 73 ---------- src/org/atriasoft/esvg/render/Element.java | 8 +- .../atriasoft/esvg/render/ElementLineToV.java | 2 +- src/org/atriasoft/esvg/render/PathModel.java | 12 +- src/org/atriasoft/esvg/render/PointList.java | 6 +- src/org/atriasoft/esvg/render/Weight.java | 9 +- test/src/test/atriasoft/esvg/ConfigTest.java | 28 +++- test/src/test/atriasoft/esvg/TestCap.java | 48 +++---- test/src/test/atriasoft/esvg/TestCircle.java | 12 +- test/src/test/atriasoft/esvg/TestColor.java | 16 +-- test/src/test/atriasoft/esvg/TestEllipse.java | 12 +- .../atriasoft/esvg/TestGradientLinear.java | 72 +++++----- .../atriasoft/esvg/TestGradientRadial.java | 64 ++++----- test/src/test/atriasoft/esvg/TestJoin.java | 128 +++++++++--------- test/src/test/atriasoft/esvg/TestLine.java | 4 +- test/src/test/atriasoft/esvg/TestPath.java | 36 ++--- test/src/test/atriasoft/esvg/TestPolygon.java | 12 +- .../src/test/atriasoft/esvg/TestPolyline.java | 12 +- .../test/atriasoft/esvg/TestRectangle.java | 24 ++-- test/src/test/atriasoft/esvg/TestStyle.java | 4 +- 27 files changed, 318 insertions(+), 432 deletions(-) create mode 100644 lib/pngdecoder.jar delete mode 100644 src/org/atriasoft/esvg/esvg.cpp diff --git a/.classpath b/.classpath index a18b558..edb8ddf 100644 --- a/.classpath +++ b/.classpath @@ -16,12 +16,17 @@ + + + + + - + @@ -31,7 +36,12 @@ - + + + + + + diff --git a/lib/pngdecoder.jar b/lib/pngdecoder.jar new file mode 100644 index 0000000000000000000000000000000000000000..fc39e9bea4cddfc19c8be63f15e992b0830bad60 GIT binary patch literal 13157 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.NONE, ""); } else { if (content.length() != 0) { @@ -251,7 +251,7 @@ public class Base { content = element.getAttribute("stroke-dasharray", ""); if (content.length() != 0) { - if (content == "none") { + if (content.equals("none")) { // OK, Nothing to do ... } else { Log.todo(" 'stroke-dasharray' not implemented ..."); @@ -259,11 +259,11 @@ public class Base { } content = element.getAttribute("stroke-linecap", ""); if (content.length() != 0) { - if (content == "butt") { + if (content.equals("butt")) { this.paint.lineCap = CapMode.BUTT; - } else if (content == "round") { + } else if (content.equals("round")) { this.paint.lineCap = CapMode.ROUND; - } else if (content == "square") { + } else if (content.equals("square")) { this.paint.lineCap = CapMode.SQUARE; } else { this.paint.lineCap = CapMode.BUTT; @@ -272,11 +272,11 @@ public class Base { } content = element.getAttribute("stroke-linejoin", ""); if (content.length() != 0) { - if (content == "miter") { + if (content.equals("miter")) { this.paint.lineJoin = JoinMode.MITER; - } else if (content == "round") { + } else if (content.equals("round")) { this.paint.lineJoin = JoinMode.ROUND; - } else if (content == "bevel") { + } else if (content.equals("bevel")) { this.paint.lineJoin = JoinMode.BEVEL; } else { this.paint.lineJoin = JoinMode.MITER; @@ -291,7 +291,7 @@ public class Base { } // ---------------- FILL ---------------- content = element.getAttribute("fill", ""); - if (content == "none") { + if (content.equals("none")) { this.paint.fill = new Pair<>(Color.NONE, ""); } else { if (content.length() != 0) { @@ -305,9 +305,9 @@ public class Base { } content = element.getAttribute("fill-rule", ""); if (content.length() != 0) { - if (content == "nonzero") { + if (content.equals("nonzero")) { this.paint.flagEvenOdd = false; - } else if (content == "evenodd") { + } else if (content.equals("evenodd")) { this.paint.flagEvenOdd = true; } else { Log.error("not know fill-rule value : \"" + content + "\", not in [nonzero,evenodd]"); diff --git a/src/org/atriasoft/esvg/EsvgDocument.java b/src/org/atriasoft/esvg/EsvgDocument.java index 8475bf4..c4f43fb 100644 --- a/src/org/atriasoft/esvg/EsvgDocument.java +++ b/src/org/atriasoft/esvg/EsvgDocument.java @@ -18,9 +18,9 @@ import org.atriasoft.exml.model.XmlNode; public class EsvgDocument extends Base { private boolean loadOK = false; - private List refList; + private final List refList = new ArrayList<>(); private Vector2f size = Vector2f.ZERO; - private List subElementList; + private final List subElementList = new ArrayList<>(); private String title = ""; //!< sub-element list private Uri uri = null; //!< reference elements ... private String version = "0.0"; @@ -108,51 +108,6 @@ public class EsvgDocument extends Base { } } - /** - * generate a string that contain the created SVG - * @param data Data where the svg is stored - * @return false : An error occured - * @return true : Parsing is OK - */ - public boolean generate(final String data) { - return false; - } - - public void generateAnImage(final Uri uri) { - generateAnImage(uri, false); - } - - public void generateAnImage(final Uri uri, final boolean visualDebug) { - generateAnImage(new Vector2i((int) this.size.x(), (int) this.size.y()), uri, visualDebug); - } - - public void generateAnImage(final Vector2i size, final Uri uri) { - generateAnImage(size, uri, false); - } - - public void generateAnImage(final Vector2i size, final Uri uri, final boolean visualDebug) { - Vector2i sizeRender = size; - if (sizeRender.x() <= 0) { - sizeRender = sizeRender.withX((int) this.size.x()); - } - if (sizeRender.y() <= 0) { - sizeRender = sizeRender.withY((int) this.size.y()); - } - Log.debug("Generate size " + sizeRender); - - Renderer renderedElement = new Renderer(sizeRender, this, visualDebug); - // create the first element matrix modification ... - Matrix2x3f basicTrans = Matrix2x3f.IDENTITY.multiply(Matrix2x3f.createScale(new Vector2f(sizeRender.x() / this.size.x(), sizeRender.y() / this.size.y()))); - - draw(renderedElement, basicTrans); - - if (uri.getExtention().equals("ppm")) { - renderedElement.writePPM(uri); - } else { - Log.error("Can not store with this extention : " + uri + " not in .bmp/.ppm"); - } - } - // TODO remove this fucntion : use generic function ... public Vector2f getDefinedSize() { return this.size; @@ -418,15 +373,23 @@ public class EsvgDocument extends Base { * @param size Size expected of the rendered image (value <=0 if it need to be automatic.) return the size generate * @return Vector of the data used to display (simple vector: generic to transmit) */ - public Color[][] renderImageFloatRGBA(Vector2i size) { - if (size.x() <= 0) { - size = size.withX((int) this.size.x()); - } - if (size.y() <= 0) { - size = size.withY((int) this.size.y()); + public Color[][] renderImageFloatRGBA(final Vector2i size) { + return renderImageFloatRGBA(size, false); + } + + public Color[][] renderImageFloatRGBA(Vector2i size, final boolean visualDebug) { + if (size == null) { + size = new Vector2i((int) this.size.x(), (int) this.size.y()); + } else { + if (size.x() <= 0) { + size = size.withX((int) this.size.x()); + } + if (size.y() <= 0) { + size = size.withY((int) this.size.y()); + } } Log.debug("Generate size " + size); - Renderer renderedElement = new Renderer(size, this); + Renderer renderedElement = new Renderer(size, this, visualDebug); // create the first element matrix modification ... Matrix2x3f basicTrans = Matrix2x3f.IDENTITY.multiply(Matrix2x3f.createScale(new Vector2f(size.x() / this.size.x(), size.y() / this.size.y()))); draw(renderedElement, basicTrans); @@ -435,15 +398,4 @@ public class EsvgDocument extends Base { return renderedElement.getData(); } - /** - * Store the SVG in the file - * @param uri File of the svg - * @return false : An error occured - * @return true : Parsing is OK - */ - public boolean store(final Uri uri) { - Log.todo("not implemented store in SVG..."); - return false; - } - } diff --git a/src/org/atriasoft/esvg/Rectangle.java b/src/org/atriasoft/esvg/Rectangle.java index 31ae772..d84a4bf 100644 --- a/src/org/atriasoft/esvg/Rectangle.java +++ b/src/org/atriasoft/esvg/Rectangle.java @@ -70,7 +70,7 @@ public class Rectangle extends Base { Matrix2x3f mtx = this.transformMatrix; mtx = mtx.multiply(basicTrans); - + listElement.display(2); PointList listPoints = new PointList(); listPoints = listElement.generateListPoints(level, myRenderer.getInterpolationRecurtionMax(), myRenderer.getInterpolationThreshold()); //listPoints.applyMatrix(mtx); diff --git a/src/org/atriasoft/esvg/Renderer.java b/src/org/atriasoft/esvg/Renderer.java index a7691c3..4c18c54 100644 --- a/src/org/atriasoft/esvg/Renderer.java +++ b/src/org/atriasoft/esvg/Renderer.java @@ -1,7 +1,6 @@ package org.atriasoft.esvg; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.atriasoft.esvg.render.DynamicColor; @@ -11,10 +10,10 @@ import org.atriasoft.esvg.render.Segment; import org.atriasoft.esvg.render.SegmentList; import org.atriasoft.esvg.render.Weight; import org.atriasoft.etk.Color; -import org.atriasoft.etk.Uri; import org.atriasoft.etk.math.FMath; import org.atriasoft.etk.math.Vector2f; import org.atriasoft.etk.math.Vector2i; +import org.atriasoft.etk.util.ArraysTools; /** @file * @author Edouard DUPIN @@ -23,7 +22,7 @@ import org.atriasoft.etk.math.Vector2i; */ public class Renderer { - private static final boolean DEBUG_MODE = false; + private static final boolean DEBUG_MODE = true; protected Color[][] buffer; // for debug protected EsvgDocument document; // for debug @@ -222,9 +221,7 @@ public class Renderer { if (Renderer.DEBUG_MODE) { // display the gradient position: - DynamicColorSpecial tmpColor = (DynamicColorSpecial) (colorFill); - - if (tmpColor != null) { + if (colorFill instanceof DynamicColorSpecial tmpColor) { SegmentList listSegment = new SegmentList(); // Display bounding box listSegment.addSegment(new Point(tmpColor.viewPort.first), new Point(new Vector2f(tmpColor.viewPort.first.x(), tmpColor.viewPort.second.y())), false); @@ -264,38 +261,7 @@ public class Renderer { } else { this.buffer = new Color[this.size.x() * this.factor][this.size.y() * this.factor]; } - Arrays.fill(this.buffer, Color.NONE); + ArraysTools.fill2(this.buffer, Color.NONE); } - void writePPM(final Uri uri) { - /* - if (this.buffer.length == 0) { - return; - } - auto fileIo = uri::get(uri); - if (fileIo == null) { - Log.error("Can not create the uri: " + uri); - return; - } - if (fileIo.open(io::OpenMode::Write) == false) { - Log.error("Can not open (r) the file : " + uri); - return; - } - int sizeX = this.size.x(); - int sizeY = this.size.y(); - if (Renderer.DEBUG_MODE) { - sizeX *= this.factor; - sizeY *= this.factor; - } - Log.debug("Generate ppm : " + this.size + " debug size=" + (new Vector2i(sizeX,sizeY))); - char tmpValue[1024]; - sprintf(tmpValue, "P6 %d %d 255 ", sizeX, sizeY); - fileIo.write(tmpValue,1,sizeof(tmpValue)); - for (int iii=0 ; iii -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -EsvgDocument::Document() { - this.uri = ""; - this.version = "0.0"; - this.loadOK = false; - this.size.setValue(0,0); -} - -EsvgDocument::~Document() { - -} - - - -void EsvgDocument::displayDebug() - -void EsvgDocument::draw(Renderer myRenderer, Matrix2x3f basicTrans, int level) -// FOR TEST only ... -void EsvgDocument::generateAnImage(Uri& uri, boolean visualDebug) -void EsvgDocument::generateAnImage(Vector2i size, Uri& uri, boolean visualDebug) - - -List EsvgDocument::renderImageFloatRGBA(Vector2i size) - -List> EsvgDocument::renderImageFloatRGB(Vector2i size) -List> EsvgDocument::renderImageU8RGBA(Vector2i size) - -List> EsvgDocument::renderImageU8RGB(Vector2i size) - -void EsvgDocument::clear() - -boolean EsvgDocument::parse(String& data) - -boolean EsvgDocument::generate(String& data) - -boolean EsvgDocument::load(Uri& uri) - -boolean EsvgDocument::store(Uri& uri) -boolean EsvgDocument::cleanStyleProperty(XmlElement root) - -boolean EsvgDocument::parseXMLData(XmlElement root, boolean isReference) - - - -Base EsvgDocument::getReference(String& name) -List> EsvgDocument::getLines(Vector2f size) - - -void EsvgDocument::drawShapePoints(List>& out, - int recurtionMax, - float threshold, - Matrix2x3f basicTrans, - int level) \ No newline at end of file diff --git a/src/org/atriasoft/esvg/render/Element.java b/src/org/atriasoft/esvg/render/Element.java index 9f667e7..588d02a 100644 --- a/src/org/atriasoft/esvg/render/Element.java +++ b/src/org/atriasoft/esvg/render/Element.java @@ -11,13 +11,13 @@ import org.atriasoft.etk.math.Vector2f; public abstract class Element { protected PathType cmd; - protected Vector2f pos; + protected Vector2f pos = Vector2f.ZERO; - protected Vector2f pos1; + protected Vector2f pos1 = Vector2f.ZERO; - protected Vector2f pos2; + protected Vector2f pos2 = Vector2f.ZERO; - protected boolean relative; + protected boolean relative = false; public Element(final PathType type) { this.cmd = type; diff --git a/src/org/atriasoft/esvg/render/ElementLineToV.java b/src/org/atriasoft/esvg/render/ElementLineToV.java index be86aa1..fc7bbd0 100644 --- a/src/org/atriasoft/esvg/render/ElementLineToV.java +++ b/src/org/atriasoft/esvg/render/ElementLineToV.java @@ -3,7 +3,7 @@ package org.atriasoft.esvg.render; public class ElementLineToV extends Element { public ElementLineToV(final boolean relative, final float posY) { super(PathType.lineToV, relative); - this.pos = this.pos.withX(posY); + this.pos = this.pos.withY(posY); } @Override diff --git a/src/org/atriasoft/esvg/render/PathModel.java b/src/org/atriasoft/esvg/render/PathModel.java index 9bfcbe2..0f14ad1 100644 --- a/src/org/atriasoft/esvg/render/PathModel.java +++ b/src/org/atriasoft/esvg/render/PathModel.java @@ -92,12 +92,12 @@ public class PathModel { } public void display(final int spacing) { - Log.debug(PathModel.spacingDist(spacing) + "Path"); + Log.warning(PathModel.spacingDist(spacing) + "Path"); for (Element it : this.listElement) { if (it == null) { continue; } - Log.debug(PathModel.spacingDist(spacing + 1) + it); + Log.warning(PathModel.spacingDist(spacing + 1) + it); } } @@ -133,7 +133,7 @@ public class PathModel { } else { tmpListPoint.get(tmpListPoint.size() - 1).setEndPath(); out.addList(tmpListPoint); - tmpListPoint.clear(); + tmpListPoint = new ArrayList<>(); } } lastAngle = Vector2f.ZERO; @@ -153,7 +153,7 @@ public class PathModel { Log.verbose(" Remove point Z property : " + tmpListPoint.get(tmpListPoint.size() - 1).pos + " with delta=" + delta); } out.addList(tmpListPoint); - tmpListPoint.clear(); + tmpListPoint = new ArrayList<>(); } } lastAngle = Vector2f.ZERO; @@ -164,7 +164,7 @@ public class PathModel { if (tmpListPoint.size() != 0) { tmpListPoint.get(tmpListPoint.size() - 1).setEndPath(); out.addList(tmpListPoint); - tmpListPoint.clear(); + tmpListPoint = new ArrayList<>(); } // create a new one if (!it.getRelative()) { @@ -413,7 +413,7 @@ public class PathModel { Log.verbose("Auto-end PATH"); tmpListPoint.get(tmpListPoint.size() - 1).setEndPath(); out.addList(tmpListPoint); - tmpListPoint.clear(); + tmpListPoint = new ArrayList<>(); } out.display(); return out; diff --git a/src/org/atriasoft/esvg/render/PointList.java b/src/org/atriasoft/esvg/render/PointList.java index b321998..92b4baf 100644 --- a/src/org/atriasoft/esvg/render/PointList.java +++ b/src/org/atriasoft/esvg/render/PointList.java @@ -29,12 +29,12 @@ public class PointList { } public void display() { - Log.verbose(" Display list of points : size=" + this.data.size()); + Log.warning(" Display list of points : size=" + this.data.size()); for (List it : this.data) { - Log.verbose(" Find List " + it.size() + " members"); + Log.warning(" Find List " + it.size() + " members"); for (int iii = 0; iii < it.size(); ++iii) { Point elem = it.get(iii); - Log.verbose(" [" + iii + "] Find " + elem.type + " " + elem.pos); + Log.warning(" [" + iii + "] Find " + elem.type + " " + elem.pos); } } } diff --git a/src/org/atriasoft/esvg/render/Weight.java b/src/org/atriasoft/esvg/render/Weight.java index d56ec35..082027e 100644 --- a/src/org/atriasoft/esvg/render/Weight.java +++ b/src/org/atriasoft/esvg/render/Weight.java @@ -1,7 +1,6 @@ package org.atriasoft.esvg.render; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -9,6 +8,7 @@ import org.atriasoft.esvg.internal.Log; import org.atriasoft.etk.math.FMath; import org.atriasoft.etk.math.Vector2f; import org.atriasoft.etk.math.Vector2i; +import org.atriasoft.etk.util.ArraysTools; import org.atriasoft.etk.util.Pair; public class Weight { @@ -34,7 +34,7 @@ public class Weight { } public void clear(final float fill) { - Arrays.fill(this.data, fill); + ArraysTools.fill2(this.data, fill); } public void generate(final Vector2i size, final int subSamplingCount, final SegmentList listSegment) { @@ -92,7 +92,7 @@ public class Weight { } Log.verbose(" List position " + listPosition.size()); // now we order position of the xPosition: - Collections.sort(listPosition, (e1, e2) -> ((int) (e2.first - e1.first))); + Collections.sort(listPosition, (e1, e2) -> ((int) (e1.first - e2.first))); // move through all element in the point: int lastState = 0; @@ -144,6 +144,9 @@ public class Weight { } public float get(final Vector2i pos) { + if (this.data == null) { + return 0; + } return this.data[pos.y()][pos.x()]; } diff --git a/test/src/test/atriasoft/esvg/ConfigTest.java b/test/src/test/atriasoft/esvg/ConfigTest.java index 6d5cc27..b8b8e61 100644 --- a/test/src/test/atriasoft/esvg/ConfigTest.java +++ b/test/src/test/atriasoft/esvg/ConfigTest.java @@ -1,7 +1,33 @@ package test.atriasoft.esvg; +import java.awt.image.BufferedImage; + +import org.atriasoft.esvg.EsvgDocument; +import org.atriasoft.esvg.internal.Log; +import org.atriasoft.etk.Color; +import org.atriasoft.etk.Uri; + +import com.pngencoder.PngEncoder; + public class ConfigTest { - public static final boolean VISUAL_DEBUG = false; + public static final String BASE_PATH = "./";//"~/dev/workspace-game/atriasoft/esvg/"; + public static final boolean VISUAL_DEBUG = true; + + public static void generateAnImage(final EsvgDocument doc, final Uri uri) { + Color[][] data = doc.renderImageFloatRGBA(null, ConfigTest.VISUAL_DEBUG); + BufferedImage bufferedImage = new BufferedImage(data[0].length, data.length, BufferedImage.TYPE_INT_ARGB); + for (int yyy = 0; yyy < data.length; yyy++) { + for (int xxx = 0; xxx < data[yyy].length; xxx++) { + Color elem = data[yyy][xxx]; + int tmpColor = ((int) (elem.a() * 255.0f) << 24) + ((int) (elem.r() * 255.0f) << 16) + ((int) (elem.g() * 255.0f) << 8) + ((int) (elem.b() * 255.0f)); + bufferedImage.setRGB(xxx, yyy, tmpColor); + } + } + Log.warning("Save file in " + uri.getPath()); + byte[] outElem = new PngEncoder().withBufferedImage(bufferedImage).withCompressionLevel(9).toBytes(); + Log.warning("outsize = " + outElem.length); + new PngEncoder().withBufferedImage(bufferedImage).withCompressionLevel(9).toFile(uri.getPath()); + } private ConfigTest() {} } diff --git a/test/src/test/atriasoft/esvg/TestCap.java b/test/src/test/atriasoft/esvg/TestCap.java index ad05491..7d8f294 100644 --- a/test/src/test/atriasoft/esvg/TestCap.java +++ b/test/src/test/atriasoft/esvg/TestCap.java @@ -12,8 +12,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapbutt.svg"), data); - doc.generateAnImage(new Uri("TestCapbutt.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbutt.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbutt.png")); } @Test @@ -23,8 +23,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapbuttDiag1.svg"), data); - doc.generateAnImage(new Uri("TestCapbuttDiag1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag1.png")); } @Test @@ -34,8 +34,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapbuttDiag2.svg"), data); - doc.generateAnImage(new Uri("TestCapbuttDiag2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag2.png")); } @Test @@ -45,8 +45,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapbuttVert.svg"), data); - doc.generateAnImage(new Uri("TestCapbuttVert.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttVert.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttVert.png")); } @Test @@ -56,8 +56,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapround.svg"), data); - doc.generateAnImage(new Uri("TestCapround.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapround.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapround.png")); } @Test @@ -67,8 +67,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCaproundDiag1.svg"), data); - doc.generateAnImage(new Uri("TestCaproundDiag1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag1.png")); } @Test @@ -78,8 +78,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCaproundDiag2.svg"), data); - doc.generateAnImage(new Uri("TestCaproundDiag2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag2.png")); } @Test @@ -89,8 +89,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCaproundVert.svg"), data); - doc.generateAnImage(new Uri("TestCaproundVert.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundVert.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundVert.png")); } @Test @@ -100,8 +100,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapsquare.svg"), data); - doc.generateAnImage(new Uri("TestCapsquare.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquare.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquare.png")); } @Test @@ -111,8 +111,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapsquareDiag1.svg"), data); - doc.generateAnImage(new Uri("TestCapsquareDiag1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag1.png")); } @Test @@ -122,8 +122,8 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapsquareDiag2.svg"), data); - doc.generateAnImage(new Uri("TestCapsquareDiag2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag2.png")); } @Test @@ -133,7 +133,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCapsquareVert.svg"), data); - doc.generateAnImage(new Uri("TestCapsquareVert.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareVert.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquareVert.png")); } } diff --git a/test/src/test/atriasoft/esvg/TestCircle.java b/test/src/test/atriasoft/esvg/TestCircle.java index 47e2285..4178985 100644 --- a/test/src/test/atriasoft/esvg/TestCircle.java +++ b/test/src/test/atriasoft/esvg/TestCircle.java @@ -11,8 +11,8 @@ class TestCircle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCirclefill.svg"), data); - doc.generateAnImage(new Uri("TestCirclefill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCirclefill.png")); } @Test @@ -21,8 +21,8 @@ class TestCircle { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCirclefillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestCirclefillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCirclefillandstroke.png")); } @Test @@ -30,7 +30,7 @@ class TestCircle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestCirclestroke.svg"), data); - doc.generateAnImage(new Uri("TestCirclestroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclestroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCirclestroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestColor.java b/test/src/test/atriasoft/esvg/TestColor.java index 4b7e567..81b6add 100644 --- a/test/src/test/atriasoft/esvg/TestColor.java +++ b/test/src/test/atriasoft/esvg/TestColor.java @@ -11,8 +11,8 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestColorblending.svg"), data); - doc.generateAnImage(new Uri("TestColorblending.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblending.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColorblending.png")); } @Test @@ -21,8 +21,8 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestColorblendingandopacity.svg"), data); - doc.generateAnImage(new Uri("TestColorblendingandopacity.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblendingandopacity.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColorblendingandopacity.png")); } @Test @@ -33,8 +33,8 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestColormultiplelayer.svg"), data); - doc.generateAnImage(new Uri("TestColormultiplelayer.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColormultiplelayer.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColormultiplelayer.png")); } @Test @@ -43,7 +43,7 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestColoropacity.svg"), data); - doc.generateAnImage(new Uri("TestColoropacity.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColoropacity.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColoropacity.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestEllipse.java b/test/src/test/atriasoft/esvg/TestEllipse.java index 15b0432..f9c9646 100644 --- a/test/src/test/atriasoft/esvg/TestEllipse.java +++ b/test/src/test/atriasoft/esvg/TestEllipse.java @@ -11,8 +11,8 @@ class TestEllipse { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestEllipsefill.svg"), data); - doc.generateAnImage(new Uri("TestEllipsefill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestEllipsefill.png")); } @Test @@ -21,8 +21,8 @@ class TestEllipse { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestEllipsefillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestEllipsefillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestEllipsefillandstroke.png")); } @Test @@ -31,7 +31,7 @@ class TestEllipse { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestEllipsestroke.svg"), data); - doc.generateAnImage(new Uri("TestEllipsestroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsestroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestEllipsestroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestGradientLinear.java b/test/src/test/atriasoft/esvg/TestGradientLinear.java index 20e72fd..8547f9c 100644 --- a/test/src/test/atriasoft/esvg/TestGradientLinear.java +++ b/test/src/test/atriasoft/esvg/TestGradientLinear.java @@ -14,8 +14,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag1.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1.png")); } @Test @@ -26,8 +26,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag1Partiel.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag1Partiel.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1Partiel.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1Partiel.png")); } @Test @@ -39,8 +39,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag2.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2.png")); } @Test @@ -52,8 +52,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag2Rotate0.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag2Rotate0.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate0.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate0.png")); } @Test @@ -65,8 +65,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag2Rotate1.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag2Rotate1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate1.png")); } @Test @@ -78,8 +78,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag2Rotate2.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag2Rotate2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate2.png")); } @Test @@ -91,8 +91,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLineardiag2scale.svg"), data); - doc.generateAnImage(new Uri("TestGradientLineardiag2scale.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2scale.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2scale.png")); } @Test @@ -104,8 +104,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearhorizontal.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearhorizontal.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearhorizontal.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearhorizontal.png")); } @Test @@ -117,8 +117,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearinternalHref.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearinternalHref.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearinternalHref.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearinternalHref.png")); } @Test @@ -129,8 +129,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitBoxspreadNone.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitBoxspreadNone.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadNone.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadNone.png")); } @Test @@ -141,8 +141,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitBoxspreadPad.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitBoxspreadPad.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadPad.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadPad.png")); } @Test @@ -153,8 +153,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitBoxspreadReflect.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitBoxspreadReflect.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadReflect.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadReflect.png")); } @Test @@ -165,8 +165,8 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitBoxspreadRepeat.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitBoxspreadRepeat.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadRepeat.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadRepeat.png")); } @Test @@ -177,8 +177,8 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitUserspreadNone.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitUserspreadNone.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadNone.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadNone.png")); } @Test @@ -189,8 +189,8 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitUserspreadPad.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitUserspreadPad.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadPad.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadPad.png")); } @Test @@ -201,8 +201,8 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitUserspreadReflect.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitUserspreadReflect.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadReflect.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadReflect.png")); } @Test @@ -213,8 +213,8 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearunitUserspreadRepeate.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearunitUserspreadRepeate.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadRepeate.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadRepeate.png")); } @Test @@ -226,7 +226,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientLinearvertical.svg"), data); - doc.generateAnImage(new Uri("TestGradientLinearvertical.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearvertical.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearvertical.png")); } } diff --git a/test/src/test/atriasoft/esvg/TestGradientRadial.java b/test/src/test/atriasoft/esvg/TestGradientRadial.java index 61c1a5c..97e5314 100644 --- a/test/src/test/atriasoft/esvg/TestGradientRadial.java +++ b/test/src/test/atriasoft/esvg/TestGradientRadial.java @@ -14,8 +14,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialcircle.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialcircle.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialcircle.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialcircle.png")); } @Test @@ -27,8 +27,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialfull.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialfull.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialfull.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialfull.png")); } @Test @@ -40,8 +40,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialpartial.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialpartial.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialpartial.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialpartial.png")); } @Test @@ -53,8 +53,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitBoxspreadNone.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitBoxspreadNone.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadNone.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadNone.png")); } @Test @@ -66,8 +66,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitBoxspreadPad.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitBoxspreadPad.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadPad.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadPad.png")); } @Test @@ -79,8 +79,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitBoxspreadReflect.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitBoxspreadReflect.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadReflect.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadReflect.png")); } @Test @@ -92,8 +92,8 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitBoxspreadRepeat.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitBoxspreadRepeat.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadRepeat.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadRepeat.png")); } @Test @@ -105,8 +105,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadNone.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadNone.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadNone.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadNone.png")); } @Test @@ -118,8 +118,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadPad.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadPad.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPad.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPad.png")); } @Test @@ -131,8 +131,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadPadunCenter.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadPadunCenter.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPadunCenter.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPadunCenter.png")); } @Test @@ -144,8 +144,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadReflect.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadReflect.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflect.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflect.png")); } @Test @@ -157,8 +157,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadReflectunCenter.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadReflectunCenter.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflectunCenter.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflectunCenter.png")); } @Test @@ -170,8 +170,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadRepeat.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadRepeat.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeat.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeat.png")); } @Test @@ -183,8 +183,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadRepeatout.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadRepeatout.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatout.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatout.png")); } @Test @@ -196,8 +196,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadRepeatunCenter.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadRepeatunCenter.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter.png")); } @Test @@ -209,8 +209,8 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestGradientRadialunitUserspreadRepeatunCenter2.svg"), data); - doc.generateAnImage(new Uri("TestGradientRadialunitUserspreadRepeatunCenter2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter2.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestJoin.java b/test/src/test/atriasoft/esvg/TestJoin.java index 4c451fb..97521ff 100644 --- a/test/src/test/atriasoft/esvg/TestJoin.java +++ b/test/src/test/atriasoft/esvg/TestJoin.java @@ -12,8 +12,8 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='bevel'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelCornerCasePath.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelCornerCasePath.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelCornerCasePath.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelCornerCasePath.png")); } @Test @@ -22,8 +22,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelLeft1.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelLeft1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft1.png")); } @Test @@ -32,8 +32,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelLeft2.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelLeft2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft2.png")); } @Test @@ -42,8 +42,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelLeft3.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelLeft3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft3.png")); } @Test @@ -52,8 +52,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelLeft4.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelLeft4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft4.png")); } @Test @@ -62,8 +62,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelRight1.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelRight1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight1.png")); } @Test @@ -72,8 +72,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelRight2.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelRight2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight2.png")); } @Test @@ -82,8 +82,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelRight3.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelRight3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight3.png")); } @Test @@ -92,8 +92,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinbevelRight4.svg"), data); - doc.generateAnImage(new Uri("TestJoinbevelRight4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight4.png")); } @Test @@ -103,8 +103,8 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='miter'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterCornerCasePath.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterCornerCasePath.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePath.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePath.png")); } @Test @@ -114,8 +114,8 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='miter' stroke-miterlimit='0.3'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterCornerCasePathLimit.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterCornerCasePathLimit.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePathLimit.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePathLimit.png")); } @Test @@ -124,8 +124,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLeft1.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLeft1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft1.png")); } @Test @@ -134,8 +134,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLeft2.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLeft2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft2.png")); } @Test @@ -144,8 +144,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLeft3.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLeft3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft3.png")); } // ------------------------------------------------------ Round test ----------------------------------------------------- @@ -156,8 +156,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLeft4.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLeft4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft4.png")); } @Test @@ -166,8 +166,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLimit1.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLimit1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit1.png")); } @Test @@ -176,8 +176,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLimit2.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLimit2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit2.png")); } @Test @@ -186,8 +186,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLimit3.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLimit3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit3.png")); } @Test @@ -196,8 +196,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterLimit4.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterLimit4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit4.png")); } @Test @@ -206,8 +206,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterRight1.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterRight1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight1.png")); } @Test @@ -216,8 +216,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterRight2.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterRight2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight2.png")); } @Test @@ -226,8 +226,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterRight3.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterRight3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight3.png")); } @Test @@ -236,8 +236,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinmiterRight4.svg"), data); - doc.generateAnImage(new Uri("TestJoinmiterRight4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight4.png")); } // ------------------------------------------------------ Bevel test ----------------------------------------------------- @@ -249,8 +249,8 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='round'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundCornerCasePath.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundCornerCasePath.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundCornerCasePath.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundCornerCasePath.png")); } @Test @@ -259,8 +259,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundLeft1.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundLeft1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft1.png")); } @Test @@ -269,8 +269,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundLeft2.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundLeft2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft2.png")); } @Test @@ -279,8 +279,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundLeft3.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundLeft3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft3.png")); } @Test @@ -289,8 +289,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundLeft4.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundLeft4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft4.png")); } @Test @@ -299,8 +299,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundRight1.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundRight1.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight1.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight1.png")); } @Test @@ -309,8 +309,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundRight2.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundRight2.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight2.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight2.png")); } @Test @@ -319,8 +319,8 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundRight3.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundRight3.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight3.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight3.png")); } @Test @@ -329,7 +329,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestJoinroundRight4.svg"), data); - doc.generateAnImage(new Uri("TestJoinroundRight4.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight4.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight4.png")); } } diff --git a/test/src/test/atriasoft/esvg/TestLine.java b/test/src/test/atriasoft/esvg/TestLine.java index c2eb618..55e1dc2 100644 --- a/test/src/test/atriasoft/esvg/TestLine.java +++ b/test/src/test/atriasoft/esvg/TestLine.java @@ -11,7 +11,7 @@ class TestLine { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestLinestroke.svg"), data); - doc.generateAnImage(new Uri("TestLinestroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestLinestroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestLinestroke.png")); } } diff --git a/test/src/test/atriasoft/esvg/TestPath.java b/test/src/test/atriasoft/esvg/TestPath.java index cd5502b..9bc130a 100644 --- a/test/src/test/atriasoft/esvg/TestPath.java +++ b/test/src/test/atriasoft/esvg/TestPath.java @@ -13,8 +13,8 @@ class TestPath { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPatharc.svg"), data); - doc.generateAnImage(new Uri("TestPatharc.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPatharc.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPatharc.png")); } @Test @@ -22,8 +22,8 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathbezierCurveTo.svg"), data); - doc.generateAnImage(new Uri("TestPathbezierCurveTo.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierCurveTo.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathbezierCurveTo.png")); } @Test @@ -31,8 +31,8 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathbezierSmoothCurveTo.svg"), data); - doc.generateAnImage(new Uri("TestPathbezierSmoothCurveTo.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierSmoothCurveTo.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathbezierSmoothCurveTo.png")); } @Test @@ -40,8 +40,8 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathcurveTo.svg"), data); - doc.generateAnImage(new Uri("TestPathcurveTo.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathcurveTo.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathcurveTo.png")); } @Test @@ -52,8 +52,8 @@ class TestPath { + " id='path3421'\n" + " inkscape:connector-curvature='0' />\n" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathendpathbordercase.svg"), data); - doc.generateAnImage(new Uri("TestPathendpathbordercase.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathendpathbordercase.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathendpathbordercase.png")); } @Test @@ -63,8 +63,8 @@ class TestPath { + " fill='red' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathfill.svg"), data); - doc.generateAnImage(new Uri("TestPathfill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathfill.png")); } @Test @@ -74,8 +74,8 @@ class TestPath { + " stroke='green' stroke-width='3' fill='red' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathfillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestPathfillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathfillandstroke.png")); } @Test @@ -83,8 +83,8 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathsmoothCurveTo.svg"), data); - doc.generateAnImage(new Uri("TestPathsmoothCurveTo.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathsmoothCurveTo.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathsmoothCurveTo.png")); } @Test @@ -94,7 +94,7 @@ class TestPath { + " stroke='green' stroke-width='3' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPathstroke.svg"), data); - doc.generateAnImage(new Uri("TestPathstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathstroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestPolygon.java b/test/src/test/atriasoft/esvg/TestPolygon.java index 6da177e..a1d5b92 100644 --- a/test/src/test/atriasoft/esvg/TestPolygon.java +++ b/test/src/test/atriasoft/esvg/TestPolygon.java @@ -10,8 +10,8 @@ class TestPolygon { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolygonfill.svg"), data); - doc.generateAnImage(new Uri("TestPolygonfill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolygonfill.png")); } @Test @@ -20,8 +20,8 @@ class TestPolygon { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolygonfillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestPolygonfillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolygonfillandstroke.png")); } @Test @@ -30,7 +30,7 @@ class TestPolygon { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolygonstroke.svg"), data); - doc.generateAnImage(new Uri("TestPolygonstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolygonstroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestPolyline.java b/test/src/test/atriasoft/esvg/TestPolyline.java index 9683538..77109fc 100644 --- a/test/src/test/atriasoft/esvg/TestPolyline.java +++ b/test/src/test/atriasoft/esvg/TestPolyline.java @@ -11,8 +11,8 @@ class TestPolyline { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolyLinefill.svg"), data); - doc.generateAnImage(new Uri("TestPolyLinefill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolyLinefill.png")); } @Test @@ -21,8 +21,8 @@ class TestPolyline { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolyLinefillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestPolyLinefillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolyLinefillandstroke.png")); } @Test @@ -31,7 +31,7 @@ class TestPolyline { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestPolyLinestroke.svg"), data); - doc.generateAnImage(new Uri("TestPolyLinestroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinestroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolyLinestroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestRectangle.java b/test/src/test/atriasoft/esvg/TestRectangle.java index 15feb10..805d48a 100644 --- a/test/src/test/atriasoft/esvg/TestRectangle.java +++ b/test/src/test/atriasoft/esvg/TestRectangle.java @@ -11,8 +11,8 @@ class TestRectangle { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglecornedfill.svg"), data); - doc.generateAnImage(new Uri("TestRectanglecornedfill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfill.png")); } @Test @@ -21,8 +21,8 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglecornedfillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestRectanglecornedfillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfillandstroke.png")); } @Test @@ -31,8 +31,8 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglecornedstroke.svg"), data); - doc.generateAnImage(new Uri("TestRectanglecornedstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedstroke.png")); } @Test @@ -40,8 +40,8 @@ class TestRectangle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglefill.svg"), data); - doc.generateAnImage(new Uri("TestRectanglefill.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefill.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglefill.png")); } @Test @@ -50,8 +50,8 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglefillandstroke.svg"), data); - doc.generateAnImage(new Uri("TestRectanglefillandstroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefillandstroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglefillandstroke.png")); } @Test @@ -60,7 +60,7 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestRectanglestroke.svg"), data); - doc.generateAnImage(new Uri("TestRectanglestroke.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglestroke.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglestroke.png")); } } \ No newline at end of file diff --git a/test/src/test/atriasoft/esvg/TestStyle.java b/test/src/test/atriasoft/esvg/TestStyle.java index 9418334..9f18ad3 100644 --- a/test/src/test/atriasoft/esvg/TestStyle.java +++ b/test/src/test/atriasoft/esvg/TestStyle.java @@ -117,7 +117,7 @@ class TestStyle { + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri("TestExternworddown.svg"), data); - doc.generateAnImage(new Uri("TestExternworddown.bmp"), ConfigTest.VISUAL_DEBUG); + Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestExternworddown.svg"), data.replace("'", "\"")); + ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestExternworddown.png")); } }