[checkpoint] implement suggestion from stretchr#1363

suite/interfaces.go

@@ -64,3 +64,15 @@ type SetupSubTest interface {
 type TearDownSubTest interface {
 	TearDownSubTest()
 }
+
+// BeforeSubTest has a function to be executed right before the subtest
+// starts and receives the suite, test and subtest names as input
+type BeforeSubTest interface {
+	BeforeSubTest(suiteName, testName, subTestName string)
+}
+
+// AfterSubTest has a function to be executed right after the subtest
+// finishes and receives the suite, test and subtest names as input
+type AfterSubTest interface {
+	AfterSubTest(suiteName, testName, subTestName string)
+}

suite/suite.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime/debug"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -95,13 +96,28 @@ func failOnPanic(t *testing.T, r interface{}) {
 // Provides compatibility with go test pkg -run TestSuite/TestName/SubTestName.
 func (suite *Suite) Run(name string, subtest func()) bool {
 	oldT := suite.T()
+	var (
+		suiteName  string
+		parentName string
+	)
+	n := strings.Split(suite.s.T().Name(), "/")
+	if len(n) > 1 {
+		suiteName, parentName = n[0], strings.Join(n[1:len(n)], "/")
+	}
 
 	if setupSubTest, ok := suite.s.(SetupSubTest); ok {
 		setupSubTest.SetupSubTest()
 	}
 
+	if beforeSubTest, ok := suite.s.(BeforeSubTest); ok {
+		beforeSubTest.BeforeSubTest(suiteName, parentName, name)
+	}
+
 	defer func() {
 		suite.SetT(oldT)
+		if afterSubTest, ok := suite.s.(AfterSubTest); ok {
+			afterSubTest.AfterSubTest(suiteName, parentName, name)
+		}
 		if tearDownSubTest, ok := suite.s.(TearDownSubTest); ok {
 			tearDownSubTest.TearDownSubTest()
 		}

suite/suite_test.go

@@ -161,6 +161,8 @@ type SuiteTester struct {
 	NonTestMethodRunCount   int
 	SetupSubTestRunCount    int
 	TearDownSubTestRunCount int
+	BeforeSubTestRunCount   int
+	AfterSubTestRunCount    int
 
 	SuiteNameBefore []string
 	TestNameBefore  []string
@@ -261,10 +263,18 @@ func (suite *SuiteTester) TearDownSubTest() {
 	suite.TearDownSubTestRunCount++
 }
 
+func (suite *SuiteTester) AfterSubTest(suiteName, testName, subtestName string) {
+	suite.AfterSubTestRunCount++
+}
+
 func (suite *SuiteTester) SetupSubTest() {
 	suite.SetupSubTestRunCount++
 }
 
+func (suite *SuiteTester) BeforeSubTest(suiteName, testName, subtestName string) {
+	suite.BeforeSubTestRunCount++
+}
+
 type SuiteSkipTester struct {
 	// Include our basic suite logic.
 	Suite
@@ -349,6 +359,9 @@ func TestRunSuite(t *testing.T) {
 	assert.Equal(t, suiteTester.TearDownSubTestRunCount, 2)
 	assert.Equal(t, suiteTester.SetupSubTestRunCount, 2)
 
+	assert.Equal(t, suiteTester.AfterSubTestRunCount, 2)
+	assert.Equal(t, suiteTester.BeforeSubTestRunCount, 2)
+
 	// Methods that don't match the test method identifier shouldn't
 	// have been run at all.
 	assert.Equal(t, suiteTester.NonTestMethodRunCount, 0)