Add assertion for different os line break inidicators

Author: SimonBaeumer

.travis.yml

@@ -32,7 +32,7 @@ jobs:
       before_install:
         - choco install make
       script:
-        - make test
+        - make test-windows
 
     - name: Unit tests
       before_script:

command.go

@@ -24,8 +24,8 @@ type Command struct {
 	executed     bool
 	exitCode     int
 	// stderr and stdout retrieve the output after the command was executed
-	stderr       bytes.Buffer
-	stdout       bytes.Buffer
+	stderr bytes.Buffer
+	stdout bytes.Buffer
 }
 
 // NewCommand creates a new command

command_linux_test.go

@@ -62,7 +62,7 @@ func TestCommand_WithStandardStreams(t *testing.T) {
 	cmd := NewCommand("echo hey", WithStandardStreams)
 	cmd.Execute()
 
-	r, err  := ioutil.ReadFile(tmpFile.Name())
+	r, err := ioutil.ReadFile(tmpFile.Name())
 	assert.Nil(t, err)
 	assert.Equal(t, "hey\n", string(r))
 }

command_test.go

@@ -22,11 +22,7 @@ func TestCommand_Execute(t *testing.T) {
 
 	assert.Nil(t, err)
 	assert.True(t, cmd.Executed())
-	if runtime.GOOS == "windows" {
-		assert.Equal(t, cmd.Stdout(), "hello\r\n")
-	} else {
-		assert.Equal(t, cmd.Stdout(), "hello\n")
-	}
+	assertEqualWithLineBreak(t, "hello", cmd.Stdout())
 }
 
 func TestCommand_ExitCode(t *testing.T) {
@@ -48,7 +44,7 @@ func TestCommand_WithEnvVariables(t *testing.T) {
 
 	_ = cmd.Execute()
 
-	assert.Equal(t, cmd.Stdout(), "hey\n")
+	assertEqualWithLineBreak(t, "hey", cmd.Stdout())
 }
 
 func TestCommand_Executed(t *testing.T) {
@@ -81,7 +77,7 @@ func TestCommand_AddEnvWithShellVariable(t *testing.T) {
 	err := c.Execute()
 
 	assert.Nil(t, err)
-	assert.Equal(t, "test from shell\n", c.Stdout())
+	assertEqualWithLineBreak(t, "test from shell", c.Stdout())
 }
 
 func TestCommand_AddMultipleEnvWithShellVariable(t *testing.T) {
@@ -101,7 +97,7 @@ func TestCommand_AddMultipleEnvWithShellVariable(t *testing.T) {
 	err := c.Execute()
 
 	assert.Nil(t, err)
-	assert.Equal(t, "Hello world, I am Simon\n", c.Stdout())
+	assertEqualWithLineBreak(t, "Hello world, I am Simon", c.Stdout())
 }
 
 func getCommand() string {
@@ -153,5 +149,15 @@ func TestCommand_SetOptions(t *testing.T) {
 
 	assert.Nil(t, err)
 	assert.Equal(t, time.Duration(1000000000), c.Timeout)
-	assert.Equal(t, "test\n", writer.String())
+	assertEqualWithLineBreak(t, "test", writer.String())
+}
+
+func assertEqualWithLineBreak(t *testing.T, expected string, actual string) {
+	if runtime.GOOS == "windows" {
+		expected = expected + "\r\n"
+	} else {
+		expected = expected + "\n"
+	}
+
+	assert.Equal(t, expected, actual)
 }

command_windows_test.go

@@ -12,7 +12,7 @@ func TestCommand_ExecuteStderr(t *testing.T) {
 	err := cmd.Execute()
 
 	assert.Nil(t, err)
-	assert.Equal(t, "hello ", cmd.Stderr())
+	assertEqualWithLineBreak(t, "hello ", cmd.Stderr())
 }
 
 func TestCommand_WithTimeout(t *testing.T) {

examples/standard_streams.go

@@ -1,8 +1,8 @@
-package main
+package examples
 
 import "github.com/SimonBaeumer/cmd"
 
-func main() {
+func CreateNewCommandWithStandardStream() {
 	c := cmd.NewCommand("echo hello; sleep 1; echo another;", cmd.WithStandardStreams)
 	c.Execute()
 }

examples/working_dir.go

@@ -1,8 +1,8 @@
-package main
+package examples
 
 import "github.com/SimonBaeumer/cmd"
 
-func main() {
+func CreateWithWorkingDir() {
 	setWorkingDir := func(c *cmd.Command) {
 		c.WorkingDir = "/tmp"
 	}