Have testing.RunTests run the tests we find with their setup methods.

This commit is contained in:
Sean Talts 2014-03-07 12:14:37 -05:00
parent aff4bd8fb5
commit 5739ba4d16

View File

@ -1,9 +1,9 @@
package suite package suite
import ( import (
"testing"
"reflect" "reflect"
"regexp" "regexp"
"testing"
) )
// Suite is a basic testing suite with methods for storing and // Suite is a basic testing suite with methods for storing and
@ -32,9 +32,14 @@ func Run(t *testing.T, suite TestingSuite) {
} }
methodFinder := reflect.TypeOf(suite) methodFinder := reflect.TypeOf(suite)
tests := []testing.InternalTest{}
for index := 0; index < methodFinder.NumMethod(); index++ { for index := 0; index < methodFinder.NumMethod(); index++ {
method := methodFinder.Method(index) method := methodFinder.Method(index)
if ok, _ := regexp.MatchString("^Test", method.Name); ok { if ok, _ := regexp.MatchString("^Test", method.Name); ok {
test := testing.InternalTest{
Name: method.Name,
F: func(t *testing.T) {
suite.SetT(t)
if setupTestSuite, ok := suite.(SetupTestSuite); ok { if setupTestSuite, ok := suite.(SetupTestSuite); ok {
setupTestSuite.SetupTest() setupTestSuite.SetupTest()
} }
@ -42,7 +47,16 @@ func Run(t *testing.T, suite TestingSuite) {
if tearDownTestSuite, ok := suite.(TearDownTestSuite); ok { if tearDownTestSuite, ok := suite.(TearDownTestSuite); ok {
tearDownTestSuite.TearDownTest() tearDownTestSuite.TearDownTest()
} }
},
} }
tests = append(tests, test)
}
}
if !testing.RunTests(func(pat, str string) (bool, error) {
return true, nil
}, tests) {
t.Fail()
} }
if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok { if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok {