From 76074839cfea2376a78dd27a8f03154150219020 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 1 Aug 2014 22:09:30 +0200 Subject: [PATCH] Break out test functions --- generic_test.go | 36 ++++++++++++++++++++++++++++++++++++ hashing_test.go | 31 ------------------------------- 2 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 generic_test.go diff --git a/generic_test.go b/generic_test.go new file mode 100644 index 000000000..491afbc68 --- /dev/null +++ b/generic_test.go @@ -0,0 +1,36 @@ +package khepri_test + +import ( + "fmt" + "path/filepath" + "reflect" + "runtime" + "testing" +) + +// assert fails the test if the condition is false. +func assert(tb testing.TB, condition bool, msg string, v ...interface{}) { + if !condition { + _, file, line, _ := runtime.Caller(1) + fmt.Printf("\033[31m%s:%d: "+msg+"\033[39m\n\n", append([]interface{}{filepath.Base(file), line}, v...)...) + tb.FailNow() + } +} + +// ok fails the test if an err is not nil. +func ok(tb testing.TB, err error) { + if err != nil { + _, file, line, _ := runtime.Caller(1) + fmt.Printf("\033[31m%s:%d: unexpected error: %s\033[39m\n\n", filepath.Base(file), line, err.Error()) + tb.FailNow() + } +} + +// equals fails the test if exp is not equal to act. +func equals(tb testing.TB, exp, act interface{}) { + if !reflect.DeepEqual(exp, act) { + _, file, line, _ := runtime.Caller(1) + fmt.Printf("\033[31m%s:%d:\n\n\texp: %#v\n\n\tgot: %#v\033[39m\n\n", filepath.Base(file), line, exp, act) + tb.FailNow() + } +} diff --git a/hashing_test.go b/hashing_test.go index d5b4876fa..0a95a8a30 100644 --- a/hashing_test.go +++ b/hashing_test.go @@ -5,44 +5,13 @@ import ( "crypto/md5" "crypto/sha1" "encoding/hex" - "fmt" "hash" "io/ioutil" - "path/filepath" - "reflect" - "runtime" "testing" "github.com/fd0/khepri" ) -// assert fails the test if the condition is false. -func assert(tb testing.TB, condition bool, msg string, v ...interface{}) { - if !condition { - _, file, line, _ := runtime.Caller(1) - fmt.Printf("\033[31m%s:%d: "+msg+"\033[39m\n\n", append([]interface{}{filepath.Base(file), line}, v...)...) - tb.FailNow() - } -} - -// ok fails the test if an err is not nil. -func ok(tb testing.TB, err error) { - if err != nil { - _, file, line, _ := runtime.Caller(1) - fmt.Printf("\033[31m%s:%d: unexpected error: %s\033[39m\n\n", filepath.Base(file), line, err.Error()) - tb.FailNow() - } -} - -// equals fails the test if exp is not equal to act. -func equals(tb testing.TB, exp, act interface{}) { - if !reflect.DeepEqual(exp, act) { - _, file, line, _ := runtime.Caller(1) - fmt.Printf("\033[31m%s:%d:\n\n\texp: %#v\n\n\tgot: %#v\033[39m\n\n", filepath.Base(file), line, exp, act) - tb.FailNow() - } -} - var static_tests = []struct { hash func() hash.Hash text string