MQP/jsh
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testfixes' into 'master'

Browse Source 
Testfixes

Fixed some testing issues.

See merge request !10
This commit is contained in:
Ian Adam Naval 2014-10-16 18:53:45 -04:00
commit dd2578d084
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -4,7 +4,7 @@ GOBUILD=$(GOCMD) build
GOCLEAN=$(GOCMD) clean GOCLEAN=$(GOCMD) clean
GOINSTALL=$(GOCMD) install GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i GODEP=$(GOTEST)
GOFMT=gofmt -w GOFMT=gofmt -w
GOCOVER=$(GOCMD) tool cover GOCOVER=$(GOCMD) tool cover
COVER_DIR=cover COVER_DIR=cover

4
common_test.go
View File

@ -3,7 +3,7 @@ package jsh
import "testing" import "testing"
func TestToJson(t *testing.T) { func TestToJson(t *testing.T) {
fixture := JshOutput{[]string{}, []string{}} fixture := JshFrame{[]string{}, []string{}}
json := fixture.ToJson() json := fixture.ToJson()
expected := `{"StdOut":[],"StdErr":[]}` expected := `{"StdOut":[],"StdErr":[]}`
actual := *json actual := *json
@ -11,7 +11,7 @@ func TestToJson(t *testing.T) {
t.Errorf("Empty fixture did not match:\n%s != %s", expected, actual) t.Errorf("Empty fixture did not match:\n%s != %s", expected, actual)
} }
fixture = JshOutput{[]string{"potato!"}, []string{}} fixture = JshFrame{[]string{"potato!"}, []string{}}
json = fixture.ToJson() json = fixture.ToJson()
expected = `{"StdOut":["potato!"],"StdErr":[]}` expected = `{"StdOut":["potato!"],"StdErr":[]}`
actual = *json actual = *json

2
filesystem_test.go
View File

@ -20,7 +20,7 @@ func TestNewFilesystem(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Passing 5 strings should not raise an error") t.Errorf("Passing 5 strings should not raise an error")
} }
expected := Filesystem{"1", "2", "3", "4", "5"} expected := Filesystem{"1", 2, 3, 4, "5"}
actual := *proc actual := *proc
if expected != actual { if expected != actual {
t.Errorf("Filesystem was incorrectly generated:\n%s != %s", expected, actual) t.Errorf("Filesystem was incorrectly generated:\n%s != %s", expected, actual)