diff --git a/suite/suite.go b/suite/suite.go index 284f924..41a7e40 100644 --- a/suite/suite.go +++ b/suite/suite.go @@ -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 diff --git a/suite/suite_test.go b/suite/suite_test.go index 388421f..5ccd35b 100644 --- a/suite/suite_test.go +++ b/suite/suite_test.go @@ -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