tests: Delete unnecessary template prefix parameter

The template name doesn't need to be globally unique.

Author: rhansen

internal/template/functions_test.go

@@ -47,7 +47,7 @@ func TestKeys(t *testing.T) {
 		{`{{range (keys $)}}{{.}}{{end}}`, env, `VIRTUAL_HOST`},
 	}
 
-	tests.run(t, "keys")
+	tests.run(t)
 }
 
 func TestKeysEmpty(t *testing.T) {
@@ -116,7 +116,7 @@ func TestSplitN(t *testing.T) {
 		{`{{len (splitN . "/" 2)}}`, "example.com", `1`},
 	}
 
-	tests.run(t, "splitN")
+	tests.run(t)
 }
 
 func TestTrimPrefix(t *testing.T) {
@@ -250,7 +250,7 @@ func TestParseJson(t *testing.T) {
 		{`{{index (parseJson . | first) "enabled"}}`, `[{"enabled":true}]`, `true`},
 	}
 
-	tests.run(t, "parseJson")
+	tests.run(t)
 }
 
 func TestQueryEscape(t *testing.T) {
@@ -261,7 +261,7 @@ func TestQueryEscape(t *testing.T) {
 		{`{{queryEscape .}}`, `~^example\.com(\..*\.xip\.io)?$`, `~%5Eexample%5C.com%28%5C..%2A%5C.xip%5C.io%29%3F%24`},
 	}
 
-	tests.run(t, "queryEscape")
+	tests.run(t)
 }
 
 func TestArrayClosestExact(t *testing.T) {
@@ -299,7 +299,7 @@ func TestWhen(t *testing.T) {
 		{`{{ when (not (eq .StringValue "foo")) "first" "second" | print }}`, context, `second`},
 	}
 
-	tests.run(t, "when")
+	tests.run(t)
 }
 
 func TestWhenTrue(t *testing.T) {

internal/template/template_test.go

@@ -2,11 +2,10 @@ package template
 
 import (
 	"bytes"
-	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 	"testing"
-	"text/template"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -17,23 +16,22 @@ type templateTestList []struct {
 	expected string
 }
 
-func (tests templateTestList) run(t *testing.T, prefix string) {
+func (tests templateTestList) run(t *testing.T) {
 	for n, test := range tests {
 		test := test
-		tmplName := fmt.Sprintf("%s-test-%d", prefix, n)
-		t.Run(tmplName, func(t *testing.T) {
+		t.Run(strconv.Itoa(n), func(t *testing.T) {
 			t.Parallel()
-			tmpl := template.Must(newTemplate(tmplName).Parse(test.tmpl))
+			tmpl := template.Must(newTemplate("testTemplate").Parse(test.tmpl))
 
 			var b bytes.Buffer
-			err := tmpl.ExecuteTemplate(&b, tmplName, test.context)
+			err := tmpl.ExecuteTemplate(&b, "testTemplate", test.context)
 			if err != nil {
-				t.Fatalf("Error executing template: %v (test %s)", err, tmplName)
+				t.Fatalf("Error executing template: %v", err)
 			}
 
 			got := b.String()
 			if test.expected != got {
-				t.Fatalf("Incorrect output found; expected %s, got %s (test %s)", test.expected, got, tmplName)
+				t.Fatalf("Incorrect output found; expected %s, got %s", test.expected, got)
 			}
 		})
 	}

internal/template/where_test.go

@@ -68,7 +68,7 @@ func TestWhere(t *testing.T) {
 		},
 	}
 
-	tests.run(t, "where")
+	tests.run(t)
 }
 
 func TestWhereNot(t *testing.T) {
@@ -133,7 +133,7 @@ func TestWhereNot(t *testing.T) {
 		},
 	}
 
-	tests.run(t, "whereNot")
+	tests.run(t)
 }
 
 func TestWhereExist(t *testing.T) {
@@ -173,7 +173,7 @@ func TestWhereExist(t *testing.T) {
 		{`{{whereExist . "Env.VIRTUAL_PROTO" | len}}`, containers, `1`},
 	}
 
-	tests.run(t, "whereExist")
+	tests.run(t)
 }
 
 func TestWhereNotExist(t *testing.T) {
@@ -213,7 +213,7 @@ func TestWhereNotExist(t *testing.T) {
 		{`{{whereNotExist . "Env.VIRTUAL_PROTO" | len}}`, containers, `3`},
 	}
 
-	tests.run(t, "whereNotExist")
+	tests.run(t)
 }
 
 func TestWhereSomeMatch(t *testing.T) {
@@ -251,7 +251,7 @@ func TestWhereSomeMatch(t *testing.T) {
 		{`{{whereAny . "Env.NOEXIST" "," (split "demo3.localhost" ",") | len}}`, containers, `0`},
 	}
 
-	tests.run(t, "whereAny")
+	tests.run(t)
 }
 
 func TestWhereRequires(t *testing.T) {
@@ -289,7 +289,7 @@ func TestWhereRequires(t *testing.T) {
 		{`{{whereAll . "Env.NOEXIST" "," (split "demo3.localhost" ",") | len}}`, containers, `0`},
 	}
 
-	tests.run(t, "whereAll")
+	tests.run(t)
 }
 
 func TestWhereLabelExists(t *testing.T) {
@@ -315,7 +315,7 @@ func TestWhereLabelExists(t *testing.T) {
 		{`{{whereLabelExists . "com.example.baz" | len}}`, containers, `0`},
 	}
 
-	tests.run(t, "whereLabelExists")
+	tests.run(t)
 }
 
 func TestWhereLabelDoesNotExist(t *testing.T) {
@@ -341,7 +341,7 @@ func TestWhereLabelDoesNotExist(t *testing.T) {
 		{`{{whereLabelDoesNotExist . "com.example.baz" | len}}`, containers, `2`},
 	}
 
-	tests.run(t, "whereLabelDoesNotExist")
+	tests.run(t)
 }
 
 func TestWhereLabelValueMatches(t *testing.T) {
@@ -370,5 +370,5 @@ func TestWhereLabelValueMatches(t *testing.T) {
 		{`{{whereLabelValueMatches . "com.example.baz" ".*" | len}}`, containers, `0`},
 	}
 
-	tests.run(t, "whereLabelValueMatches")
+	tests.run(t)
 }