octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-06-01 16:10:48 +00:00
Code Issues Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Arnaud Roques 2021-03-30 23:19:28 +02:00
parent 16c3c672df
commit 0e98cae2d0
25 changed files with 974 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/net/sourceforge/plantuml/AnnotatedWorker.java
View File

@ -170,7 +170,7 @@ public class AnnotatedWorker {
return TextBlockUtils.empty(0, 0);
}
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature.of(SName.root, SName.caption)
final Style style = StyleSignature.of(SName.root, SName.document, SName.caption)
.getMergedStyle(skinParam.getCurrentStyleBuilder());
return style.createTextBlockBordered(caption.getDisplay(), skinParam.getIHtmlColorSet(), skinParam);
}
@ -186,7 +186,7 @@ public class AnnotatedWorker {
final TextBlock block;
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature.of(SName.root, SName.title)
final Style style = StyleSignature.of(SName.root, SName.document, SName.title)
.getMergedStyle(skinParam.getCurrentStyleBuilder());
block = style.createTextBlockBordered(title.getDisplay(), skinParam.getIHtmlColorSet(), skinParam);
} else {
@ -206,13 +206,23 @@ public class AnnotatedWorker {
}
TextBlock textFooter = null;
if (footer.isNull() == false) {
Style style = null;
if (UseStyle.useBetaStyle()) {
style = StyleSignature.of(SName.root, SName.document, SName.footer)
.getMergedStyle(skinParam.getCurrentStyleBuilder());
}
textFooter = footer.createRibbon(new FontConfiguration(getSkinParam(), FontParam.FOOTER, null),
getSkinParam());
getSkinParam(), style);
}
TextBlock textHeader = null;
if (header.isNull() == false) {
Style style = null;
if (UseStyle.useBetaStyle()) {
style = StyleSignature.of(SName.root, SName.document, SName.header)
.getMergedStyle(skinParam.getCurrentStyleBuilder());
}
textHeader = header.createRibbon(new FontConfiguration(getSkinParam(), FontParam.HEADER, null),
getSkinParam());
getSkinParam(), style);
}
return DecorateEntityImage.addTopAndBottom(original, textHeader, header.getHorizontalAlignment(), textFooter,

6
src/net/sourceforge/plantuml/FontParam.java
View File

@ -187,13 +187,13 @@ public enum FontParam {
public StyleSignature getStyleDefinition(SName diagramType) {
if (this == FOOTER) {
return StyleSignature.of(SName.root, SName.footer);
return StyleSignature.of(SName.root, SName.document, SName.footer);
}
if (this == HEADER) {
return StyleSignature.of(SName.root, SName.header);
return StyleSignature.of(SName.root, SName.document, SName.header);
}
if (this == TITLE) {
return StyleSignature.of(SName.root, SName.title);
return StyleSignature.of(SName.root, SName.document, SName.title);
}
if (this == CLASS_ATTRIBUTE) {
return StyleSignature.of(SName.root, SName.element, SName.classDiagram, SName.class_);

4
src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java
View File

@ -57,8 +57,8 @@ public class EntityImageLegend {
public static TextBlock create(Display note, ISkinParam skinParam) {
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature
.of(SName.root, skinParam.getUmlDiagramType().getStyleName(), SName.legend)
final Style style = StyleSignature.of(SName.root, SName.root, SName.document,
skinParam.getUmlDiagramType().getStyleName(), SName.legend)
.getMergedStyle(skinParam.getCurrentStyleBuilder());
return style.createTextBlockBordered(note, skinParam.getIHtmlColorSet(), skinParam);
}

9
src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java
View File

@ -42,6 +42,7 @@ import net.sourceforge.plantuml.ISkinSimple;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.TextBlock;
import net.sourceforge.plantuml.style.Style;
public class DisplaySection {
@ -85,7 +86,7 @@ public class DisplaySection {
return Display.isNull(display);
}
public TextBlock createRibbon(FontConfiguration fontConfiguration, ISkinSimple spriteContainer) {
public TextBlock createRibbon(FontConfiguration fontConfiguration, ISkinSimple spriteContainer, Style style) {
if (map.size() == 0) {
return null;
}
@ -93,9 +94,9 @@ public class DisplaySection {
if (Display.isNull(display) || display.size() == 0) {
return null;
}
// if (UseStyle.USE_STYLES()) {
// throw new UnsupportedOperationException();
// }
if (style != null) {
return style.createTextBlockBordered(display, spriteContainer.getIHtmlColorSet(), spriteContainer);
}
return display.create(fontConfiguration, getHorizontalAlignment(), spriteContainer);
}

1
src/net/sourceforge/plantuml/dedication/Dedications.java
View File

@ -52,6 +52,7 @@ public class Dedications {
addNormal("ARKBAN", "arkban");
addNormal("Boundaries allow discipline to create true strength", "boundaries");
addNormal("Thank you, Dr. Chet. I wouldn't be where I am without you", "dr_chet");
addNormal("Ben and Jen 2020", "ben");
addCrypted("0", "pOhci6rKgPXw32AeYXhOpSY0suoauHq5VUSwFqHLHsLYgSO6WaJ7BW5vtHBAoU6ePbcW7d8Flx99MWjPSKQTDm00");
addCrypted("1", "LTxN3hdnhSJ515qcA7IQ841axt4GXfUd3n2wgNirYCdLnyX2360Gv1OEOnJ1-gwFzRW5B3HAqLBkR6Ge0WW_Z000");
addCrypted("2", "lZqLduj4j1yRqSfAvkhbqVpqK8diklatiFeenDUXSdna9bKYQTzdS264YfUBScUVDYCp2Vcq04updoN98RwxE000");

BIN
src/net/sourceforge/plantuml/dedication/ben.png Normal file
View File

Binary file not shown.

10
src/net/sourceforge/plantuml/png/PngTitler.java
View File

@ -64,9 +64,8 @@ public class PngTitler {
private final HColorSet set;
private final ISkinSimple spriteContainer;
public PngTitler(HColor textColor, DisplaySection text, int fontSize, String fontFamily,
HColor hyperlinkColor, boolean useUnderlineForHyperlink, Style style, HColorSet set,
ISkinSimple spriteContainer) {
public PngTitler(HColor textColor, DisplaySection text, int fontSize, String fontFamily, HColor hyperlinkColor,
boolean useUnderlineForHyperlink, Style style, HColorSet set, ISkinSimple spriteContainer) {
this.style = style;
this.set = set;
this.spriteContainer = spriteContainer;
@ -103,8 +102,7 @@ public class PngTitler {
return style.createTextBlockBordered(display, set, spriteContainer);
}
final UFont normalFont = new UFont(fontFamily, Font.PLAIN, fontSize);
return text.createRibbon(
new FontConfiguration(normalFont, textColor, hyperlinkColor, useUnderlineForHyperlink),
new SpriteContainerEmpty());
return text.createRibbon(new FontConfiguration(normalFont, textColor, hyperlinkColor, useUnderlineForHyperlink),
new SpriteContainerEmpty(), null);
}
}

4
src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java
View File

@ -154,7 +154,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker {
compTitle = null;
} else {
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature.of(SName.root, SName.title)
final Style style = StyleSignature.of(SName.root, SName.document, SName.title)
.getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder());
compTitle = style.createTextBlockBordered(page.getTitle(), diagram.getSkinParam().getIHtmlColorSet(),
diagram.getSkinParam());
@ -175,7 +175,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker {
legendBlock = TextBlockUtils.empty(0, 0);
} else {
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature.of(SName.root, SName.legend)
final Style style = StyleSignature.of(SName.root, SName.document, SName.legend)
.getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder());
legendBlock = style.createTextBlockBordered(diagram.getLegend().getDisplay(),
diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam());

10
src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java
View File

@ -35,6 +35,8 @@
*/
package net.sourceforge.plantuml.sequencediagram.teoz;
import static net.sourceforge.plantuml.ugraphic.ImageBuilder.styledImageBuilder;
import java.awt.geom.Dimension2D;
import java.io.IOException;
import java.io.OutputStream;
@ -73,8 +75,6 @@ import net.sourceforge.plantuml.ugraphic.UTranslate;
import net.sourceforge.plantuml.ugraphic.color.HColor;
import net.sourceforge.plantuml.utils.MathUtils;
import static net.sourceforge.plantuml.ugraphic.ImageBuilder.styledImageBuilder;
public class SequenceDiagramFileMakerTeoz implements FileMaker {
private final SequenceDiagram diagram;
@ -139,8 +139,8 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker {
if (this.index != index) {
throw new IllegalStateException();
}
return styledImageBuilder(diagram, new Foo(index), index, fileFormatOption)
.annotations(false) // they are managed in drawInternal()
return styledImageBuilder(diagram, new Foo(index), index, fileFormatOption) //
.annotations(false) // they are managed in drawInternal()
.write(os);
}
@ -215,7 +215,7 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker {
}
final TextBlock compTitle;
if (UseStyle.useBetaStyle()) {
final Style style = StyleSignature.of(SName.root, SName.title)
final Style style = StyleSignature.of(SName.root, SName.document, SName.title)
.getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder());
compTitle = style.createTextBlockBordered(diagram.getTitle().getDisplay(),
diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam());

9
src/net/sourceforge/plantuml/style/Style.java
View File

@ -210,18 +210,17 @@ public class Style {
}
public TextBlock createTextBlockBordered(Display note, HColorSet set, ISkinSimple spriteContainer) {
// final HorizontalAlignment alignment = HorizontalAlignment.LEFT;
final HorizontalAlignment alignment = this.getHorizontalAlignment();
final TextBlock textBlock = this.createTextBlockInternal(note, set, spriteContainer, alignment);
final HColor legendBackgroundColor = this.value(PName.BackGroundColor).asColor(set);
final HColor legendColor = this.value(PName.LineColor).asColor(set);
final HColor backgroundColor = this.value(PName.BackGroundColor).asColor(set);
final HColor lineColor = this.value(PName.LineColor).asColor(set);
final UStroke stroke = this.getStroke();
final int cornersize = this.value(PName.RoundCorner).asInt();
final ClockwiseTopRightBottomLeft margin = this.getMargin();
final ClockwiseTopRightBottomLeft padding = this.getPadding();
final TextBlock result = TextBlockUtils.bordered(textBlock, stroke, legendColor, legendBackgroundColor,
cornersize, padding);
final TextBlock result = TextBlockUtils.bordered(textBlock, stroke, lineColor, backgroundColor, cornersize,
padding);
return TextBlockUtils.withMargin(result, margin);
}

2
src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java
View File

@ -424,7 +424,7 @@ public class ImageBuilder {
case ATXT:
return new UGraphicTxt();
case DEBUG:
return new UGraphicDebug();
return new UGraphicDebug(scaleFactor, dim, svgLinkTarget, hoverPathColorRGB, seed, preserveAspectRatio);
default:
throw new UnsupportedOperationException(option.getFileFormat().toString());
}

50
src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java
View File

@ -35,6 +35,7 @@
package net.sourceforge.plantuml.ugraphic.debug;
import java.awt.Color;
import java.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
import java.io.IOException;
import java.io.OutputStream;
@ -48,6 +49,7 @@ import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.posimo.DotPath;
import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic;
import net.sourceforge.plantuml.ugraphic.ClipContainer;
import net.sourceforge.plantuml.ugraphic.UCenteredCharacter;
import net.sourceforge.plantuml.ugraphic.UComment;
import net.sourceforge.plantuml.ugraphic.UEllipse;
import net.sourceforge.plantuml.ugraphic.UEmpty;
@ -68,20 +70,41 @@ import net.sourceforge.plantuml.ugraphic.color.HColorSimple;
public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContainer, UGraphic2 {
private final List<String> output;
private final double scaleFactor;
private final Dimension2D dim;
private final String svgLinkTarget;
private final String hoverPathColorRGB;
private final long seed;
private final String preserveAspectRatio;
@Override
protected AbstractCommonUGraphic copyUGraphic() {
return new UGraphicDebug(this, output);
return new UGraphicDebug(this, output, scaleFactor, dim, svgLinkTarget, hoverPathColorRGB, seed,
preserveAspectRatio);
}
private UGraphicDebug(UGraphicDebug other, List<String> output) {
private UGraphicDebug(UGraphicDebug other, List<String> output, double scaleFactor, Dimension2D dim,
String svgLinkTarget, String hoverPathColorRGB, long seed, String preserveAspectRatio) {
super(other);
this.output = output;
this.scaleFactor = scaleFactor;
this.dim = dim;
this.svgLinkTarget = svgLinkTarget;
this.hoverPathColorRGB = hoverPathColorRGB;
this.seed = seed;
this.preserveAspectRatio = preserveAspectRatio;
}
public UGraphicDebug() {
public UGraphicDebug(double scaleFactor, Dimension2D dim, String svgLinkTarget, String hoverPathColorRGB, long seed,
String preserveAspectRatio) {
super(new ColorMapperIdentity());
this.output = new ArrayList<String>();
this.scaleFactor = scaleFactor;
this.dim = dim;
this.svgLinkTarget = svgLinkTarget;
this.hoverPathColorRGB = hoverPathColorRGB;
this.seed = seed;
this.preserveAspectRatio = preserveAspectRatio;
}
public StringBounder getStringBounder() {
@ -107,12 +130,24 @@ public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContain
outComment((UComment) shape);
} else if (shape instanceof DotPath) {
outPath(((DotPath) shape).toUPath());
} else if (shape instanceof UCenteredCharacter) {
outCenteredCharacter(((UCenteredCharacter) shape));
} else {
System.err.println("UGraphicDebug " + shape.getClass().getSimpleName());
output.add("UGraphicDebug " + shape.getClass().getSimpleName() + " " + new Date());
}
}
private void outCenteredCharacter(UCenteredCharacter shape) {
output.add("CENTERED_CHAR:");
output.add(" char: " + shape.getChar());
output.add(" position: " + pointd(getTranslateX(), getTranslateY()));
output.add(" font: " + shape.getFont().toStringDebug());
output.add(" color: " + colorToString(getParam().getColor()));
output.add("");
}
private void outComment(UComment shape) {
output.add("COMMENT: " + shape.getComment());
}
@ -166,7 +201,8 @@ public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContain
output.add(" position: " + pointd(getTranslateX(), getTranslateY()));
output.add(" orientation: " + shape.getOrientation());
output.add(" font: " + shape.getFontConfiguration().toStringDebug());
output.add(" color: " + colorToString(getParam().getColor()));
output.add(" color: " + colorToString(shape.getFontConfiguration().getColor()));
output.add(" extendedColor: " + colorToString(shape.getFontConfiguration().getExtendedColor()));
output.add("");
}
@ -243,6 +279,12 @@ public class UGraphicDebug extends AbstractCommonUGraphic implements ClipContain
public void writeImageTOBEMOVED(OutputStream os, String metadata, int dpi) throws IOException {
print(os, "DPI: " + dpi);
print(os, "dimension: " + pointd(dim.getWidth(), dim.getHeight()));
print(os, "scaleFactor: " + String.format(Locale.US, "%.4f", scaleFactor));
print(os, "seed: " + seed);
print(os, "svgLinkTarget: " + svgLinkTarget);
print(os, "hoverPathColorRGB: " + hoverPathColorRGB);
print(os, "preserveAspectRatio: " + preserveAspectRatio);
print(os, "");
for (String s : output) {

2
src/net/sourceforge/plantuml/wbs/Fork.java
View File

@ -59,7 +59,7 @@ class Fork extends WBSTextBlock {
}
this.main = buildMain(idea);
for (WElement child : idea.getChildren(Direction.RIGHT)) {
this.right.add(ITFComposed.build2(child.withBackColor(skinParam), child));
this.right.add(ITFComposed.build2(skinParam, child));
}
}

9
src/net/sourceforge/plantuml/wbs/ITFComposed.java
View File

@ -71,7 +71,7 @@ class ITFComposed extends WBSTextBlock implements ITF {
public static ITF build2(ISkinParam skinParam, WElement idea) {
if (idea.isLeaf()) {
return new ITFLeaf(idea.getStyle(), skinParam, idea.getLabel(), idea.getShape());
return new ITFLeaf(idea.getStyle(), idea.withBackColor(skinParam), idea.getLabel(), idea.getShape());
}
final List<ITF> left = new ArrayList<ITF>();
final List<ITF> right = new ArrayList<ITF>();
@ -120,8 +120,8 @@ class ITFComposed extends WBSTextBlock implements ITF {
public final Dimension2D calculateDimension(StringBounder stringBounder) {
final Dimension2D mainDim = main.calculateDimension(stringBounder);
final double mainWidth = mainDim.getWidth();
final double height = mainDim.getHeight()
+ Math.max(getCollHeight(stringBounder, left, marginBottom), getCollHeight(stringBounder, right, marginBottom));
final double height = mainDim.getHeight() + Math.max(getCollHeight(stringBounder, left, marginBottom),
getCollHeight(stringBounder, right, marginBottom));
final double width = Math.max(mainWidth / 2, delta1x + getCollWidth(stringBounder, left))
+ Math.max(mainWidth / 2, delta1x + getCollWidth(stringBounder, right));
return new Dimension2DDouble(width, height);
@ -166,7 +166,8 @@ class ITFComposed extends WBSTextBlock implements ITF {
return result;
}
final private double getCollHeight(StringBounder stringBounder, Collection<? extends TextBlock> all, double deltay) {
final private double getCollHeight(StringBounder stringBounder, Collection<? extends TextBlock> all,
double deltay) {
double result = 0;
for (TextBlock child : all) {
result += deltay + child.calculateDimension(stringBounder).getHeight();

218
test/demo1/SimpleSequenceDiagramTest.java
View File

@ -1,218 +0,0 @@
package demo1;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
import net.sourceforge.plantuml.FileFormat;
import net.sourceforge.plantuml.FileFormatOption;
import net.sourceforge.plantuml.SourceStringReader;
import net.sourceforge.plantuml.core.DiagramDescription;
/*
* This test is a simple POC of what could be non-regression test for PlantUML.
*
* In real world, test diagram and expected result would not be stored in source file.
*/
class SimpleSequenceDiagramTest {
@Test
void testSimple() throws IOException {
final String diagramText = getText();
final SourceStringReader ssr = new SourceStringReader(diagramText, "UTF-8");
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final DiagramDescription diagramDescription = ssr.outputImage(baos, 0, new FileFormatOption(FileFormat.DEBUG));
assertEquals("(2 participants)", diagramDescription.getDescription());
final String actual = new String(baos.toByteArray(), "UTF-8");
final String expected = getExpectedResult();
assertSameDebugGraphic(expected, actual);
}
private void assertSameDebugGraphic(String expectedString, String actualString) {
final String[] expected = expectedString.split("\n");
final String[] actual = actualString.split("\n");
if (expected.length != actual.length) {
// We know it will fail here, but we want to print the full info
assertEquals(expectedString, actualString);
return;
}
for (int i = 0; i < actual.length; i++) {
if (sameString(expected[i], actual[i]) == false) {
System.err.println("expected: " + expected[i]);
System.err.println("actual : " + actual[i]);
// We know it will fail here, but we want to print the full info
assertEquals(expectedString, actualString);
}
}
}
private final Pattern pointLine = Pattern.compile("^(.*?)\\[ ([-.0-9]+) ; ([-.0-9]+) \\]$");
private boolean sameString(String s1, String s2) {
final Matcher line1 = pointLine.matcher(s1);
final Matcher line2 = pointLine.matcher(s2);
if (line1.matches() && line2.matches()) {
final String start1 = line1.group(1);
final String start2 = line2.group(1);
final String x1 = line1.group(2);
final String x2 = line2.group(2);
final String y1 = line1.group(3);
final String y2 = line2.group(3);
return start1.equals(start2) && sameDouble(x1, x2) && sameDouble(y1, y2);
}
return s1.equals(s2);
}
private boolean sameDouble(String double1, String double2) {
final double value1 = Double.parseDouble(double1);
final double value2 = Double.parseDouble(double2);
final double diff = Math.abs(value1 - value2);
final boolean result = diff < 0.001;
if (result == false) {
System.err.println("sameDouble:Non null diff=" + diff);
}
return result;
}
private String getText() {
return packString( //
"@startuml", //
"Alice -> Bob : Hello", //
"@enduml");
}
private String getExpectedResult() {
return packString("DPI: 96", //
"", //
"LINE:", //
" pt1: [ 50.0000 ; 38.0000 ]", //
" pt2: [ 50.0000 ; 85.0000 ]", //
" stroke: 5.0-5.0-1.0", //
" shadow: 0", //
" color: ffa80036", //
"", //
"LINE:", //
" pt1: [ 156.8135 ; 38.0000 ]", //
" pt2: [ 156.8135 ; 85.0000 ]", //
" stroke: 5.0-5.0-1.0", //
" shadow: 0", //
" color: ffa80036", //
"", //
"RECTANGLE:", //
" pt1: [ 5.0000 ; 5.0000 ]", //
" pt2: [ 92.9573 ; 33.0000 ]", //
" xCorner: 0", //
" yCorner: 0", //
" stroke: 0.0-0.0-1.5", //
" shadow: 4", //
" color: ffa80036", //
" backcolor: fffefece", //
"", //
"TEXT:", //
" text: Alice", //
" position: [ 12.0000 ; 22.8889 ]", //
" orientation: 0", //
" font: SansSerif.plain/14 []", //
" color: ffa80036", //
"", //
"RECTANGLE:", //
" pt1: [ 5.0000 ; 84.0000 ]", //
" pt2: [ 92.9573 ; 112.0000 ]", //
" xCorner: 0", //
" yCorner: 0", //
" stroke: 0.0-0.0-1.5", //
" shadow: 4", //
" color: ffa80036", //
" backcolor: fffefece", //
"", //
"TEXT:", //
" text: Alice", //
" position: [ 12.0000 ; 101.8889 ]", //
" orientation: 0", //
" font: SansSerif.plain/14 []", //
" color: ffa80036", //
"", //
"RECTANGLE:", //
" pt1: [ 130.8135 ; 5.0000 ]", //
" pt2: [ 180.5185 ; 33.0000 ]", //
" xCorner: 0", //
" yCorner: 0", //
" stroke: 0.0-0.0-1.5", //
" shadow: 4", //
" color: ffa80036", //
" backcolor: fffefece", //
"", //
"TEXT:", //
" text: Bob", //
" position: [ 137.8135 ; 22.8889 ]", //
" orientation: 0", //
" font: SansSerif.plain/14 []", //
" color: ffa80036", //
"", //
"RECTANGLE:", //
" pt1: [ 130.8135 ; 84.0000 ]", //
" pt2: [ 180.5185 ; 112.0000 ]", //
" xCorner: 0", //
" yCorner: 0", //
" stroke: 0.0-0.0-1.5", //
" shadow: 4", //
" color: ffa80036", //
" backcolor: fffefece", //
"", //
"TEXT:", //
" text: Bob", //
" position: [ 137.8135 ; 101.8889 ]", //
" orientation: 0", //
" font: SansSerif.plain/14 []", //
" color: ffa80036", //
"", //
"POLYGON:", //
" points:", //
" - [ 145.6660 ; 63.0000 ]", //
" - [ 155.6660 ; 67.0000 ]", //
" - [ 145.6660 ; 71.0000 ]", //
" - [ 149.6660 ; 67.0000 ]", //
" stroke: 0.0-0.0-1.0", //
" shadow: 0", //
" color: ffa80036", //
" backcolor: ffa80036", //
"", //
"LINE:", //
" pt1: [ 50.9786 ; 67.0000 ]", //
" pt2: [ 151.6660 ; 67.0000 ]", //
" stroke: 0.0-0.0-1.0", //
" shadow: 0", //
" color: ffa80036", //
"", //
"TEXT:", //
" text: Hello", //
" position: [ 57.9786 ; 62.1111 ]", //
" orientation: 0", //
" font: SansSerif.plain/13 []", //
" color: ffa80036" //
);
}
private String packString(String... list) {
final StringBuilder sb = new StringBuilder();
for (String s : list) {
sb.append(s);
sb.append("\n");
}
return sb.toString() + "\n";
}
}

2
test/nonreg/BasicTest.java
View File

@ -36,7 +36,7 @@ public class BasicTest {
private static final Charset UTF8 = Charset.forName("UTF-8");
private static final boolean FORCE_RESULT_GENERATION = false;
private static final boolean ENABLE_RESULT_GENERATION_IF_NONE_PRESENT = true;
private static final boolean ENABLE_RESULT_GENERATION_IF_NONE_PRESENT = false;
public BasicTest() {
// We want a fully portable way of non regression test, so we force the usage of

21
test/nonreg/simple/A0000_TestResult.java
View File

@ -5,6 +5,12 @@ public class A0000_TestResult {
/*
"""
DPI: 96
dimension: [ 193.5185 ; 125.0000 ]
scaleFactor: 1.0000
seed: 5605069588648637213
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
LINE:
pt1: [ 50.0000 ; 38.0000 ]
@ -35,7 +41,8 @@ TEXT:
position: [ 12.0000 ; 22.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 5.0000 ; 84.0000 ]
@ -52,7 +59,8 @@ TEXT:
position: [ 12.0000 ; 101.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 130.8135 ; 5.0000 ]
@ -69,7 +77,8 @@ TEXT:
position: [ 137.8135 ; 22.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 130.8135 ; 84.0000 ]
@ -86,7 +95,8 @@ TEXT:
position: [ 137.8135 ; 101.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
POLYGON:
points:
@ -111,7 +121,8 @@ TEXT:
position: [ 57.9786 ; 62.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
"""
*/

42
test/nonreg/simple/A0001_TestResult.java
View File

@ -5,6 +5,12 @@ public class A0001_TestResult {
/*
"""
DPI: 96
dimension: [ 304.7331 ; 297.0000 ]
scaleFactor: 1.0000
seed: -1212656935193060805
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
RECTANGLE:
pt1: [ 26.8525 ; 75.0000 ]
@ -45,7 +51,8 @@ TEXT:
position: [ 12.0000 ; 22.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 5.0000 ; 256.0000 ]
@ -62,7 +69,8 @@ TEXT:
position: [ 12.0000 ; 273.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 203.7758 ; 5.0000 ]
@ -79,7 +87,8 @@ TEXT:
position: [ 210.7758 ; 22.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 203.7758 ; 256.0000 ]
@ -96,7 +105,8 @@ TEXT:
position: [ 210.7758 ; 273.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 26.8525 ; 75.0000 ]
@ -145,7 +155,8 @@ TEXT:
position: [ 43.8525 ; 57.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 36.8525 ; 107.0000 ]
@ -184,7 +195,8 @@ TEXT:
position: [ 43.8525 ; 102.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 22.8525 ; 111.0000 ]
@ -237,21 +249,24 @@ TEXT:
position: [ 38.8525 ; 142.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: example of long
position: [ 38.8525 ; 155.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: message
position: [ 38.8525 ; 168.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
POLYGON:
points:
@ -276,21 +291,24 @@ TEXT:
position: [ 38.8525 ; 208.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is an other on
position: [ 38.8525 ; 221.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: very long too
position: [ 38.8525 ; 234.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
"""
*/

210
test/nonreg/simple/A0002_TestResult.java
View File

@ -5,6 +5,12 @@ public class A0002_TestResult {
/*
"""
DPI: 96
dimension: [ 763.0498 ; 895.5000 ]
scaleFactor: 1.0000
seed: -9181376250803721714
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
ELLIPSE:
pt1: [ 170.9019 ; 35.5000 ]
@ -57,21 +63,24 @@ TEXT:
position: [ 36.0000 ; 245.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is a
position: [ 36.0000 ; 258.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: note
position: [ 36.0000 ; 271.1111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 218.3794 ; 65.5000 ]
@ -114,161 +123,184 @@ TEXT:
position: [ 234.3794 ; 90.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 103.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 116.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 129.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 142.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 155.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 168.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 181.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 194.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 207.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 220.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 233.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 234.3794 ; 246.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long note
position: [ 234.3794 ; 259.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: This
position: [ 234.3794 ; 272.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: note
position: [ 234.3794 ; 285.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is on
position: [ 234.3794 ; 298.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: several
position: [ 234.3794 ; 311.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: lines
position: [ 234.3794 ; 324.6111 ]
orientation: 0
font: SansSerif.italic/13 [ITALIC]
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text:
position: [ 315.7608 ; 324.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: and can
position: [ 234.3794 ; 337.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: contain
position: [ 234.3794 ; 350.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: HTML
position: [ 321.5906 ; 350.6111 ]
orientation: 0
font: SansSerif.bold/13 [BOLD]
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 228.3794 ; 358.5000 ]
@ -299,49 +331,56 @@ TEXT:
position: [ 246.8146 ; 373.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: the
position: [ 246.8146 ; 386.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: method
position: [ 246.8146 ; 399.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: foo()
position: [ 342.9676 ; 399.6111 ]
orientation: 0
font: Monospaced.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is
position: [ 246.8146 ; 412.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: prohibited
position: [ 304.4687 ; 412.6111 ]
orientation: 0
font: SansSerif.plain/13 [BACKCOLOR]
color: ffa80036
color: ff000000
extendedColor: ffff0000
TEXT:
text: overlap
position: [ 246.8146 ; 425.6111 ]
orientation: 0
font: SansSerif.plain/13 [BACKCOLOR]
color: ffa80036
color: ff000000
extendedColor: ffff0000
RECTANGLE:
pt1: [ 143.4243 ; 238.5000 ]
@ -358,7 +397,8 @@ TEXT:
position: [ 153.4243 ; 257.8333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 10.0000 ; 12.5000 ]
@ -432,175 +472,200 @@ TEXT:
position: [ 553.7092 ; 468.6111 ]
orientation: 0
font: SansSerif.plain/13 [BACKCOLOR]
color: ffa80036
color: ff000000
extendedColor: ffff0000
TEXT:
text: this note
position: [ 553.7092 ; 481.6111 ]
orientation: 0
font: SansSerif.plain/13 [BACKCOLOR]
color: ffa80036
color: ff000000
extendedColor: ffff0000
TEXT:
text: A Long
position: [ 553.7092 ; 494.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 507.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 520.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 533.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 546.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 559.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 572.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 585.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 598.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 611.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 624.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 637.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long
position: [ 553.7092 ; 650.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Long note
position: [ 553.7092 ; 663.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: This
position: [ 553.7092 ; 676.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: note
position: [ 553.7092 ; 689.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is on
position: [ 553.7092 ; 702.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: several
position: [ 553.7092 ; 715.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: lines
position: [ 553.7092 ; 728.6111 ]
orientation: 0
font: SansSerif.italic/13 [ITALIC]
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text:
position: [ 635.0906 ; 728.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: and can
position: [ 553.7092 ; 741.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: contain
position: [ 553.7092 ; 754.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: HTML
position: [ 640.9204 ; 754.6111 ]
orientation: 0
font: SansSerif.bold/13 [BOLD]
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 547.7092 ; 762.5000 ]
@ -631,42 +696,48 @@ TEXT:
position: [ 566.1444 ; 777.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: the
position: [ 566.1444 ; 790.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: method
position: [ 566.1444 ; 803.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: foo()
position: [ 662.2974 ; 803.6111 ]
orientation: 0
font: Monospaced.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: is
position: [ 566.1444 ; 816.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: prohibited
position: [ 566.1444 ; 829.6111 ]
orientation: 0
font: SansSerif.plain/13 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 452.7562 ; 629.5000 ]
@ -683,7 +754,8 @@ TEXT:
position: [ 462.7562 ; 648.8333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
ELLIPSE:
pt1: [ 479.2327 ; 857.5000 ]
@ -800,14 +872,16 @@ TEXT:
position: [ 163.2884 ; 26.5000 ]
orientation: 0
font: SansSerif.plain/18 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Actor 2
position: [ 525.0409 ; 26.5000 ]
orientation: 0
font: SansSerif.plain/18 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
"""
*/

42
test/nonreg/simple/A0003_TestResult.java
View File

@ -5,6 +5,12 @@ public class A0003_TestResult {
/*
"""
DPI: 96
dimension: [ 367.7447 ; 78.0000 ]
scaleFactor: 2.0000
seed: -6040919743496430850
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
RECTANGLE:
pt1: [ 8.0000 ; 29.0000 ]
@ -71,42 +77,48 @@ TEXT:
position: [ 21.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: 26
position: [ 49.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: 2
position: [ 77.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: 9
position: [ 105.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: 16
position: [ 133.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: 23
position: [ 161.0000 ; 23.7778 ]
orientation: 0
font: Serif.plain/10 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 16.0000 ; 16.0000 ]
@ -176,7 +188,8 @@ TEXT:
position: [ 17.4989 ; 9.3333 ]
orientation: 0
font: Serif.bold/12 [BOLD]
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 168.0000 ; 0.0000 ]
@ -190,7 +203,8 @@ TEXT:
position: [ 72.7816 ; 9.3333 ]
orientation: 0
font: Serif.bold/12 [BOLD]
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 0.0000 ; 0.0000 ]
@ -407,14 +421,16 @@ TEXT:
position: [ 142.0000 ; 39.0556 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
TEXT:
text: Testing
position: [ 170.0000 ; 55.0556 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 0.0000 ; 61.0000 ]
@ -442,7 +458,8 @@ TEXT:
position: [ 17.4989 ; 70.3333 ]
orientation: 0
font: Serif.bold/12 [BOLD]
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 168.0000 ; 61.0000 ]
@ -456,7 +473,8 @@ TEXT:
position: [ 72.7816 ; 70.3333 ]
orientation: 0
font: Serif.bold/12 [BOLD]
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 0.0000 ; 77.0000 ]

42
test/nonreg/simple/A0004_TestResult.java
View File

@ -5,6 +5,12 @@ public class A0004_TestResult {
/*
"""
DPI: 96
dimension: [ 559.6156 ; 681.0000 ]
scaleFactor: 1.0000
seed: 6985134683589840646
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
ELLIPSE:
pt1: [ 139.0000 ; 7.0000 ]
@ -31,7 +37,8 @@ TEXT:
position: [ 49.5000 ; 87.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
POLYGON:
points:
@ -60,7 +67,8 @@ TEXT:
position: [ 17.0000 ; 198.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
ELLIPSE:
pt1: [ 128.0000 ; 650.0000 ]
@ -97,7 +105,8 @@ TEXT:
position: [ 155.5000 ; 248.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 235.0000 ; 298.0000 ]
@ -146,7 +155,8 @@ TEXT:
position: [ 272.0000 ; 470.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 351.0000 ; 401.0000 ]
@ -163,7 +173,8 @@ TEXT:
position: [ 361.0000 ; 420.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 115.5000 ; 581.0000 ]
@ -180,7 +191,8 @@ TEXT:
position: [ 125.5000 ; 600.3333 ]
orientation: 0
font: SansSerif.plain/12 []
color: ffa80036
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -239,7 +251,8 @@ TEXT:
position: [ 138.0000 ; 133.1969 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -274,7 +287,8 @@ TEXT:
position: [ 34.1176 ; 165.1119 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -345,7 +359,8 @@ TEXT:
position: [ 217.0000 ; 198.0556 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -404,7 +419,8 @@ TEXT:
position: [ 264.0000 ; 355.5079 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -443,7 +459,8 @@ TEXT:
position: [ 139.0000 ; 470.0556 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO
@ -482,7 +499,8 @@ TEXT:
position: [ 278.0000 ; 420.0556 ]
orientation: 0
font: SansSerif.plain/11 []
color: NULL_COLOR
color: ff000000
extendedColor: NULL_COLOR
PATH:
- type: SEG_MOVETO

60
test/nonreg/simple/A0005_Test.java Normal file
View File

@ -0,0 +1,60 @@
package nonreg.simple;
import java.io.IOException;
import org.junit.jupiter.api.Test;
import nonreg.BasicTest;
/*
Test diagram MUST be put between triple quotes
"""
@startuml
title title
legend legend
footer footer
header header
caption caption
<style>
document {
BackGroundColor orange
}
title {
BackGroundColor yellow
}
legend {
BackGroundColor green
}
footer {
BackGroundColor blue
FontColor red
FontSize 15
}
header {
BackGroundColor red
}
caption {
BackGroundColor purple
}
</style>
class Bob {
hello
}
class Sally
Sally --> Bob
@enduml
"""
*/
public class A0005_Test extends BasicTest {
@Test
void testSimple() throws IOException {
checkImage("(2 entities)");
}
}

288
test/nonreg/simple/A0005_TestResult.java Normal file
View File

@ -0,0 +1,288 @@
package nonreg.simple;
public class A0005_TestResult {
}
/*
"""
DPI: 96
dimension: [ 128.0935 ; 282.0000 ]
scaleFactor: 1.0000
seed: 293863236578191100
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
EMPTY:
pt1: [ 43.7612 ; 0.0000 ]
pt2: [ 122.0935 ; 11.0000 ]
RECTANGLE:
pt1: [ 43.7612 ; 0.0000 ]
pt2: [ 121.0935 ; 10.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ffff0000
TEXT:
text: header
position: [ 43.7612 ; 7.7778 ]
orientation: 0
font: SansSerif.plain/10 []
color: ff888888
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 20.7059 ; 11.0000 ]
pt2: [ 101.3876 ; 46.0000 ]
RECTANGLE:
pt1: [ 25.7059 ; 16.0000 ]
pt2: [ 95.3876 ; 40.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ffffff00
TEXT:
text: title
position: [ 30.7059 ; 31.8889 ]
orientation: 0
font: SansSerif.bold/14 [BOLD]
color: ff000000
extendedColor: NULL_COLOR
COMMENT: class Bob
RECTANGLE:
pt1: [ 25.6999 ; 143.0000 ]
pt2: [ 102.4463 ; 205.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
EMPTY:
pt1: [ 29.7685 ; 143.0000 ]
pt2: [ 55.7685 ; 175.0000 ]
ELLIPSE:
pt1: [ 33.7685 ; 148.0000 ]
pt2: [ 55.7685 ; 170.0000 ]
start: 0.0
extend: 0.0
stroke: 0.0-0.0-1.0
shadow: 0
color: ffa80036
backcolor: ffadd1b2
CENTERED_CHAR:
char: C
position: [ 44.7685 ; 159.0000 ]
font: Monospaced.bold/17
color: ff000000
EMPTY:
pt1: [ 56.6726 ; 152.0000 ]
pt2: [ 98.3776 ; 166.0000 ]
TEXT:
text: Bob
position: [ 59.6726 ; 162.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 26.6999 ; 175.0000 ]
pt2: [ 101.4463 ; 175.0000 ]
stroke: 0.0-0.0-1.5
shadow: 0
color: ffa80036
EMPTY:
pt1: [ 25.6999 ; 175.0000 ]
pt2: [ 102.4463 ; 197.0000 ]
TEXT:
text: hello
position: [ 31.6999 ; 189.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 26.6999 ; 197.0000 ]
pt2: [ 101.4463 ; 197.0000 ]
stroke: 0.0-0.0-1.5
shadow: 0
color: ffa80036
EMPTY:
pt1: [ 25.6999 ; 197.0000 ]
pt2: [ 37.6999 ; 205.0000 ]
COMMENT: class Sally
RECTANGLE:
pt1: [ 18.1999 ; 59.0000 ]
pt2: [ 109.8937 ; 107.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
EMPTY:
pt1: [ 18.1999 ; 59.0000 ]
pt2: [ 44.1999 ; 91.0000 ]
ELLIPSE:
pt1: [ 22.1999 ; 64.0000 ]
pt2: [ 44.1999 ; 86.0000 ]
start: 0.0
extend: 0.0
stroke: 0.0-0.0-1.0
shadow: 0
color: ffa80036
backcolor: ffadd1b2
CENTERED_CHAR:
char: C
position: [ 33.1999 ; 75.0000 ]
font: Monospaced.bold/17
color: ff000000
EMPTY:
pt1: [ 44.1999 ; 68.0000 ]
pt2: [ 109.8937 ; 82.0000 ]
TEXT:
text: Sally
position: [ 47.1999 ; 78.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 19.1999 ; 91.0000 ]
pt2: [ 108.8937 ; 91.0000 ]
stroke: 0.0-0.0-1.5
shadow: 0
color: ffa80036
EMPTY:
pt1: [ 18.1999 ; 91.0000 ]
pt2: [ 30.1999 ; 99.0000 ]
LINE:
pt1: [ 19.1999 ; 99.0000 ]
pt2: [ 108.8937 ; 99.0000 ]
stroke: 0.0-0.0-1.5
shadow: 0
color: ffa80036
EMPTY:
pt1: [ 18.1999 ; 99.0000 ]
pt2: [ 30.1999 ; 107.0000 ]
PATH:
- type: SEG_MOVETO
pt1: [ 46.0000 ; 55.3837 ]
- type: SEG_CUBICTO
pt1: [ 46.0000 ; 66.1992 ]
pt2: [ 46.0000 ; 79.1811 ]
pt3: [ 46.0000 ; 90.7328 ]
stroke: 0.0-0.0-1.0
shadow: 0
color: ffa80036
backcolor: NULL_COLOR
POLYGON:
points:
- [ 64.1999 ; 142.7328 ]
- [ 68.1999 ; 133.7328 ]
- [ 64.1999 ; 137.7328 ]
- [ 60.1999 ; 133.7328 ]
- [ 64.1999 ; 142.7328 ]
stroke: 0.0-0.0-1.0
shadow: 0
color: ffa80036
backcolor: ffa80036
EMPTY:
pt1: [ 0.0000 ; 200.0000 ]
pt2: [ 122.0935 ; 243.0000 ]
RECTANGLE:
pt1: [ 8.0000 ; 208.0000 ]
pt2: [ 113.0935 ; 234.0000 ]
xCorner: 15
yCorner: 15
stroke: 0.0-0.0-1.0
shadow: 0
color: ff000000
backcolor: ff008000
TEXT:
text: legend
position: [ 14.0000 ; 224.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 2.6679 ; 243.0000 ]
pt2: [ 119.4256 ; 260.0000 ]
RECTANGLE:
pt1: [ 3.6679 ; 244.0000 ]
pt2: [ 117.4256 ; 258.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ff800080
TEXT:
text: caption
position: [ 3.6679 ; 254.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 16.9796 ; 260.0000 ]
pt2: [ 105.1139 ; 276.0000 ]
RECTANGLE:
pt1: [ 16.9796 ; 260.0000 ]
pt2: [ 104.1139 ; 275.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ff0000ff
TEXT:
text: footer
position: [ 16.9796 ; 271.6667 ]
orientation: 0
font: SansSerif.plain/15 []
color: ffff0000
extendedColor: NULL_COLOR
"""
*/

54
test/nonreg/simple/A0006_Test.java Normal file
View File

@ -0,0 +1,54 @@
package nonreg.simple;
import java.io.IOException;
import org.junit.jupiter.api.Test;
import nonreg.BasicTest;
/*
Test diagram MUST be put between triple quotes
"""
@startuml
title title
legend legend
footer footer
header header
caption caption
<style>
document {
BackGroundColor orange
}
title {
BackGroundColor yellow
}
legend {
BackGroundColor green
}
footer {
BackGroundColor blue
FontColor red
FontSize 15
}
header {
BackGroundColor red
}
caption {
BackGroundColor purple
}
</style>
Sally --> Bob
@enduml
"""
*/
public class A0006_Test extends BasicTest {
@Test
void testSimple() throws IOException {
checkImage("(2 participants)");
}
}

230
test/nonreg/simple/A0006_TestResult.java Normal file
View File

@ -0,0 +1,230 @@
package nonreg.simple;
public class A0006_TestResult {
}
/*
"""
DPI: 96
dimension: [ 157.3989 ; 233.0000 ]
scaleFactor: 1.0000
seed: -2375783792654745998
svgLinkTarget: _top
hoverPathColorRGB: null
preserveAspectRatio: none
EMPTY:
pt1: [ 35.3586 ; 16.0000 ]
pt2: [ 116.0403 ; 51.0000 ]
RECTANGLE:
pt1: [ 40.3586 ; 21.0000 ]
pt2: [ 110.0403 ; 45.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ffffff00
TEXT:
text: title
position: [ 45.3586 ; 36.8889 ]
orientation: 0
font: SansSerif.bold/14 [BOLD]
color: ff000000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 17.3206 ; 194.0000 ]
pt2: [ 134.0783 ; 211.0000 ]
RECTANGLE:
pt1: [ 18.3206 ; 195.0000 ]
pt2: [ 132.0783 ; 209.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ff800080
TEXT:
text: caption
position: [ 18.3206 ; 205.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
LINE:
pt1: [ 43.0000 ; 84.0000 ]
pt2: [ 43.0000 ; 118.0000 ]
stroke: 5.0-5.0-1.0
shadow: 0
color: ffa80036
LINE:
pt1: [ 118.6938 ; 84.0000 ]
pt2: [ 118.6938 ; 118.0000 ]
stroke: 5.0-5.0-1.0
shadow: 0
color: ffa80036
RECTANGLE:
pt1: [ 5.0000 ; 51.0000 ]
pt2: [ 78.6938 ; 79.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
TEXT:
text: Sally
position: [ 12.0000 ; 68.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 5.0000 ; 117.0000 ]
pt2: [ 78.6938 ; 145.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
TEXT:
text: Sally
position: [ 12.0000 ; 134.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 92.6938 ; 51.0000 ]
pt2: [ 142.3989 ; 79.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
TEXT:
text: Bob
position: [ 99.6938 ; 68.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
RECTANGLE:
pt1: [ 92.6938 ; 117.0000 ]
pt2: [ 142.3989 ; 145.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.5
shadow: 4
color: ffa80036
backcolor: fffefece
TEXT:
text: Bob
position: [ 99.6938 ; 134.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
POLYGON:
points:
- [ 107.5463 ; 96.0000 ]
- [ 117.5463 ; 100.0000 ]
- [ 107.5463 ; 104.0000 ]
- [ 111.5463 ; 100.0000 ]
stroke: 0.0-0.0-1.0
shadow: 0
color: ffa80036
backcolor: ffa80036
LINE:
pt1: [ 43.8469 ; 100.0000 ]
pt2: [ 113.5463 ; 100.0000 ]
stroke: 2.0-2.0-1.0
shadow: 0
color: ffa80036
EMPTY:
pt1: [ 73.0665 ; 5.0000 ]
pt2: [ 151.3989 ; 16.0000 ]
RECTANGLE:
pt1: [ 73.0665 ; 5.0000 ]
pt2: [ 150.3989 ; 15.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ffff0000
TEXT:
text: header
position: [ 73.0665 ; 12.7778 ]
orientation: 0
font: SansSerif.plain/10 []
color: ff888888
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 31.6323 ; 211.0000 ]
pt2: [ 119.7666 ; 227.0000 ]
RECTANGLE:
pt1: [ 31.6323 ; 211.0000 ]
pt2: [ 118.7666 ; 226.0000 ]
xCorner: 0
yCorner: 0
stroke: 0.0-0.0-1.0
shadow: 0
color: NULL_COLOR
backcolor: ff0000ff
TEXT:
text: footer
position: [ 31.6323 ; 222.6667 ]
orientation: 0
font: SansSerif.plain/15 []
color: ffff0000
extendedColor: NULL_COLOR
EMPTY:
pt1: [ 14.6527 ; 151.0000 ]
pt2: [ 136.7462 ; 194.0000 ]
RECTANGLE:
pt1: [ 22.6527 ; 159.0000 ]
pt2: [ 127.7462 ; 185.0000 ]
xCorner: 15
yCorner: 15
stroke: 0.0-0.0-1.0
shadow: 0
color: ff000000
backcolor: ff008000
TEXT:
text: legend
position: [ 28.6527 ; 175.8889 ]
orientation: 0
font: SansSerif.plain/14 []
color: ff000000
extendedColor: NULL_COLOR
"""
*/