diff --git a/src/org/atriasoft/esvg/EsvgDocument.java b/src/org/atriasoft/esvg/EsvgDocument.java index 27c4dc3..089e112 100644 --- a/src/org/atriasoft/esvg/EsvgDocument.java +++ b/src/org/atriasoft/esvg/EsvgDocument.java @@ -11,7 +11,7 @@ import org.atriasoft.etk.math.Vector2f; import org.atriasoft.etk.math.Vector2i; import org.atriasoft.etk.util.Dynamic; import org.atriasoft.exml.Exml; -import org.atriasoft.exml.exception.ExmlBuilderException; +import org.atriasoft.exml.exception.ExmlException; import org.atriasoft.exml.exception.ExmlNodeDoesNotExist; import org.atriasoft.exml.model.XmlElement; import org.atriasoft.exml.model.XmlNode; @@ -210,7 +210,7 @@ public class EsvgDocument extends Base { XmlNode doc = null; try { doc = Exml.parse(uri); - } catch (ExmlBuilderException e) { + } catch (ExmlException e) { // TODO Auto-generated catch block e.printStackTrace(); return false; @@ -242,7 +242,7 @@ public class EsvgDocument extends Base { XmlNode doc = null; try { doc = Exml.parse(data); - } catch (ExmlBuilderException e) { + } catch (ExmlException e) { // TODO Auto-generated catch block e.printStackTrace(); return false; diff --git a/src/org/atriasoft/esvg/EsvgFont.java b/src/org/atriasoft/esvg/EsvgFont.java index 981570d..3fa8f47 100644 --- a/src/org/atriasoft/esvg/EsvgFont.java +++ b/src/org/atriasoft/esvg/EsvgFont.java @@ -17,7 +17,7 @@ import org.atriasoft.etk.math.Vector2f; import org.atriasoft.etk.math.Vector2i; import org.atriasoft.etk.util.Pair; import org.atriasoft.exml.Exml; -import org.atriasoft.exml.exception.ExmlBuilderException; +import org.atriasoft.exml.exception.ExmlException; import org.atriasoft.exml.model.XmlElement; import org.atriasoft.exml.model.XmlNode; @@ -88,7 +88,7 @@ public class EsvgFont { XmlNode doc = null; try { doc = Exml.parse(uri); - } catch (ExmlBuilderException e) { + } catch (ExmlException e) { // TODO Auto-generated catch block e.printStackTrace(); return null; diff --git a/test/src/test/atriasoft/esvg/TestCap.java b/test/src/test/atriasoft/esvg/TestCap.java index 7d8f294..463c188 100644 --- a/test/src/test/atriasoft/esvg/TestCap.java +++ b/test/src/test/atriasoft/esvg/TestCap.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestCap { @@ -12,7 +14,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbutt.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbutt.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbutt.png")); } @@ -23,7 +25,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag1.png")); } @@ -34,7 +36,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttDiag2.png")); } @@ -45,7 +47,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttVert.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapbuttVert.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapbuttVert.png")); } @@ -56,7 +58,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapround.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapround.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapround.png")); } @@ -67,7 +69,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag1.png")); } @@ -78,7 +80,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundDiag2.png")); } @@ -89,7 +91,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundVert.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCaproundVert.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCaproundVert.png")); } @@ -100,7 +102,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquare.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquare.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquare.png")); } @@ -111,7 +113,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag1.png")); } @@ -122,7 +124,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCapsquareDiag2.png")); } @@ -133,7 +135,7 @@ class TestCap { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCapsquareVert.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 4178985..78c94cf 100644 --- a/test/src/test/atriasoft/esvg/TestCircle.java +++ b/test/src/test/atriasoft/esvg/TestCircle.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestCircle { @@ -11,7 +13,7 @@ class TestCircle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCirclefill.png")); } @@ -21,7 +23,7 @@ class TestCircle { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclefillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestCirclefillandstroke.png")); } @@ -30,7 +32,7 @@ class TestCircle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestCirclestroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 81b6add..c28f4a7 100644 --- a/test/src/test/atriasoft/esvg/TestColor.java +++ b/test/src/test/atriasoft/esvg/TestColor.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestColor { @@ -11,7 +13,7 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblending.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblending.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColorblending.png")); } @@ -21,7 +23,7 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblendingandopacity.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColorblendingandopacity.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColorblendingandopacity.png")); } @@ -33,7 +35,7 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColormultiplelayer.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColormultiplelayer.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestColormultiplelayer.png")); } @@ -43,7 +45,7 @@ class TestColor { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestColoropacity.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 f9c9646..b0e3ecf 100644 --- a/test/src/test/atriasoft/esvg/TestEllipse.java +++ b/test/src/test/atriasoft/esvg/TestEllipse.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestEllipse { @@ -11,7 +13,7 @@ class TestEllipse { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestEllipsefill.png")); } @@ -21,7 +23,7 @@ class TestEllipse { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsefillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestEllipsefillandstroke.png")); } @@ -31,7 +33,7 @@ class TestEllipse { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestEllipsestroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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/TestFont.java b/test/src/test/atriasoft/esvg/TestFont.java index 68b27f7..e2b878d 100644 --- a/test/src/test/atriasoft/esvg/TestFont.java +++ b/test/src/test/atriasoft/esvg/TestFont.java @@ -5,6 +5,8 @@ import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.esvg.EsvgFont; import org.atriasoft.esvg.render.Weight; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestFont { @@ -16,7 +18,7 @@ class TestFont { + " stroke='green' stroke-width='3' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestFontError1.png")); } @@ -27,7 +29,7 @@ class TestFont { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestFontError2.png")); } @@ -37,7 +39,7 @@ class TestFont { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestFontError3.png")); } @@ -51,7 +53,7 @@ class TestFont { + "q0 -41 29 -69.5t69 -28.5z'" + " stroke='green' stroke-width='3' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestFontError4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestFontError4.png")); } diff --git a/test/src/test/atriasoft/esvg/TestGradientLinear.java b/test/src/test/atriasoft/esvg/TestGradientLinear.java index 5c79c31..697b265 100644 --- a/test/src/test/atriasoft/esvg/TestGradientLinear.java +++ b/test/src/test/atriasoft/esvg/TestGradientLinear.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestGradientLinear { @@ -23,7 +25,7 @@ class TestGradientLinear { //@formatter:on EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1.png")); } @@ -43,7 +45,7 @@ class TestGradientLinear { //@formatter:on EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1Partiel.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1Partiel.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag1Partiel.png")); } @@ -56,7 +58,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2.png")); } @@ -69,7 +71,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate0.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate0.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate0.png")); } @@ -82,7 +84,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate1.png")); } @@ -95,7 +97,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2Rotate2.png")); } @@ -108,7 +110,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2scale.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2scale.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLineardiag2scale.png")); } @@ -130,7 +132,7 @@ class TestGradientLinear { //@formatter:on EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearhorizontal.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearhorizontal.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearhorizontal.png")); } @@ -143,7 +145,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearinternalHref.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearinternalHref.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearinternalHref.png")); } @@ -155,7 +157,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadNone.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadNone.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadNone.png")); } @@ -167,7 +169,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadPad.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadPad.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadPad.png")); } @@ -179,7 +181,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadReflect.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadReflect.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadReflect.png")); } @@ -191,7 +193,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadRepeat.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadRepeat.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitBoxspreadRepeat.png")); } @@ -203,7 +205,7 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadNone.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadNone.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadNone.png")); } @@ -215,7 +217,7 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadPad.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadPad.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadPad.png")); } @@ -227,7 +229,7 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadReflect.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadReflect.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadReflect.png")); } @@ -239,7 +241,7 @@ class TestGradientLinear { + " \n" + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadRepeate.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadRepeate.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientLinearunitUserspreadRepeate.png")); } @@ -252,7 +254,7 @@ class TestGradientLinear { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientLinearvertical.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 97e5314..2671efd 100644 --- a/test/src/test/atriasoft/esvg/TestGradientRadial.java +++ b/test/src/test/atriasoft/esvg/TestGradientRadial.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestGradientRadial { @@ -14,7 +16,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialcircle.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialcircle.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialcircle.png")); } @@ -27,7 +29,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialfull.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialfull.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialfull.png")); } @@ -40,7 +42,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialpartial.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialpartial.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialpartial.png")); } @@ -53,7 +55,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadNone.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadNone.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadNone.png")); } @@ -66,7 +68,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadPad.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadPad.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadPad.png")); } @@ -79,7 +81,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadReflect.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadReflect.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadReflect.png")); } @@ -92,7 +94,7 @@ class TestGradientRadial { + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadRepeat.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadRepeat.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitBoxspreadRepeat.png")); } @@ -105,7 +107,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadNone.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadNone.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadNone.png")); } @@ -118,7 +120,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPad.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPad.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPad.png")); } @@ -131,7 +133,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPadunCenter.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPadunCenter.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadPadunCenter.png")); } @@ -144,7 +146,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflect.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflect.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflect.png")); } @@ -157,7 +159,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflectunCenter.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflectunCenter.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadReflectunCenter.png")); } @@ -170,7 +172,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeat.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeat.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeat.png")); } @@ -183,7 +185,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatout.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatout.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatout.png")); } @@ -196,7 +198,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter.png")); } @@ -209,7 +211,7 @@ class TestGradientRadial { + " \n" + " \n" + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestGradientRadialunitUserspreadRepeatunCenter2.png")); } diff --git a/test/src/test/atriasoft/esvg/TestJoin.java b/test/src/test/atriasoft/esvg/TestJoin.java index 97521ff..495c0ce 100644 --- a/test/src/test/atriasoft/esvg/TestJoin.java +++ b/test/src/test/atriasoft/esvg/TestJoin.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestJoin { @@ -12,7 +14,7 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='bevel'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelCornerCasePath.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelCornerCasePath.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelCornerCasePath.png")); } @@ -22,7 +24,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft1.png")); } @@ -32,7 +34,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft2.png")); } @@ -42,7 +44,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft3.png")); } @@ -52,7 +54,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelLeft4.png")); } @@ -62,7 +64,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight1.png")); } @@ -72,7 +74,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight2.png")); } @@ -82,7 +84,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight3.png")); } @@ -92,7 +94,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinbevelRight4.png")); } @@ -103,7 +105,7 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='miter'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePath.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePath.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePath.png")); } @@ -114,7 +116,7 @@ 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(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePathLimit.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePathLimit.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterCornerCasePathLimit.png")); } @@ -124,7 +126,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft1.png")); } @@ -134,7 +136,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft2.png")); } @@ -144,7 +146,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft3.png")); } @@ -156,7 +158,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLeft4.png")); } @@ -166,7 +168,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit1.png")); } @@ -176,7 +178,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit2.png")); } @@ -186,7 +188,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit3.png")); } @@ -196,7 +198,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterLimit4.png")); } @@ -206,7 +208,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight1.png")); } @@ -216,7 +218,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight2.png")); } @@ -226,7 +228,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight3.png")); } @@ -236,7 +238,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinmiterRight4.png")); } @@ -249,7 +251,7 @@ class TestJoin { + " stroke='green' stroke-width='5' fill='orange' stroke-linejoin='round'/>" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundCornerCasePath.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundCornerCasePath.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundCornerCasePath.png")); } @@ -259,7 +261,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft1.png")); } @@ -269,7 +271,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft2.png")); } @@ -279,7 +281,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft3.png")); } @@ -289,7 +291,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft4.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundLeft4.png")); } @@ -299,7 +301,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight1.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight1.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight1.png")); } @@ -309,7 +311,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight2.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight2.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight2.png")); } @@ -319,7 +321,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight3.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight3.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight3.png")); } @@ -329,7 +331,7 @@ class TestJoin { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestJoinroundRight4.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 55e1dc2..9c08978 100644 --- a/test/src/test/atriasoft/esvg/TestLine.java +++ b/test/src/test/atriasoft/esvg/TestLine.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestLine { @@ -11,7 +13,7 @@ class TestLine { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestLinestroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 da2586b..a42ef2c 100644 --- a/test/src/test/atriasoft/esvg/TestPath.java +++ b/test/src/test/atriasoft/esvg/TestPath.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestPath { @@ -13,7 +15,7 @@ class TestPath { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPatharc.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPatharc.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPatharc.png")); } @@ -22,7 +24,7 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierCurveTo.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierCurveTo.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathbezierCurveTo.png")); } @@ -31,7 +33,7 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierSmoothCurveTo.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathbezierSmoothCurveTo.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathbezierSmoothCurveTo.png")); } @@ -40,7 +42,7 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathcurveTo.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathcurveTo.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathcurveTo.png")); } @@ -52,7 +54,7 @@ class TestPath { + " id='path3421'\n" + " inkscape:connector-curvature='0' />\n" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathendpathbordercase.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathendpathbordercase.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathendpathbordercase.png")); } @@ -63,7 +65,7 @@ class TestPath { + " fill='red' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathfill.png")); } @@ -74,7 +76,7 @@ class TestPath { + " stroke='green' stroke-width='3' fill='red' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathfillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathfillandstroke.png")); } @@ -83,7 +85,7 @@ class TestPath { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathsmoothCurveTo.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathsmoothCurveTo.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathsmoothCurveTo.png")); } @@ -94,7 +96,7 @@ class TestPath { + " stroke='green' stroke-width='3' />" + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPathstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPathstroke.png")); } diff --git a/test/src/test/atriasoft/esvg/TestPolygon.java b/test/src/test/atriasoft/esvg/TestPolygon.java index a1d5b92..7c129f7 100644 --- a/test/src/test/atriasoft/esvg/TestPolygon.java +++ b/test/src/test/atriasoft/esvg/TestPolygon.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestPolygon { @@ -10,7 +12,7 @@ class TestPolygon { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolygonfill.png")); } @@ -20,7 +22,7 @@ class TestPolygon { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonfillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolygonfillandstroke.png")); } @@ -30,7 +32,7 @@ class TestPolygon { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolygonstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 77109fc..215cae8 100644 --- a/test/src/test/atriasoft/esvg/TestPolyline.java +++ b/test/src/test/atriasoft/esvg/TestPolyline.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestPolyline { @@ -11,7 +13,7 @@ class TestPolyline { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolyLinefill.png")); } @@ -21,7 +23,7 @@ class TestPolyline { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinefillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestPolyLinefillandstroke.png")); } @@ -31,7 +33,7 @@ class TestPolyline { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestPolyLinestroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 805d48a..42be381 100644 --- a/test/src/test/atriasoft/esvg/TestRectangle.java +++ b/test/src/test/atriasoft/esvg/TestRectangle.java @@ -2,6 +2,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; + +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestRectangle { @@ -11,7 +13,7 @@ class TestRectangle { + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfill.png")); } @@ -21,7 +23,7 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedfillandstroke.png")); } @@ -31,7 +33,7 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglecornedstroke.png")); } @@ -40,7 +42,7 @@ class TestRectangle { String data = "" + "" + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefill.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefill.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglefill.png")); } @@ -50,7 +52,7 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefillandstroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglefillandstroke.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestRectanglefillandstroke.png")); } @@ -60,7 +62,7 @@ class TestRectangle { + " " + ""; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestRectanglestroke.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> 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 9e36cf7..000138b 100644 --- a/test/src/test/atriasoft/esvg/TestStyle.java +++ b/test/src/test/atriasoft/esvg/TestStyle.java @@ -3,6 +3,8 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.EsvgDocument; import org.atriasoft.etk.Uri; +import org.junit.jupiter.api.Assertions; + class TestStyle { public void testTestExternWorddown() { @@ -116,7 +118,7 @@ class TestStyle { + "\n"; EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestExternworddown.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestExternworddown.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestExternworddown.png")); } } diff --git a/test/src/test/atriasoft/esvg/TestText.java b/test/src/test/atriasoft/esvg/TestText.java index 6c6695a..4764c1a 100644 --- a/test/src/test/atriasoft/esvg/TestText.java +++ b/test/src/test/atriasoft/esvg/TestText.java @@ -2,9 +2,11 @@ package test.atriasoft.esvg; import org.atriasoft.esvg.Esvg; import org.atriasoft.esvg.EsvgDocument; -import org.junit.jupiter.api.Test; import org.atriasoft.etk.Uri; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + class TestText { @Test public void testTextBase() { @@ -43,7 +45,7 @@ class TestText { //@formatter:on EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestTextFull.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestTextFull.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestTextFull.png")); } @@ -111,7 +113,7 @@ class TestText { //@formatter:on EsvgDocument doc = new EsvgDocument(); doc.parse(data); - Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestTextFull.svg"), data.replace("'", "\"")); + Assertions.assertDoesNotThrow(()-> Uri.writeAll(new Uri(ConfigTest.BASE_PATH + "TestTextFull.svg"), data.replace("'", "\""))); ConfigTest.generateAnImage(doc, new Uri(ConfigTest.BASE_PATH + "TestTextFull.png")); } }