Change tests so they pass

josephspurrier · Jul 24, 2018 · 8fb4a23 · 8fb4a23
1 parent f65a183
commit 8fb4a23
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 66 deletions.
diff --git a/src/app/gogen/testdata/.gitignore b/src/app/gogen/testdata/.gitignore
@@ -0,0 +1 @@
+actual/
diff --git a/src/app/gogen/testdata/actual/model/foo/foo.go b/src/app/gogen/testdata/actual/model/foo/foo.go
diff --git a/src/app/gogen/testdata/expected/view/foo/index.tmpl b/src/app/gogen/testdata/expected/view/foo/index.tmpl
@@ -1,9 +1,9 @@
-{{define "title"}}Items{{end}}
-{{define "head"}}{{end}}
-{{define "content"}}
+[[define "title"]]Items[[end]]
+[[define "head"]][[end]]
+[[define "content"]]
 	<div class="page-header">
-		{{.model}}
+		[[.model]]
 	</div>	
-	{{template "footer" .}}
-{{end}}
-{{define "foot"}}{{end}}
+	[[template "footer" .]]
+[[end]]
+[[define "foot"]][[end]]
diff --git a/src/app/gogen/testdata/expected/view/viewtest/index.tmpl b/src/app/gogen/testdata/expected/view/viewtest/index.tmpl
@@ -1,9 +1,9 @@
-{{define "title"}}Items{{end}}
-{{define "head"}}{{end}}
-{{define "content"}}
+[[define "title"]]Items[[end]]
+[[define "head"]][[end]]
+[[define "content"]]
 	<div class="page-header">
-		{{.model}}
+		[[.model]]
 	</div>	
-	{{template "footer" .}}
-{{end}}
-{{define "foot"}}{{end}}
+	[[template "footer" .]]
+[[end]]
+[[define "foot"]][[end]]
diff --git a/src/app/gogen/testdata/generate/collection/bad.json b/src/app/gogen/testdata/generate/collection/bad.json
@@ -3,10 +3,10 @@
 	"config.collection": [
 		{
 			"single/default": {
-				"package": "{{.package}}",
-				"table": "{{.model}}"
+				"package": "[[.package]]",
+				"table": "[[.model]]"
 			}
 		}
 	],
 	"model": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/badcollectionitem.json b/src/app/gogen/testdata/generate/collection/badcollectionitem.json
@@ -6,11 +6,11 @@
 		},
 		{
 			"single/noparse": {
-				"model": "{{.view}}"
+				"model": "[[.view]]"
 			}
 		}
 	],
 	"model": "",
 	"package": "",
 	"view": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/default.json b/src/app/gogen/testdata/generate/collection/default.json
@@ -3,17 +3,17 @@
 	"config.collection": [
 		{
 			"single/default": {
-				"package": "{{.package}}",
-				"table": "{{.model}}"
+				"package": "[[.package]]",
+				"table": "[[.model]]"
 			}
 		},
 		{
 			"single/noparse": {
-				"model": "{{.view}}"
+				"model": "[[.view]]"
 			}
 		}
 	],
 	"model": "",
 	"package": "",
 	"view": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/dualcollection.json b/src/app/gogen/testdata/generate/collection/dualcollection.json
@@ -3,13 +3,13 @@
 	"config.collection": [
 		{
 			"collection/default": {
-				"model": "{{.model}}",
-				"package": "{{.package}}",
-				"view": "{{.view}}"
+				"model": "[[.model]]",
+				"package": "[[.package]]",
+				"view": "[[.view]]"
 			}
 		}
 	],
 	"model": "",
 	"package": "",
 	"view": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/dualcollectiontypeinvalid.json b/src/app/gogen/testdata/generate/collection/dualcollectiontypeinvalid.json
@@ -3,11 +3,11 @@
 	"config.collection": [
 		{
 			"single/wrongtype": {
-				"table": "{{.table}}",
-				"package": "{{.package}}"
+				"table": "[[.table]]",
+				"package": "[[.package]]"
 			}
 		}
 	],
 	"table": "",
 	"package": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/dualcollectiontypemissing.json b/src/app/gogen/testdata/generate/collection/dualcollectiontypemissing.json
@@ -3,11 +3,11 @@
 	"config.collection": [
 		{
 			"single/missingtype": {
-				"table": "{{.table}}",
-				"package": "{{.package}}"
+				"table": "[[.table]]",
+				"package": "[[.package]]"
 			}
 		}
 	],
 	"table": "",
 	"package": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/collection/missingcollection.json b/src/app/gogen/testdata/generate/collection/missingcollection.json
@@ -3,17 +3,17 @@
 	"config.collectionz": [
 		{
 			"single/default": {
-				"package": "{{.package}}",
-				"table": "{{.model}}"
+				"package": "[[.package]]",
+				"table": "[[.model]]"
 			}
 		},
 		{
 			"single/noparse": {
-				"model": "{{.view}}"
+				"model": "[[.view]]"
 			}
 		}
 	],
 	"model": "",
 	"package": "",
 	"view": ""
-}
+}
diff --git a/src/app/gogen/testdata/generate/single/bad.gen b/src/app/gogen/testdata/generate/single/bad.gen
@@ -1,7 +1,7 @@
-// Package {{.package}}.
-package {{.package}}
+// Package [[.package]].
+package [[.package]]
 
 var (
 	// table name.
-	table = "{{.table}}"
+	table = "[[.table]]"
 )
diff --git a/src/app/gogen/testdata/generate/single/bad.json b/src/app/gogen/testdata/generate/single/bad.json
@@ -1,5 +1,5 @@
 {
 	"config.type": "single",
-	"config.output": "model/{{.package}}/{{.package}}.go",
+	"config.output": "model/[[.package]]/[[.package]].go",
 	"package": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/badjson.json b/src/app/gogen/testdata/generate/single/badjson.json
@@ -1,5 +1,5 @@
 {
 	"config.type": "single",
-	"config.output": "model/{{.package}}/{{.package}}.go",
-	"package": "",
+	"config.output": "model/[[.package]]/[[.package]].go",
+	"package": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/default.gen b/src/app/gogen/testdata/generate/single/default.gen
@@ -1,7 +1,7 @@
-// Package {{.package}}.
-package {{.package}}
+// Package [[.package]].
+package [[.package]]
 
 var (
 	// table name.
-	table = "{{.table}}"
+	table = "[[.table]]"
 )
diff --git a/src/app/gogen/testdata/generate/single/default.json b/src/app/gogen/testdata/generate/single/default.json
@@ -1,6 +1,6 @@
 {
 	"config.type": "single",
-	"config.output": "model/{{.package}}/{{.package}}.go",
+	"config.output": "model/[[.package]]/[[.package]].go",
 	"package": "",
 	"table": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/missgen.json b/src/app/gogen/testdata/generate/single/missgen.json
@@ -1,5 +1,5 @@
 {
 	"config.type": "single",
-	"config.output": "model/{{.package}}/{{.package}}.go",
+	"config.output": "model/[[.package]]/[[.package]].go",
 	"package": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/missingoutput.json b/src/app/gogen/testdata/generate/single/missingoutput.json
@@ -1,6 +1,6 @@
 {
 	"config.type": "single",
-	"config.outputz": "model/{{.package}}/{{.package}}.go",
+	"config.outputz": "model/[[.package]]/[[.package]].go",
 	"package": "",
 	"table": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/missingtype.json b/src/app/gogen/testdata/generate/single/missingtype.json
@@ -1,6 +1,6 @@
 {
 	"config.typez": "single",
-	"config.output": "model/{{.package}}/{{.package}}.go",
+	"config.output": "model/[[.package]]/[[.package]].go",
 	"package": "",
 	"table": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/noparse.gen b/src/app/gogen/testdata/generate/single/noparse.gen
@@ -1,9 +1,9 @@
-{{define "title"}}Items{{end}}
-{{define "head"}}{{end}}
-{{define "content"}}
+[[define "title"]]Items[[end]]
+[[define "head"]][[end]]
+[[define "content"]]
 	<div class="page-header">
-		{{.model}}
+		[[.model]]
 	</div>	
-	{{template "footer" .}}
-{{end}}
-{{define "foot"}}{{end}}
+	[[template "footer" .]]
+[[end]]
+[[define "foot"]][[end]]
diff --git a/src/app/gogen/testdata/generate/single/noparse.json b/src/app/gogen/testdata/generate/single/noparse.json
@@ -1,6 +1,6 @@
 {
 	"config.type": "single",
-	"config.output": "view/{{.model}}/index.tmpl",
+	"config.output": "view/[[.model]]/index.tmpl",
 	"config.parse": false,
 	"model": ""
 }
diff --git a/src/app/gogen/testdata/generate/single/wrongtype.json b/src/app/gogen/testdata/generate/single/wrongtype.json
@@ -1,6 +1,6 @@
 {
 	"config.type": "random",
-	"config.output": "model/{{.package}}/{{.package}}.go",
+	"config.output": "model/[[.package]]/[[.package]].go",
 	"package": "",
 	"table": ""
 }