From eae8fdeb29cf62eff37f4be47c25f484eeba191e Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Thu, 2 Mar 2023 20:02:36 -0800
Subject: [PATCH] e2etests-cli: Add pad test and cleanup

---
 e2etests-cli/main_test.go                     |  28 +++++++++++++++---
 .../testdata/TestCLI_E2E/hello_world.exp.png  | Bin 3041 -> 0 bytes
 .../TestCLI_E2E/hello_world_png.exp.png       | Bin 0 -> 15325 bytes
 .../TestCLI_E2E/hello_world_png_pad.exp.png   | Bin 0 -> 15325 bytes
 go.sum                                        |   2 --
 5 files changed, 24 insertions(+), 6 deletions(-)
 delete mode 100644 e2etests-cli/testdata/TestCLI_E2E/hello_world.exp.png
 create mode 100644 e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png
 create mode 100644 e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png

diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go
index 1718566f8..e5b3e5852 100644
--- a/e2etests-cli/main_test.go
+++ b/e2etests-cli/main_test.go
@@ -20,12 +20,22 @@ func TestCLI_E2E(t *testing.T) {
 		run  func(t *testing.T, ctx context.Context, dir string, env *xos.Env)
 	}{
 		{
-			name: "hello_world",
+			name: "hello_world_png",
 			run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) {
-				assert.WriteFile(t, filepath.Join(dir, "hello-world.d2"), []byte(`x -> y`), 0644)
-				err := runTestMain(t, ctx, dir, env, "hello-world.d2",  "hello-world.png")
+				writeFile(t, dir, "hello-world.d2", `x -> y`)
+				err := runTestMain(t, ctx, dir, env, "hello-world.d2", "hello-world.png")
 				assert.Success(t, err)
-				png := assert.ReadFile(t, filepath.Join(dir, "hello-world.png"))
+				png := readFile(t, dir, "hello-world.png")
+				assert.Testdata(t, ".png", png)
+			},
+		},
+		{
+			name: "hello_world_png_pad",
+			run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) {
+				writeFile(t, dir, "hello-world.d2", `x -> y`)
+				err := runTestMain(t, ctx, dir, env, "-pad 4000", "hello-world.d2", "hello-world.png")
+				assert.Success(t, err)
+				png := readFile(t, dir, "hello-world.png")
 				assert.Testdata(t, ".png", png)
 			},
 		},
@@ -67,3 +77,13 @@ func runTestMain(tb testing.TB, ctx context.Context, dir string, env *xos.Env, a
 	defer tms.Cleanup(tb)
 	return tms.Wait(ctx)
 }
+
+func writeFile(tb testing.TB, dir, fp, data string) {
+	tb.Helper()
+	assert.WriteFile(tb, filepath.Join(dir, fp), []byte(data), 0644)
+}
+
+func readFile(tb testing.TB, dir, fp string) []byte {
+	tb.Helper()
+	return assert.ReadFile(tb, filepath.Join(dir, fp))
+}
diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world.exp.png
deleted file mode 100644
index 45c9386f922beeae80d8a9e9b8e54f2c0e36607e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3041
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

diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png
new file mode 100644
index 0000000000000000000000000000000000000000..613ca9a6337b4c45eed3355693af6b4305db717c
GIT binary patch
literal 15325
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

literal 0
HcmV?d00001

diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png
new file mode 100644
index 0000000000000000000000000000000000000000..613ca9a6337b4c45eed3355693af6b4305db717c
GIT binary patch
literal 15325
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

literal 0
HcmV?d00001

diff --git a/go.sum b/go.sum
index 1a687a2ae..d8c5c9272 100644
--- a/go.sum
+++ b/go.sum
@@ -277,8 +277,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-oss.terrastruct.com/util-go v0.0.0-20230301015829-35b30391c74d h1:+1Bp2bYA7bieedJuqbiwOLhnMs6GQQLB4sNX7BcDbSQ=
-oss.terrastruct.com/util-go v0.0.0-20230301015829-35b30391c74d/go.mod h1:Fwy72FDIOOM4K8F96ScXkxHHppR1CPfUyo9+x9c1PBU=
 oss.terrastruct.com/util-go v0.0.0-20230303033840-484c630faa46 h1:pVcaRgqhNDXtWlsHg1cAy7BRycDiOaAEBexCFgMyUxQ=
 oss.terrastruct.com/util-go v0.0.0-20230303033840-484c630faa46/go.mod h1:Fwy72FDIOOM4K8F96ScXkxHHppR1CPfUyo9+x9c1PBU=
 rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=