Fix e2etests report generation and update testdata

terrastruct · Jan 28, 2023 · 654475f · 654475f
1 parent 192cb10
commit 654475f
Show file tree

Hide file tree

Showing 22 changed files with 766 additions and 729 deletions.
diff --git 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
@@ -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,23 +146,23 @@ 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 {
   icon: https://d1q6f0aelx0por.cloudfront.net/product-logos/de041504-0ddb-43f6-b89e-fe04403cca8d-memcached.png
 }
 
 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
diff --git a/e2etests/report/main.go b/e2etests/report/main.go
@@ -6,6 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	stdlog "log"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -144,6 +145,13 @@ func main() {
 		}
 
 		path := os.Getenv("REPORT_OUTPUT")
+		if path == "" {
+			path = filepath.Join(testDir, "./out/e2e_report.html")
+		}
+		err = os.MkdirAll(filepath.Dir(path), 0755)
+		if err != nil {
+			stdlog.Fatal(err)
+		}
 		f, err := os.Create(path)
 		if err != nil {
 			panic(fmt.Errorf("error creating file `%s`. %v", path, err))

diff --git a/e2etests/report/template.html b/e2etests/report/template.html
@@ -4,13 +4,13 @@
     <div class="cases">
       {{range .Tests}}
       <div class="case">
-        <h1><a href="../{{.GotSVG}}">{{.Name}}</a></h1>
+        <h1><a href="../../{{.GotSVG}}">{{.Name}}</a></h1>
         {{ if .ExpSVG }}
         <h2>Expected</h2>
-        <img src="../{{.ExpSVG}}" width="100%" />
+        <img src="../../{{.ExpSVG}}" width="100%" />
         <h2>Got</h2>
         {{ end }}
-        <img src="../{{.GotSVG}}" width="100%" />
+        <img src="../../{{.GotSVG}}" width="100%" />
       </div>
       {{end}}
     </div>

diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go
@@ -79,23 +79,23 @@ callout -> stored_data -> person
 diamond -> oval -> circle
 hexagon -> cloud
 
-rectangle.multiple: true
-square.multiple: true
-page.multiple: true
-parallelogram.multiple: true
-document.multiple: true
-cylinder.multiple: true
-queue.multiple: true
-package.multiple: true
-step.multiple: true
-callout.multiple: true
-stored_data.multiple: true
-person.multiple: true
-diamond.multiple: true
-oval.multiple: true
-circle.multiple: true
-hexagon.multiple: true
-cloud.multiple: true
+rectangle.style.multiple: true
+square.style.multiple: true
+page.style.multiple: true
+parallelogram.style.multiple: true
+document.style.multiple: true
+cylinder.style.multiple: true
+queue.style.multiple: true
+package.style.multiple: true
+step.style.multiple: true
+callout.style.multiple: true
+stored_data.style.multiple: true
+person.style.multiple: true
+diamond.style.multiple: true
+oval.style.multiple: true
+circle.style.multiple: true
+hexagon.style.multiple: true
+cloud.style.multiple: true
 `,
 		},
 		{
@@ -126,23 +126,23 @@ callout -> stored_data -> person
 diamond -> oval -> circle
 hexagon -> cloud
 
-rectangle.shadow: true
-square.shadow: true
-page.shadow: true
-parallelogram.shadow: true
-document.shadow: true
-cylinder.shadow: true
-queue.shadow: true
-package.shadow: true
-step.shadow: true
-callout.shadow: true
-stored_data.shadow: true
-person.shadow: true
-diamond.shadow: true
-oval.shadow: true
-circle.shadow: true
-hexagon.shadow: true
-cloud.shadow: true
+rectangle.style.shadow: true
+square.style.shadow: true
+page.style.shadow: true
+parallelogram.style.shadow: true
+document.style.shadow: true
+cylinder.style.shadow: true
+queue.style.shadow: true
+package.style.shadow: true
+step.style.shadow: true
+callout.style.shadow: true
+stored_data.style.shadow: true
+person.style.shadow: true
+diamond.style.shadow: true
+oval.style.shadow: true
+circle.style.shadow: true
+hexagon.style.shadow: true
+cloud.style.shadow: true
 `,
 		},
 		{
@@ -153,8 +153,8 @@ square: {shape: "square"}
 
 rectangle -> square
 
-rectangle.3d: true
-square.3d: true
+rectangle.style.3d: true
+square.style.3d: true
 `,
 		},
 		{
@@ -1109,17 +1109,17 @@ scorer.t -> itemOutcome.t3: setFeedback(missingConcepts)`,
 			script: `shape: sequence_diagram
 
 scorer: {
-    stroke: red
-    stroke-width: 5
+    style.stroke: red
+    style.stroke-width: 5
 }
 
 scorer.abc: {
-    fill: yellow
-    stroke-width: 7
+    style.fill: yellow
+    style.stroke-width: 7
 }
 
 scorer -> itemResponse.a: {
-    stroke-width: 10
+    style.stroke-width: 10
 }
 itemResponse.a -> item.a.b
 item.a.b -> essayRubric.a.b.c