Add runtine and validation tests

SimonBaeumer · SimonBaeumer · commit 26ec2b5c5792 · 2019-10-21T16:23:18.000+02:00
diff --git a/pkg/app/app.go b/pkg/app/app.go
@@ -13,7 +13,6 @@ const (
 type AddCommandContext struct {
 	Verbose    bool
 	NoColor    bool
-	Debug      bool
 	Concurrent int
 }
 
diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go
@@ -0,0 +1,24 @@
+package app
+
+import (
+	"flag"
+	"github.com/stretchr/testify/assert"
+	"github.com/urfave/cli"
+	"testing"
+)
+
+func TestNewAddCommandContextFromCli(t *testing.T) {
+	set := flag.NewFlagSet("verbose", 0)
+	set.Bool("verbose", true, "")
+	set.Bool("no-color", true, "")
+	set.Int("concurrent", 5, "")
+
+	context := &cli.Context{}
+	ctx := cli.NewContext(nil, set, context)
+
+	r := NewAddContextFromCli(ctx)
+
+	assert.True(t, r.Verbose)
+	assert.True(t, r.NoColor)
+	assert.Equal(t, 5, r.Concurrent)
+}
diff --git a/pkg/app/test_command_test.go b/pkg/app/test_command_test.go
@@ -1,11 +1,30 @@
 package app
 
 import (
+	"bytes"
 	"github.com/stretchr/testify/assert"
+	"io"
+	"log"
+	"os"
 	"runtime"
+	"sync"
 	"testing"
 )
 
+func Test_TestCommand_Verbose(t *testing.T) {
+	out := captureOutput(func() {
+		TestCommand("commander.yaml", "", AddCommandContext{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})
+	assert.Contains(t, err.Error(), "commander.yaml")
+}
+
 func Test_TestCommand(t *testing.T) {
 	err := TestCommand("commander.yaml", "", AddCommandContext{})
 
@@ -25,3 +44,33 @@ func Test_TestCommand_ShouldUseCustomFile(t *testing.T) {
 		assert.Equal(t, "Error open my-test.yaml: no such file or directory", err.Error())
 	}
 }
+
+func captureOutput(f func()) string {
+	reader, writer, err := os.Pipe()
+	if err != nil {
+		panic(err)
+	}
+	stdout := os.Stdout
+	stderr := os.Stderr
+	defer func() {
+		os.Stdout = stdout
+		os.Stderr = stderr
+		log.SetOutput(os.Stderr)
+	}()
+	os.Stdout = writer
+	os.Stderr = writer
+	log.SetOutput(writer)
+	out := make(chan string)
+	wg := new(sync.WaitGroup)
+	wg.Add(1)
+	go func() {
+		var buf bytes.Buffer
+		wg.Done()
+		io.Copy(&buf, reader)
+		out <- buf.String()
+	}()
+	wg.Wait()
+	f()
+	writer.Close()
+	return <-out
+}
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -199,22 +199,13 @@ func runTest(test TestCase) TestResult {
 		Stderr:   strings.TrimSpace(strings.Replace(cut.Stderr(), "\r\n", "\n", -1)),
 	}
 
-	log.Println("title: '" + test.Title + "'", " ExitCode: ", test.Result.ExitCode)
-	log.Println("title: '" + test.Title + "'", " Stdout: ", test.Result.Stdout)
-	log.Println("title: '" + test.Title + "'", " Stderr: ", test.Result.Stderr)
+	log.Println("title: '"+test.Title+"'", " ExitCode: ", test.Result.ExitCode)
+	log.Println("title: '"+test.Title+"'", " Stdout: ", test.Result.Stdout)
+	log.Println("title: '"+test.Title+"'", " Stderr: ", test.Result.Stderr)
 
 	return Validate(test)
 }
 
-// trimSpace implementation to trim CLRF off
-func trimSpace(s string) string {
-	result := strings.TrimSpace(s)
-	if runtime.GOOS == "windows" {
-		return strings.Trim(s, "\r\n")
-	}
-	return result
-}
-
 func createEnvVarsOption(test TestCase) func(c *cmd.Command) {
 	return func(c *cmd.Command) {
 		// Add all env variables from parent process
diff --git a/pkg/runtime/runtime_darwin_test.go b/pkg/runtime/runtime_darwin_test.go
@@ -1,44 +1,44 @@
 package runtime
 
 import (
-    "github.com/stretchr/testify/assert"
-    "os"
-    "testing"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
 )
 
 func TestRuntime_WithInheritFromShell(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    defer os.Unsetenv("TEST_COMMANDER")
+	os.Setenv("TEST_COMMANDER", "test")
+	defer os.Unsetenv("TEST_COMMANDER")
 
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo $TEST_COMMANDER",
-            InheritEnv: true,
-        },
-    }
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo $TEST_COMMANDER",
+			InheritEnv: true,
+		},
+	}
 
-    got := runTest(test)
+	got := runTest(test)
 
-    assert.Equal(t, "test", got.TestCase.Result.Stdout)
+	assert.Equal(t, "test", got.TestCase.Result.Stdout)
 }
 
 func TestRuntime_WithInheritFromShell_Overwrite(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    os.Setenv("ANOTHER_ENV", "from-parent")
-    defer func() {
-        os.Unsetenv("TEST_COMMANDER")
-        os.Unsetenv("ANOTHER_ENV")
-    }()
-
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo $TEST_COMMANDER $ANOTHER_ENV",
-            InheritEnv: true,
-            Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
-        },
-    }
-
-    got := runTest(test)
-
-    assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
-}
+	os.Setenv("TEST_COMMANDER", "test")
+	os.Setenv("ANOTHER_ENV", "from-parent")
+	defer func() {
+		os.Unsetenv("TEST_COMMANDER")
+		os.Unsetenv("ANOTHER_ENV")
+	}()
+
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo $TEST_COMMANDER $ANOTHER_ENV",
+			InheritEnv: true,
+			Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
+		},
+	}
+
+	got := runTest(test)
+
+	assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
+}
diff --git a/pkg/runtime/runtime_linux_test.go b/pkg/runtime/runtime_linux_test.go
@@ -1,44 +1,44 @@
 package runtime
 
 import (
-    "github.com/stretchr/testify/assert"
-    "os"
-    "testing"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
 )
 
 func TestRuntime_WithInheritFromShell(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    defer os.Unsetenv("TEST_COMMANDER")
+	os.Setenv("TEST_COMMANDER", "test")
+	defer os.Unsetenv("TEST_COMMANDER")
 
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo $TEST_COMMANDER",
-            InheritEnv: true,
-        },
-    }
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo $TEST_COMMANDER",
+			InheritEnv: true,
+		},
+	}
 
-    got := runTest(test)
+	got := runTest(test)
 
-    assert.Equal(t, "test", got.TestCase.Result.Stdout)
+	assert.Equal(t, "test", got.TestCase.Result.Stdout)
 }
 
 func TestRuntime_WithInheritFromShell_Overwrite(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    os.Setenv("ANOTHER_ENV", "from-parent")
-    defer func() {
-        os.Unsetenv("TEST_COMMANDER")
-        os.Unsetenv("ANOTHER_ENV")
-    }()
-
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo $TEST_COMMANDER $ANOTHER_ENV",
-            InheritEnv: true,
-            Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
-        },
-    }
-
-    got := runTest(test)
-
-    assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
-}
+	os.Setenv("TEST_COMMANDER", "test")
+	os.Setenv("ANOTHER_ENV", "from-parent")
+	defer func() {
+		os.Unsetenv("TEST_COMMANDER")
+		os.Unsetenv("ANOTHER_ENV")
+	}()
+
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo $TEST_COMMANDER $ANOTHER_ENV",
+			InheritEnv: true,
+			Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
+		},
+	}
+
+	got := runTest(test)
+
+	assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
+}
diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go
@@ -49,7 +49,7 @@ func TestRuntime_WithRetriesAndInterval(t *testing.T) {
 	s[0].Command.Interval = "50ms"
 
 	start := time.Now()
-	got := Start(s, 1)
+	got := Start(s, 0)
 
 	var counter = 0
 	for r := range got {
diff --git a/pkg/runtime/runtime_windows_test.go b/pkg/runtime/runtime_windows_test.go
@@ -1,44 +1,44 @@
 package runtime
 
 import (
-    "github.com/stretchr/testify/assert"
-    "os"
-    "testing"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
 )
 
 func TestRuntime_WithInheritFromShell(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    defer os.Unsetenv("TEST_COMMANDER")
+	os.Setenv("TEST_COMMANDER", "test")
+	defer os.Unsetenv("TEST_COMMANDER")
 
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo %TEST_COMMANDER%",
-            InheritEnv: true,
-        },
-    }
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo %TEST_COMMANDER%",
+			InheritEnv: true,
+		},
+	}
 
-    got := runTest(test)
+	got := runTest(test)
 
-    assert.Equal(t, "test", got.TestCase.Result.Stdout)
+	assert.Equal(t, "test", got.TestCase.Result.Stdout)
 }
 
 func TestRuntime_WithInheritFromShell_Overwrite(t *testing.T) {
-    os.Setenv("TEST_COMMANDER", "test")
-    os.Setenv("ANOTHER_ENV", "from-parent")
-    defer func() {
-        os.Unsetenv("TEST_COMMANDER")
-        os.Unsetenv("ANOTHER_ENV")
-    }()
-
-    test := TestCase{
-        Command: CommandUnderTest{
-            Cmd:        "echo %TEST_COMMANDER% %ANOTHER_ENV%",
-            InheritEnv: true,
-            Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
-        },
-    }
-
-    got := runTest(test)
-
-    assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
+	os.Setenv("TEST_COMMANDER", "test")
+	os.Setenv("ANOTHER_ENV", "from-parent")
+	defer func() {
+		os.Unsetenv("TEST_COMMANDER")
+		os.Unsetenv("ANOTHER_ENV")
+	}()
+
+	test := TestCase{
+		Command: CommandUnderTest{
+			Cmd:        "echo %TEST_COMMANDER% %ANOTHER_ENV%",
+			InheritEnv: true,
+			Env:        map[string]string{"TEST_COMMANDER": "overwrite"},
+		},
+	}
+
+	got := runTest(test)
+
+	assert.Equal(t, "overwrite from-parent", got.TestCase.Result.Stdout)
 }
diff --git a/pkg/runtime/validator_test.go b/pkg/runtime/validator_test.go

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ const (`
`13`	`13`	`type AddCommandContext struct {`
`14`	`14`	`Verbose bool`
`15`	`15`	`NoColor bool`
`16`		`- Debug bool`
`17`	`16`	`Concurrent int`
`18`	`17`	`}`
`19`	`18`