From cbfa02825849ba844bab659a503fa35ac93085b6 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 14 Feb 2023 10:39:15 -0800 Subject: [PATCH] regenerate tests --- .../mixed-language-2/dagre/board.exp.json | 673 ++++++++++++++++-- .../mixed-language-2/dagre/sketch.exp.svg | 6 +- .../mixed-language-2/elk/board.exp.json | 565 +++++++++++++-- .../mixed-language-2/elk/sketch.exp.svg | 6 +- e2etests/unicode_test.go | 31 +- 5 files changed, 1166 insertions(+), 115 deletions(-) diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json index bb5c666f8..de3b3e2bf 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json @@ -6,7 +6,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 0, + "x": 31, "y": 0 }, "width": 240, @@ -47,8 +47,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 300, - "y": 0 + "x": 30, + "y": 166 }, "width": 241, "height": 66, @@ -88,8 +88,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 601, - "y": 0 + "x": 0, + "y": 332 }, "width": 301, "height": 66, @@ -126,11 +126,11 @@ "level": 1 }, { - "id": "\"สวัสดี (sà-wàt-dii) - Thai\"", + "id": "d", "type": "rectangle", "pos": { - "x": 962, - "y": 0 + "x": 29, + "y": 498 }, "width": 244, "height": 66, @@ -167,10 +167,10 @@ "level": 1 }, { - "id": "\"ສະບາຍດີ (sabaidee) - Lao\"", + "id": "e", "type": "rectangle", "pos": { - "x": 1266, + "x": 336, "y": 0 }, "width": 237, @@ -208,11 +208,11 @@ "level": 1 }, { - "id": "\"ဟယ်လို (helaou) - Burmese\"", + "id": "f", "type": "rectangle", "pos": { - "x": 1563, - "y": 0 + "x": 331, + "y": 166 }, "width": 247, "height": 66, @@ -249,11 +249,11 @@ "level": 1 }, { - "id": "\"mari (まり) - Ainu\"", + "id": "g", "type": "rectangle", "pos": { - "x": 1870, - "y": 0 + "x": 367, + "y": 332 }, "width": 176, "height": 66, @@ -290,11 +290,11 @@ "level": 1 }, { - "id": "\"cào (草) - Zhuang\"", + "id": "h", "type": "rectangle", "pos": { - "x": 2106, - "y": 0 + "x": 368, + "y": 498 }, "width": 173, "height": 66, @@ -331,10 +331,10 @@ "level": 1 }, { - "id": "\"күнтізбе (kúntízbe) - Kazakh\"", + "id": "i", "type": "rectangle", "pos": { - "x": 2339, + "x": 633, "y": 0 }, "width": 282, @@ -372,11 +372,11 @@ "level": 1 }, { - "id": "\"բարև (barev) - Armenian\"", + "id": "j", "type": "rectangle", "pos": { - "x": 2681, - "y": 0 + "x": 662, + "y": 166 }, "width": 224, "height": 66, @@ -413,11 +413,11 @@ "level": 1 }, { - "id": "\"монгол (mongol) - Mongolian\"", + "id": "k", "type": "rectangle", "pos": { - "x": 2965, - "y": 0 + "x": 642, + "y": 332 }, "width": 265, "height": 66, @@ -454,11 +454,11 @@ "level": 1 }, { - "id": "\"mila (میلا) - Uyghur\"", + "id": "l", "type": "rectangle", "pos": { - "x": 3290, - "y": 0 + "x": 675, + "y": 498 }, "width": 199, "height": 66, @@ -495,10 +495,10 @@ "level": 1 }, { - "id": "\"નમસ્તે (namaste) - Gujarati\"", + "id": "m", "type": "rectangle", "pos": { - "x": 3549, + "x": 975, "y": 0 }, "width": 255, @@ -536,11 +536,11 @@ "level": 1 }, { - "id": "\"漢字 (kanji) - Japanese\"", + "id": "n", "type": "rectangle", "pos": { - "x": 3864, - "y": 0 + "x": 996, + "y": 166 }, "width": 213, "height": 66, @@ -577,11 +577,11 @@ "level": 1 }, { - "id": "\"위 (wi) - Korean\"", + "id": "o", "type": "rectangle", "pos": { - "x": 4137, - "y": 0 + "x": 1024, + "y": 332 }, "width": 158, "height": 66, @@ -618,11 +618,11 @@ "level": 1 }, { - "id": "\"吾哥 (ngǔgāi) - Cantonese\"", + "id": "p", "type": "rectangle", "pos": { - "x": 4355, - "y": 0 + "x": 984, + "y": 498 }, "width": 238, "height": 66, @@ -662,7 +662,7 @@ "id": "\"မင်္ဂလာပါ (mingalaba) - Burmese\"", "type": "rectangle", "pos": { - "x": 4653, + "x": 1290, "y": 0 }, "width": 307, @@ -703,7 +703,7 @@ "id": "\"сайн уу (sain uu) - Mongolian\"", "type": "rectangle", "pos": { - "x": 5020, + "x": 1657, "y": 0 }, "width": 264, @@ -744,7 +744,7 @@ "id": "\"ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi\"", "type": "rectangle", "pos": { - "x": 5344, + "x": 1981, "y": 0 }, "width": 328, @@ -785,7 +785,7 @@ "id": "\"你吃了吗 (ní chī le ma) - Mandarin Chinese\"", "type": "rectangle", "pos": { - "x": 5732, + "x": 2369, "y": 0 }, "width": 370, @@ -826,7 +826,7 @@ "id": "\"饭 (fan) - Zhuang\"", "type": "rectangle", "pos": { - "x": 6162, + "x": 2799, "y": 0 }, "width": 167, @@ -867,7 +867,7 @@ "id": "مەن سىزنى ياخشى ئۈمىد ق", "type": "rectangle", "pos": { - "x": 6389, + "x": 3026, "y": 0 }, "width": 266, @@ -905,5 +905,582 @@ "level": 1 } ], - "connections": [] + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "srcLabel": "", + "dst": "b", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 150.5, + "y": 66 + }, + { + "x": 150.5, + "y": 106 + }, + { + "x": 150.5, + "y": 126 + }, + { + "x": 150.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "srcLabel": "", + "dst": "c", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 150.5, + "y": 232 + }, + { + "x": 150.5, + "y": 272 + }, + { + "x": 150.5, + "y": 292 + }, + { + "x": 150.5, + "y": 332 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c -> d)[0]", + "src": "c", + "srcArrow": "none", + "srcLabel": "", + "dst": "d", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 150.5, + "y": 398 + }, + { + "x": 150.5, + "y": 438 + }, + { + "x": 150.5, + "y": 458 + }, + { + "x": 150.5, + "y": 498 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(e -> f)[0]", + "src": "e", + "srcArrow": "none", + "srcLabel": "", + "dst": "f", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 454.5, + "y": 66 + }, + { + "x": 454.5, + "y": 106 + }, + { + "x": 454.5, + "y": 126 + }, + { + "x": 454.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(f -> g)[0]", + "src": "f", + "srcArrow": "none", + "srcLabel": "", + "dst": "g", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 454.5, + "y": 232 + }, + { + "x": 454.5, + "y": 272 + }, + { + "x": 454.5, + "y": 292 + }, + { + "x": 454.5, + "y": 332 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(g -> h)[0]", + "src": "g", + "srcArrow": "none", + "srcLabel": "", + "dst": "h", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 454.5, + "y": 398 + }, + { + "x": 454.5, + "y": 438 + }, + { + "x": 454.5, + "y": 458 + }, + { + "x": 454.5, + "y": 498 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(i -> j)[0]", + "src": "i", + "srcArrow": "none", + "srcLabel": "", + "dst": "j", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 774, + "y": 66 + }, + { + "x": 774, + "y": 106 + }, + { + "x": 774, + "y": 126 + }, + { + "x": 774, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(j -> k)[0]", + "src": "j", + "srcArrow": "none", + "srcLabel": "", + "dst": "k", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 774, + "y": 232 + }, + { + "x": 774, + "y": 272 + }, + { + "x": 774, + "y": 292 + }, + { + "x": 774, + "y": 332 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(k -> l)[0]", + "src": "k", + "srcArrow": "none", + "srcLabel": "", + "dst": "l", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 774, + "y": 398 + }, + { + "x": 774, + "y": 438 + }, + { + "x": 774, + "y": 458 + }, + { + "x": 774, + "y": 498 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(m -> n)[0]", + "src": "m", + "srcArrow": "none", + "srcLabel": "", + "dst": "n", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1102.5, + "y": 66 + }, + { + "x": 1102.5, + "y": 106 + }, + { + "x": 1102.5, + "y": 126 + }, + { + "x": 1102.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(n -> o)[0]", + "src": "n", + "srcArrow": "none", + "srcLabel": "", + "dst": "o", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1102.5, + "y": 232 + }, + { + "x": 1102.5, + "y": 272 + }, + { + "x": 1102.5, + "y": 292 + }, + { + "x": 1102.5, + "y": 332 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(o -> p)[0]", + "src": "o", + "srcArrow": "none", + "srcLabel": "", + "dst": "p", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 1102.5, + "y": 398 + }, + { + "x": 1102.5, + "y": 438 + }, + { + "x": 1102.5, + "y": 458 + }, + { + "x": 1102.5, + "y": 498 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] } diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg index 2947dbba3..b3c441a46 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="6859" height="270" viewBox="-102 -102 6859 270">