Rename AddCommandContext to TestCommandContext

Author: SimonBaeumer

cmd/commander/commander.go

@@ -76,7 +76,7 @@ test commander.yaml --filter=filter1 --filter=filter2
 			},
 		},
 		Action: func(c *cli.Context) error {
-			return app.TestCommand(c.Args().First(), app.NewAddContextFromCli(c))
+			return app.TestCommand(c.Args().First(), app.NewTestContextFromCli(c))
 		},
 	}
 }

pkg/app/app.go

@@ -11,18 +11,18 @@ const (
 	CommanderFile = "commander.yaml"
 )
 
-//AddCommandContext holds all flags for the add command
-type AddCommandContext struct {
+//TestCommandContext holds all flags for the add command
+type TestCommandContext struct {
 	Verbose    bool
 	NoColor    bool
 	Dir        bool
 	Concurrent int
 	Filters    []string
 }
 
-//NewAddContextFromCli is a constructor which creates the context
-func NewAddContextFromCli(c *cli.Context) AddCommandContext {
-	return AddCommandContext{
+//NewTestContextFromCli is a constructor which creates the context
+func NewTestContextFromCli(c *cli.Context) TestCommandContext {
+	return TestCommandContext{
 		Verbose:    c.Bool("verbose"),
 		NoColor:    c.Bool("no-color"),
 		Dir:        c.Bool("dir"),

pkg/app/app_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 )
 
-func TestNewAddCommandContextFromCli(t *testing.T) {
+func TestNewTestCommandContextFromCli(t *testing.T) {
 	set := flag.NewFlagSet("verbose", 0)
 	set.Bool("verbose", true, "")
 	set.Bool("no-color", true, "")
@@ -16,7 +16,7 @@ func TestNewAddCommandContextFromCli(t *testing.T) {
 	context := &cli.Context{}
 	ctx := cli.NewContext(nil, set, context)
 
-	r := NewAddContextFromCli(ctx)
+	r := NewTestContextFromCli(ctx)
 
 	assert.True(t, r.Verbose)
 	assert.True(t, r.NoColor)

pkg/app/test_command.go

@@ -18,7 +18,7 @@ var out output.OutputWriter
 // testPath is the path to the test suite config, it can be a dir or file
 // ctx holds the command flags. If directory scanning is enabled with --dir it is
 // not supported to filter tests, therefore testFilterTitle is an empty string
-func TestCommand(testPath string, ctx AddCommandContext) error {
+func TestCommand(testPath string, ctx TestCommandContext) error {
 	if ctx.Verbose {
 		log.SetOutput(os.Stdout)
 	}
@@ -65,8 +65,8 @@ func testDir(directory string, filters runtime.Filters) (runtime.Result, error)
 			continue // skip dirs
 		}
 
-		path := path.Join(directory, f.Name())
-		newResult, err := testFile(path, f.Name(), filters)
+		p := path.Join(directory, f.Name())
+		newResult, err := testFile(p, f.Name(), filters)
 		if err != nil {
 			return result, err
 		}

pkg/app/test_command_linux_test.go

@@ -20,7 +20,7 @@ tests:
 
 	assert.Nil(t, err)
 
-	got := TestCommand(TestSuiteFile, AddCommandContext{})
+	got := TestCommand(TestSuiteFile, TestCommandContext{})
 	assert.Nil(t, got)
 }
 
@@ -34,7 +34,7 @@ tests:
 
 	assert.Nil(t, err)
 
-	got := TestCommand(TestSuiteFile, AddCommandContext{})
+	got := TestCommand(TestSuiteFile, TestCommandContext{})
 	assert.Equal(t, "Test suite failed, use --verbose for more detailed output", got.Error())
 
 }
@@ -53,7 +53,7 @@ tests:
 
 	assert.Nil(t, err)
 
-	context := AddCommandContext{}
+	context := TestCommandContext{}
 	context.Filters = runtime.Filters{"my title"}
 	got := TestCommand(TestSuiteFile, context)
 	assert.Nil(t, got)

pkg/app/test_command_test.go

@@ -16,20 +16,20 @@ import (
 
 func Test_TestCommand_Verbose(t *testing.T) {
 	out := captureOutput(func() {
-		TestCommand("commander.yaml", AddCommandContext{Verbose: true})
+		TestCommand("commander.yaml", TestCommandContext{Verbose: true})
 		log.Println("test test test")
 	})
 
 	assert.Contains(t, out, "test test test")
 }
 
 func Test_TestCommand_DefaultFile(t *testing.T) {
-	err := TestCommand("", AddCommandContext{Verbose: true})
+	err := TestCommand("", TestCommandContext{Verbose: true})
 	assert.Contains(t, err.Error(), "commander.yaml")
 }
 
 func Test_TestCommand(t *testing.T) {
-	err := TestCommand("commander.yaml", AddCommandContext{})
+	err := TestCommand("commander.yaml", TestCommandContext{})
 
 	if runtime.GOOS == "windows" {
 		assert.Contains(t, err.Error(), "Error open commander.yaml:")
@@ -39,7 +39,7 @@ func Test_TestCommand(t *testing.T) {
 }
 
 func Test_TestCommand_ShouldUseCustomFile(t *testing.T) {
-	err := TestCommand("my-test.yaml", AddCommandContext{})
+	err := TestCommand("my-test.yaml", TestCommandContext{})
 
 	if runtime.GOOS == "windows" {
 		assert.Contains(t, err.Error(), "Error open my-test.yaml:")
@@ -49,7 +49,7 @@ func Test_TestCommand_ShouldUseCustomFile(t *testing.T) {
 }
 
 func Test_TestCommand_File_WithDir(t *testing.T) {
-	err := TestCommand("../../examples", AddCommandContext{})
+	err := TestCommand("../../examples", TestCommandContext{})
 
 	if runtime.GOOS == "windows" {
 		assert.Contains(t, err.Error(), "is a directory")
@@ -59,7 +59,7 @@ func Test_TestCommand_File_WithDir(t *testing.T) {
 }
 
 func Test_TestCommand_Dir(t *testing.T) {
-	err := TestCommand("../../examples", AddCommandContext{Dir: true})
+	err := TestCommand("../../examples", TestCommandContext{Dir: true})
 
 	if runtime.GOOS == "windows" {
 		assert.Contains(t, err.Error(), "Test suite failed, use --verbose for more detailed output")