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 0000000..fc39e9b Binary files /dev/null and b/lib/pngdecoder.jar differ diff --git a/src/module-info.java b/src/module-info.java index 75071a9..0a072de 100644 --- a/src/module-info.java +++ b/src/module-info.java @@ -9,4 +9,6 @@ open module org.atriasoft.esvg { requires transitive io.scenarium.logger; requires transitive org.atriasoft.etk; requires transitive org.atriasoft.exml; + requires com.pngencoder; + requires java.desktop; } diff --git a/src/org/atriasoft/esvg/Base.java b/src/org/atriasoft/esvg/Base.java index bd898d2..0cc0e29 100644 --- a/src/org/atriasoft/esvg/Base.java +++ b/src/org/atriasoft/esvg/Base.java @@ -57,9 +57,9 @@ public class Base { protected String id; //!< unique ID of the element. - protected PaintState paint; + protected PaintState paint = new PaintState(); - protected Matrix2x3f transformMatrix; //!< specific render of the curent element + protected Matrix2x3f transformMatrix = Matrix2x3f.IDENTITY; //!< specific render of the curent element public Base() { this.paint = new PaintState(); @@ -232,7 +232,7 @@ public class Base { this.id = element.getAttribute("id", ""); // ---------------- stroke ---------------- content = element.getAttribute("stroke", ""); - if (content == "none") { + if (content.equals("none")) { this.paint.stroke = new Pair<>(Color.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")); } }