From 654475f286f64670c9651272bc652a0c22bc3939 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Fri, 27 Jan 2023 22:20:10 -0800 Subject: [PATCH] Fix e2etests report generation and update testdata --- d2compiler/compile.go | 5 + d2renderers/d2sketch/sketch_test.go | 14 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 20 +- e2etests/report/main.go | 8 + e2etests/report/template.html | 6 +- e2etests/stable_test.go | 82 ++--- .../all_shapes_multiple/dagre/board.exp.json | 340 +++++++++--------- .../all_shapes_multiple/dagre/sketch.exp.svg | 6 +- .../all_shapes_multiple/elk/board.exp.json | 262 +++++++------- .../all_shapes_multiple/elk/sketch.exp.svg | 6 +- .../all_shapes_shadow/dagre/board.exp.json | 340 +++++++++--------- .../all_shapes_shadow/dagre/sketch.exp.svg | 14 +- .../all_shapes_shadow/elk/board.exp.json | 262 +++++++------- .../all_shapes_shadow/elk/sketch.exp.svg | 14 +- .../dagre/board.exp.json | 16 +- .../dagre/sketch.exp.svg | 6 +- .../elk/board.exp.json | 16 +- .../elk/sketch.exp.svg | 6 +- .../stable/square_3d/dagre/board.exp.json | 28 +- .../stable/square_3d/dagre/sketch.exp.svg | 10 +- .../stable/square_3d/elk/board.exp.json | 24 +- .../stable/square_3d/elk/sketch.exp.svg | 10 +- 22 files changed, 766 insertions(+), 729 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index a010c2b27e..4c6818ebba 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -135,6 +135,11 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { keyword := strings.ToLower(f.Name) + _, isStyleReserved := d2graph.StyleKeywords[keyword] + if isStyleReserved { + c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name) + return + } _, isReserved := d2graph.SimpleReservedKeywords[keyword] if isReserved { c.compileReserved(obj.Attributes, f) diff --git a/d2renderers/d2sketch/sketch_test.go b/d2renderers/d2sketch/sketch_test.go index f431a62a2f..ba733435ab 100644 --- a/d2renderers/d2sketch/sketch_test.go +++ b/d2renderers/d2sketch/sketch_test.go @@ -63,7 +63,7 @@ func TestSketch(t *testing.T) { } People discovery: "People discovery \nservice" admixer: Ad mixer { - fill: "#c1a2f3" + style.fill: "#c1a2f3" } onboarding service: "Onboarding \nservice" @@ -107,7 +107,7 @@ Android: { web -> twitter fe timeline scorer: "Timeline\nScorer" { - fill: "#ffdef1" + style.fill "#ffdef1" } home ranker: Home Ranker @@ -119,7 +119,7 @@ timeline mixer -> home ranker: { } timeline mixer -> timeline service home mixer: Home mixer { - # fill: "#c1a2f3" + # style.fill "#c1a2f3" } container0.graphql -> home mixer: { style.stroke-dash: 4 @@ -146,7 +146,7 @@ prediction service2: Prediction Service { icon: https://cdn-icons-png.flaticon.com/512/6461/6461819.png } home scorer: Home Scorer { - fill: "#ffdef1" + style.fill "#ffdef1" } manhattan: Manhattan memcache: Memcache { @@ -154,15 +154,15 @@ memcache: Memcache { } fetch: Fetch { - multiple: true + style.multiple: true shape: step } feature: Feature { - multiple: true + style.multiple: true shape: step } scoring: Scoring { - multiple: true + style.multiple: true shape: step } fetch -> feature diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index dc44823a53..11d4a2ff51 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/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="3465" height="2479" viewBox="-102 -102 3465 2479">