From 5e72f93a8982d548de051e5c3ce3898255bc86be Mon Sep 17 00:00:00 2001 From: Esdras Beleza Date: Mon, 26 Sep 2016 13:48:19 -0300 Subject: [PATCH] Remove timestamp from callback --- suite/interfaces.go | 9 +++------ suite/suite.go | 5 ++--- suite/suite_test.go | 8 ++++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/suite/interfaces.go b/suite/interfaces.go index e9246b2..b37cb04 100644 --- a/suite/interfaces.go +++ b/suite/interfaces.go @@ -1,9 +1,6 @@ package suite -import ( - "testing" - "time" -) +import "testing" // TestingSuite can store and return the current *testing.T context // generated by 'go test'. @@ -39,11 +36,11 @@ type TearDownTestSuite interface { // BeforeTest has a function to be executed right before the test // starts and receives the suite and test names as input type BeforeTest interface { - BeforeTest(suiteName, testName string, when time.Time) + BeforeTest(suiteName, testName string) } // AfterTest has a function to be executed right after the test // finishes and receives the suite and test names as input type AfterTest interface { - AfterTest(suiteName, testName string, when time.Time) + AfterTest(suiteName, testName string) } diff --git a/suite/suite.go b/suite/suite.go index ae420c8..57d21a5 100644 --- a/suite/suite.go +++ b/suite/suite.go @@ -7,7 +7,6 @@ import ( "reflect" "regexp" "testing" - "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -88,11 +87,11 @@ func Run(t *testing.T, suite TestingSuite) { setupTestSuite.SetupTest() } if beforeTestSuite, ok := suite.(BeforeTest); ok { - beforeTestSuite.BeforeTest(methodFinder.Elem().Name(), method.Name, time.Now()) + beforeTestSuite.BeforeTest(methodFinder.Elem().Name(), method.Name) } defer func() { if afterTestSuite, ok := suite.(AfterTest); ok { - afterTestSuite.AfterTest(methodFinder.Elem().Name(), method.Name, time.Now()) + afterTestSuite.AfterTest(methodFinder.Elem().Name(), method.Name) } if tearDownTestSuite, ok := suite.(TearDownTestSuite); ok { tearDownTestSuite.TearDownTest() diff --git a/suite/suite_test.go b/suite/suite_test.go index 470cc11..6419234 100644 --- a/suite/suite_test.go +++ b/suite/suite_test.go @@ -85,16 +85,16 @@ func (suite *SuiteTester) SetupSuite() { suite.SetupSuiteRunCount++ } -func (suite *SuiteTester) BeforeTest(suiteName, testName string, when time.Time) { +func (suite *SuiteTester) BeforeTest(suiteName, testName string) { suite.SuiteNameBefore = append(suite.SuiteNameBefore, suiteName) suite.TestNameBefore = append(suite.TestNameBefore, testName) - suite.TimeBefore = append(suite.TimeBefore, when) + suite.TimeBefore = append(suite.TimeBefore, time.Now()) } -func (suite *SuiteTester) AfterTest(suiteName, testName string, when time.Time) { +func (suite *SuiteTester) AfterTest(suiteName, testName string) { suite.SuiteNameAfter = append(suite.SuiteNameAfter, suiteName) suite.TestNameAfter = append(suite.TestNameAfter, testName) - suite.TimeAfter = append(suite.TimeAfter, when) + suite.TimeAfter = append(suite.TimeAfter, time.Now()) } func (suite *SuiteSkipTester) SetupSuite() {