tests: cleanup test/templates and regen expected output

hofstadter-io · Aug 2, 2022 · abe48b0 · abe48b0
1 parent eef2383
commit abe48b0
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 17 deletions.
diff --git a/test/templates/gen.cue b/test/templates/gen.cue
@@ -58,12 +58,12 @@ TestGen: #TestGen & {
     // Defaults
     {
       TemplateContent: "Val.a = '{{ .Val.a }}'\n"
-      Filepath: "\(Outdir)/default.txt"
+      Filepath: "default.txt"
     },
     // Alternate delims
     {
       TemplateContent: "Val.a = '{% .Val.a %}'\n"
-      Filepath: "\(Outdir)/altdelim.txt"
+      Filepath: "altdelim.txt"
       TemplateDelims: {
 				LHS: "{%"
 				RHS: "%}"
@@ -76,35 +76,35 @@ TestGen: #TestGen & {
     // Named things
     {
       TemplatePath: "named"
-      Filepath: "\(Outdir)/named-things.txt"
+      Filepath: "named-things.txt"
     },
 
     // File based
     {
       TemplatePath: "template-file.txt"
-      Filepath: "\(Outdir)/template-file.txt"
+      Filepath: "template-file.txt"
     },
     {
       TemplatePath: "template-altfile.txt"
-      Filepath: "\(Outdir)/template-altfile.txt"
+      Filepath: "template-altfile.txt"
     },
 
     // User file
     {
       TemplateContent: "User file: '{{ file \"userfile.txt\" }}'\n"
-      Filepath: "\(Outdir)/user-file.txt"
+      Filepath: "user-file.txt"
     },
 
 		for F in _listFiles { F },
 		for F in mapFiles { F },
 
 		{
 			DatafileFormat: "cue" 
-			Filepath: "\(Outdir)/datafile-cue.cue"
+			Filepath: "datafile-cue.cue"
 		},
 		{
 			DatafileFormat: "json" 
-			Filepath: "\(Outdir)/datafile-json.json"
+			Filepath: "datafile-json.json"
 			Val: #A
 		},
 
@@ -114,7 +114,7 @@ TestGen: #TestGen & {
 	_listFiles: [ for idx, elem in In.Val.List {
 			{
 				TemplatePath: "template-elems.txt"
-				Filepath: "\(Outdir)/list-elem-\(idx).txt"
+				Filepath: "list-elem-\(idx).txt"
 				In: {
 					Elem: elem
 				}
@@ -124,7 +124,7 @@ TestGen: #TestGen & {
 	mapFiles: [ for key, elem in In.Val.Map {
 			{
 				TemplatePath: "template-elems.txt"
-				Filepath: "\(Outdir)/map-elem-\(key).txt"
+				Filepath: "map-elem-\(key).txt"
 				In: {
 					Elem: elem
 				}

diff --git a/test/templates/output/altdelim.txt b/test/templates/output/altdelim.txt
@@ -1 +1,2 @@
 Val.a = 'a'
+
diff --git a/test/templates/output/datafile-cue.cue b/test/templates/output/datafile-cue.cue
@@ -5,4 +5,4 @@
 		b: false
 		n: >0.0
 	}
-}
+}
diff --git a/test/templates/output/datafile-json.json b/test/templates/output/datafile-json.json
@@ -34,3 +34,4 @@
     }
   }
 }
+
diff --git a/test/templates/output/default.txt b/test/templates/output/default.txt
@@ -1 +1,2 @@
 Val.a = 'a'
+
diff --git a/test/templates/output/list-elem-0.txt b/test/templates/output/list-elem-0.txt
@@ -1,3 +1,4 @@
 a:
-  val: 1
+    val: 1
+
 
diff --git a/test/templates/output/list-elem-1.txt b/test/templates/output/list-elem-1.txt
@@ -1,3 +1,4 @@
 b:
-  val: 2
+    val: 2
+
 
diff --git a/test/templates/output/list-elem-2.txt b/test/templates/output/list-elem-2.txt
@@ -1,3 +1,4 @@
 c:
-  val: 3
+    val: 3
+
 
diff --git a/test/templates/output/map-elem-a.txt b/test/templates/output/map-elem-a.txt
@@ -1,2 +1,3 @@
 val: 1
 
+
diff --git a/test/templates/output/map-elem-b.txt b/test/templates/output/map-elem-b.txt
@@ -1,2 +1,3 @@
 val: 2
 
+
diff --git a/test/templates/output/map-elem-c.txt b/test/templates/output/map-elem-c.txt
@@ -1,2 +1,3 @@
 val: 3
 
+
diff --git a/test/templates/output/named-things.txt b/test/templates/output/named-things.txt
@@ -1 +1 @@
-embedded template is 'a'
+embedded template is 'a'
diff --git a/test/templates/output/static-cue.txt b/test/templates/output/static-cue.txt
@@ -1 +1 @@
-Hello, I am a static file in cue
+Hello, I am a static file in cue
diff --git a/test/templates/output/static/static-file.txt → test/templates/output/static-file.txt b/test/templates/output/static/static-file.txt → test/templates/output/static-file.txt
diff --git a/test/templates/output/template-altfile.txt b/test/templates/output/template-altfile.txt
@@ -5,3 +5,4 @@ Hi, I'm a template file on disk 'a'
 ---
 {% camelT "hell-world" %}
 ---
+
diff --git a/test/templates/output/template-file.txt b/test/templates/output/template-file.txt
@@ -5,3 +5,4 @@ Hi, I'm a template file on disk 'a'
 ---
 HellWorld
 ---
+
diff --git a/test/templates/output/user-file.txt b/test/templates/output/user-file.txt
@@ -1 +1,2 @@
-User file: 'ERROR: open userfile.txt: no such file or directory'
+User file: 'I'm a userfile used as content in a template
+'
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ @@
     		b: false
     		n: >0.0
     	}
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Hello, I am a static file in cue
		Hello, I am a static file in cue
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ Hi, I'm a template file on disk 'a'
		---
		{% camelT "hell-world" %}
		---
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ Hi, I'm a template file on disk 'a'
		---
		HellWorld
		---