Merge pull request cweill#81 from zacatac/master

Consider `isNaked` and subtests flags in for loop of function template.

README.md

@@ -30,20 +30,20 @@ Available options:
 
 ```
   -all           generate go tests for all functions and methods
-  
-  -excl          regexp. generate go tests for functions and methods that don't 
+
+  -excl          regexp. generate go tests for functions and methods that don't
                  match. Takes precedence over -only, -exported, and -all
-    	   
-  -exported      generate go tests for exported functions and methods. Takes 
+
+  -exported      generate go tests for exported functions and methods. Takes
                  precedence over -only and -all
 
   -i             print test inputs in error messages
-  
+
   -only          regexp. generate go tests for functions and methods that match only.
                  Takes precedence over -all
-  
+
   -w             write output to (test) files instead of stdout
-  
+
   -nosubtests    disable subtest generation. Only available for Go 1.7+
 
   -template_dir  optional. Path to a directory containing custom test code templates

gotests_test.go

@@ -559,6 +559,22 @@ func TestGenerateTests(t *testing.T) {
 			},
 			want: mustReadAndFormatGoFile(t, "testdata/goldens/existing_test_file_with_package_level_mixed_types_comments.go"),
 		},
+		{
+			name: "Naked function with subtests",
+			args: args{
+				srcPath:  "testdata/naked_function_with_subtests.go",
+				subtests: true,
+			},
+			want: mustReadAndFormatGoFile(t, "testdata/goldens/naked_function_with_subtests.go"),
+		},
+		{
+			name: "Naked function without subtests",
+			args: args{
+				srcPath:  "testdata/naked_function_without_subtests.go",
+				subtests: false,
+			},
+			want: mustReadAndFormatGoFile(t, "testdata/goldens/naked_function_without_subtests.go"),
+		},
 		{
 			name: "Test non existing template path",
 			args: args{

internal/render/templates/function.tmpl

@@ -41,7 +41,7 @@ func {{.TestName}}(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
-	for {{if not .IsNaked}} _, tt := {{end}} range tests {
+	for {{if (or .Subtests (not .IsNaked))}} _, tt := {{end}} range tests {
         {{- if .Subtests }}t.Run(tt.name, func(t *testing.T) { {{- end -}}
 			{{- with .Receiver}}
 				{{- if .IsStruct}}

testdata/bad_customtemplates/function.tmpl

@@ -41,7 +41,7 @@ func {{.TestName}}(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
-	for {{if not .IsNaked}} _, tt := {{end}} range testCases {
+	for {{if (or .Subtests (not .IsNaked))}} _, tt := {{end}} range testCases {
         {{- if .Subtests }}t.Run(tt.name, func(t *testing.T) { {{- end -}}
 			{{- with .Receiver}}
 				{{- if .IsStruct}}

testdata/customtemplates/function.tmpl

@@ -41,7 +41,7 @@ func {{.TestName}}(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 	}
-	for {{if not .IsNaked}} _, tt := {{end}} range testCases {
+	for {{if (or .Subtests (not .IsNaked))}} _, tt := {{end}} range testCases {
         {{- if .Subtests }}t.Run(tt.name, func(t *testing.T) { {{- end -}}
 			{{- with .Receiver}}
 				{{- if .IsStruct}}

testdata/goldens/naked_function_with_subtests.go

@@ -0,0 +1,29 @@
+package testdata
+
+import "testing"
+
+func Test_main(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			main()
+		})
+	}
+}
+
+func Test_do(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			do()
+		})
+	}
+}

testdata/goldens/naked_function_without_subtests.go

@@ -0,0 +1,25 @@
+package testdata
+
+import "testing"
+
+func Test_main(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		// TODO: Add test cases.
+	}
+	for range tests {
+		main()
+	}
+}
+
+func Test_do(t *testing.T) {
+	tests := []struct {
+		name string
+	}{
+		// TODO: Add test cases.
+	}
+	for range tests {
+		do()
+	}
+}

testdata/naked_function_with_subtests.go

@@ -0,0 +1,9 @@
+package testdata
+
+func main() {
+	do()
+}
+
+func do() {
+
+}

testdata/naked_function_without_subtests.go

@@ -0,0 +1,9 @@
+package testdata
+
+func main() {
+	do()
+}
+
+func do() {
+
+}