Simplify the API by using the new assertion.

pull/41/head
taichi 2014-03-01 11:10:44 +09:00 committed by SATO taichi
parent e8eaa8ab7a
commit 52f556e421
2 changed files with 12 additions and 6 deletions

View File

@ -4,11 +4,14 @@ import (
"reflect"
"regexp"
"testing"
"github.com/stretchr/testify/assert"
)
// Suite is a basic testing suite with methods for storing and
// retrieving the current *testing.T context.
type Suite struct {
*assert.Assertions
t *testing.T
}
@ -20,6 +23,7 @@ func (suite *Suite) T() *testing.T {
// SetT sets the current *testing.T context.
func (suite *Suite) SetT(t *testing.T) {
suite.t = t
suite.Assertions = assert.New(t)
}
// Run takes a testing suite and runs all of the tests attached

View File

@ -20,12 +20,12 @@ type SuiteTester struct {
Suite
// Keep counts of how many times each method is run.
SetupSuiteRunCount int
SetupSuiteRunCount int
TearDownSuiteRunCount int
SetupTestRunCount int
TearDownTestRunCount int
TestOneRunCount int
TestTwoRunCount int
SetupTestRunCount int
TearDownTestRunCount int
TestOneRunCount int
TestTwoRunCount int
NonTestMethodRunCount int
}
@ -58,7 +58,8 @@ func (suite *SuiteTester) TearDownTest() {
func (suite *SuiteTester) TestOne() {
beforeCount := suite.TestOneRunCount
suite.TestOneRunCount++
assert.Equal(suite.T(), suite.TestOneRunCount, beforeCount + 1)
assert.Equal(suite.T(), suite.TestOneRunCount, beforeCount+1)
suite.Equal(suite.TestOneRunCount, beforeCount+1)
}
// TestTwo is another example of a test.
@ -66,6 +67,7 @@ func (suite *SuiteTester) TestTwo() {
beforeCount := suite.TestTwoRunCount
suite.TestTwoRunCount++
assert.NotEqual(suite.T(), suite.TestTwoRunCount, beforeCount)
suite.NotEqual(suite.TestTwoRunCount, beforeCount)
}
// NonTestMethod does not begin with "Test", so it will not be run by