run tests through the cli for better coverage

Author: clipperhouse

custom_test.go

@@ -12,10 +12,13 @@ func TestCustom(t *testing.T) {
 	setCustomName("_gen_test.go")
 	defer revertCustomName()
 
-	// ensure that generated _gen.go uses the same imports as built into this package
-	custom()
+	// create custom file
+	if err := runMain([]string{"gen", "custom"}); err != nil {
+		t.Error(err)
+	}
 	defer os.Remove(customName)
 
+	// ensure that generated _gen.go uses the same imports as built into this package
 	fset := token.NewFileSet()
 	c, err := parser.ParseFile(fset, customName, nil, parser.ImportsOnly)
 

execute.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"bytes"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strings"
 	"text/template"
 )
 
@@ -81,10 +79,6 @@ func executeCustom(src io.Reader, imports []string, body string) error {
 	return nil
 }
 
-func trimBuffer(b bytes.Buffer) string {
-	return strings.Trim(b.String(), "\n")
-}
-
 // set up temp directory under current directory
 // make sure to defer os.RemoveAll() in caller
 func getTempDir() (string, error) {

get_test.go

@@ -70,7 +70,12 @@ func TestGetImports(t *testing.T) {
 	}
 
 	// custom get
-	if err := get([]string{}); err != nil {
+	if err := runMain([]string{"gen", "get"}); err != nil {
+		t.Error(err)
+	}
+
+	// custom get with param
+	if err := runMain([]string{"gen", "get", "-d"}); err != nil {
 		t.Error(err)
 	}
 }

help_test.go

@@ -11,12 +11,23 @@ func TestHelp(t *testing.T) {
 	setOutput(&b)
 	defer revertOutput()
 
-	// just run it; not a great test but at least covers the code
-	if err := help(); err != nil {
+	if err := runMain([]string{"gen", "help"}); err != nil {
 		t.Error(err)
 	}
 
 	if b.Len() == 0 {
 		t.Errorf("help() should have resulted in output")
 	}
+
+	// grab the text for later comparison
+	text := b.String()
+	b.Reset()
+
+	if err := runMain([]string{"gen", "foo"}); err != nil {
+		t.Error(err)
+	}
+
+	if text != b.String() {
+		t.Errorf("running an unknown command should return help text; returned %s", b.String())
+	}
 }

list_test.go

@@ -20,7 +20,7 @@ func TestList(t *testing.T) {
 	os.Remove(customName)
 
 	// standard
-	if err := list(); err != nil {
+	if err := runMain([]string{"gen", "list"}); err != nil {
 		t.Error(err)
 	}
 
@@ -56,7 +56,7 @@ func TestList(t *testing.T) {
 	}
 
 	// custom file now exists
-	if err := list(); err != nil {
+	if err := runMain([]string{"gen", "list"}); err != nil {
 		t.Error(err)
 	}
 

main.go

@@ -12,29 +12,29 @@ func main() {
 		}
 	}()
 
-	args := os.Args
+	err = runMain(os.Args)
+}
 
+func runMain(args []string) error {
 	if len(args) == 1 {
 		// simply typed 'gen'; run is the default command
-		err = run()
-		return // see defer
+		return run()
 	}
 
 	cmd := args[1]
 
 	switch cmd {
 	case "custom":
-		err = custom()
+		return custom()
 	case "get":
 		var tail []string
 		if len(args) > 2 {
 			tail = args[2:]
 		}
-		err = get(tail)
+		return get(tail)
 	case "list":
-		err = list()
+		return list()
 	default:
-		err = help()
+		return help()
 	}
-	return // see defer
 }

run_test.go

@@ -22,7 +22,7 @@ func TestRun(t *testing.T) {
 	os.Remove(fooName)
 
 	// standard run
-	if err := run(); err != nil {
+	if err := runMain([]string{"gen"}); err != nil {
 		t.Error(err)
 	}
 
@@ -59,7 +59,7 @@ func TestRun(t *testing.T) {
 	}
 
 	// custom run
-	if err := run(); err != nil {
+	if err := runMain([]string{"gen"}); err != nil {
 		t.Error(err)
 	}