From d450c7a883876e0f5356fb5cb54109a0a2a77dfd Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Sat, 29 Sep 2018 21:09:09 +0200 Subject: use more testify, fix unchecked errors --- bug/bug_actions_test.go | 204 +++++++++++++++++++++++++++--------------------- bug/bug_test.go | 4 +- bug/operation.go | 3 +- 3 files changed, 120 insertions(+), 91 deletions(-) (limited to 'bug') diff --git a/bug/bug_actions_test.go b/bug/bug_actions_test.go index 44409296..ee9fbd72 100644 --- a/bug/bug_actions_test.go +++ b/bug/bug_actions_test.go @@ -2,6 +2,8 @@ package bug import ( "github.com/MichaelMure/git-bug/repository" + "github.com/stretchr/testify/assert" + "io/ioutil" "log" "os" @@ -69,16 +71,16 @@ func TestPushPull(t *testing.T) { defer cleanupRepos(repoA, repoB, remote) bug1, err := Create(rene, unix, "bug1", "message") - checkErr(t, err) + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) // A --> remote --> B _, err = Push(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) err = Pull(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs := allBugs(t, ReadAllLocalBugs(repoB)) @@ -88,15 +90,15 @@ func TestPushPull(t *testing.T) { // B --> remote --> A bug2, err := Create(rene, unix, "bug2", "message") - checkErr(t, err) + assert.Nil(t, err) err = bug2.Commit(repoB) - checkErr(t, err) + assert.Nil(t, err) _, err = Push(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) err = Pull(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs = allBugs(t, ReadAllLocalBugs(repoA)) @@ -105,12 +107,6 @@ func TestPushPull(t *testing.T) { } } -func checkErr(t testing.TB, err error) { - if err != nil { - t.Fatal(err) - } -} - func allBugs(t testing.TB, bugs <-chan StreamedBug) []*Bug { var result []*Bug for streamed := range bugs { @@ -137,34 +133,37 @@ func _RebaseTheirs(t testing.TB) { defer cleanupRepos(repoA, repoB, remote) bug1, err := Create(rene, unix, "bug1", "message") - checkErr(t, err) + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) // A --> remote _, err = Push(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> B err = Pull(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) bug2, err := ReadLocalBug(repoB, bug1.Id()) - checkErr(t, err) - - AddComment(bug2, rene, unix, "message2") - AddComment(bug2, rene, unix, "message3") - AddComment(bug2, rene, unix, "message4") + assert.Nil(t, err) + + err = AddComment(bug2, rene, unix, "message2") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message3") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message4") + assert.Nil(t, err) err = bug2.Commit(repoB) - checkErr(t, err) + assert.Nil(t, err) // B --> remote _, err = Push(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> A err = Pull(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs := allBugs(t, ReadAllLocalBugs(repoB)) @@ -173,7 +172,7 @@ func _RebaseTheirs(t testing.TB) { } bug3, err := ReadLocalBug(repoA, bug1.Id()) - checkErr(t, err) + assert.Nil(t, err) if nbOps(bug3) != 4 { t.Fatal("Unexpected number of operations") @@ -195,39 +194,48 @@ func _RebaseOurs(t testing.TB) { defer cleanupRepos(repoA, repoB, remote) bug1, err := Create(rene, unix, "bug1", "message") - checkErr(t, err) + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) // A --> remote _, err = Push(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> B err = Pull(repoB, "origin") - checkErr(t, err) - - AddComment(bug1, rene, unix, "message2") - AddComment(bug1, rene, unix, "message3") - AddComment(bug1, rene, unix, "message4") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message2") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message3") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message4") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) - - AddComment(bug1, rene, unix, "message5") - AddComment(bug1, rene, unix, "message6") - AddComment(bug1, rene, unix, "message7") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message5") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message6") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message7") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) - - AddComment(bug1, rene, unix, "message8") - AddComment(bug1, rene, unix, "message9") - AddComment(bug1, rene, unix, "message10") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message8") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message9") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message10") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) // remote --> A err = Pull(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs := allBugs(t, ReadAllLocalBugs(repoA)) @@ -236,7 +244,7 @@ func _RebaseOurs(t testing.TB) { } bug2, err := ReadLocalBug(repoA, bug1.Id()) - checkErr(t, err) + assert.Nil(t, err) if nbOps(bug2) != 10 { t.Fatal("Unexpected number of operations") @@ -267,64 +275,82 @@ func _RebaseConflict(t testing.TB) { defer cleanupRepos(repoA, repoB, remote) bug1, err := Create(rene, unix, "bug1", "message") - checkErr(t, err) + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) // A --> remote _, err = Push(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> B err = Pull(repoB, "origin") - checkErr(t, err) - - AddComment(bug1, rene, unix, "message2") - AddComment(bug1, rene, unix, "message3") - AddComment(bug1, rene, unix, "message4") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message2") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message3") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message4") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) - - AddComment(bug1, rene, unix, "message5") - AddComment(bug1, rene, unix, "message6") - AddComment(bug1, rene, unix, "message7") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message5") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message6") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message7") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) - - AddComment(bug1, rene, unix, "message8") - AddComment(bug1, rene, unix, "message9") - AddComment(bug1, rene, unix, "message10") + assert.Nil(t, err) + + err = AddComment(bug1, rene, unix, "message8") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message9") + assert.Nil(t, err) + err = AddComment(bug1, rene, unix, "message10") + assert.Nil(t, err) err = bug1.Commit(repoA) - checkErr(t, err) + assert.Nil(t, err) bug2, err := ReadLocalBug(repoB, bug1.Id()) - checkErr(t, err) - - AddComment(bug2, rene, unix, "message11") - AddComment(bug2, rene, unix, "message12") - AddComment(bug2, rene, unix, "message13") + assert.Nil(t, err) + + err = AddComment(bug2, rene, unix, "message11") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message12") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message13") + assert.Nil(t, err) err = bug2.Commit(repoB) - checkErr(t, err) - - AddComment(bug2, rene, unix, "message14") - AddComment(bug2, rene, unix, "message15") - AddComment(bug2, rene, unix, "message16") + assert.Nil(t, err) + + err = AddComment(bug2, rene, unix, "message14") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message15") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message16") + assert.Nil(t, err) err = bug2.Commit(repoB) - checkErr(t, err) - - AddComment(bug2, rene, unix, "message17") - AddComment(bug2, rene, unix, "message18") - AddComment(bug2, rene, unix, "message19") + assert.Nil(t, err) + + err = AddComment(bug2, rene, unix, "message17") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message18") + assert.Nil(t, err) + err = AddComment(bug2, rene, unix, "message19") + assert.Nil(t, err) err = bug2.Commit(repoB) - checkErr(t, err) + assert.Nil(t, err) // A --> remote _, err = Push(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> B err = Pull(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs := allBugs(t, ReadAllLocalBugs(repoB)) @@ -333,7 +359,7 @@ func _RebaseConflict(t testing.TB) { } bug3, err := ReadLocalBug(repoB, bug1.Id()) - checkErr(t, err) + assert.Nil(t, err) if nbOps(bug3) != 19 { t.Fatal("Unexpected number of operations") @@ -341,11 +367,11 @@ func _RebaseConflict(t testing.TB) { // B --> remote _, err = Push(repoB, "origin") - checkErr(t, err) + assert.Nil(t, err) // remote --> A err = Pull(repoA, "origin") - checkErr(t, err) + assert.Nil(t, err) bugs = allBugs(t, ReadAllLocalBugs(repoA)) @@ -354,7 +380,7 @@ func _RebaseConflict(t testing.TB) { } bug4, err := ReadLocalBug(repoA, bug1.Id()) - checkErr(t, err) + assert.Nil(t, err) if nbOps(bug4) != 19 { t.Fatal("Unexpected number of operations") diff --git a/bug/bug_test.go b/bug/bug_test.go index a7759ad8..0fd373d5 100644 --- a/bug/bug_test.go +++ b/bug/bug_test.go @@ -3,6 +3,7 @@ package bug import ( "github.com/MichaelMure/git-bug/repository" "github.com/go-test/deep" + "github.com/stretchr/testify/assert" "testing" ) @@ -65,7 +66,8 @@ func TestBugSerialisation(t *testing.T) { repo := repository.NewMockRepoForTest() - bug1.Commit(repo) + err := bug1.Commit(repo) + assert.Nil(t, err) bug2, err := ReadLocalBug(repo, bug1.Id()) if err != nil { diff --git a/bug/operation.go b/bug/operation.go index 84dd91ee..91b77e56 100644 --- a/bug/operation.go +++ b/bug/operation.go @@ -47,7 +47,8 @@ type Operation interface { func hashRaw(data []byte) git.Hash { hasher := sha256.New() - hasher.Write(data) + // Write can't fail + _, _ = hasher.Write(data) return git.Hash(fmt.Sprintf("%x", hasher.Sum(nil))) } -- cgit