[ISSUE-84] add getRealT

ozontech · Mar 17, 2024 · 7bb626c · 7bb626c
1 parent 592bb00
commit 7bb626c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/pkg/framework/core/common/common.go b/pkg/framework/core/common/common.go
@@ -99,11 +99,6 @@ func (c *Common) SkipOnPrint() {
 	c.GetResult().SkipOnPrint()
 }
 
-// Helper ...
-func (c *Common) Helper() {
-	c.TestingT.Helper()
-}
-
 // LogStep ...
 func (c *Common) LogStep(args ...interface{}) {
 	c.Provider.Step(allure.NewSimpleStep(fmt.Sprintln(args...)))

diff --git a/pkg/framework/core/common/common_test.go b/pkg/framework/core/common/common_test.go
@@ -184,6 +184,7 @@ type commonTMock struct {
 	parallel   bool
 	run        bool
 	skipped    bool
+	TestingT   *testing.T
 }
 
 func newCommonTMock() *commonTMock {

diff --git a/pkg/framework/core/common/step_context.go b/pkg/framework/core/common/step_context.go
@@ -27,7 +27,6 @@ type StepT interface {
 	Broken()
 	BrokenNow()
 	Name() string
-	Helper()
 	GetRealT() provider.TestingT
 }
 
@@ -92,10 +91,6 @@ func (ctx *stepCtx) FailNow() {
 	ctx.t.FailNow()
 }
 
-func (ctx *stepCtx) Helper() {
-	ctx.t.GetRealT().Helper()
-}
-
 func (ctx *stepCtx) Error(args ...interface{}) {
 	ctx.t.GetRealT().Helper()
 
@@ -226,3 +221,7 @@ func (ctx *stepCtx) Breakf(format string, args ...interface{}) {
 	ctx.Broken()
 	ctx.t.Breakf(format, args...)
 }
+
+func (ctx *stepCtx) GetRealT() provider.TestingT {
+	return ctx.t.GetRealT()
+}
diff --git a/pkg/framework/core/common/step_context_test.go b/pkg/framework/core/common/step_context_test.go
@@ -85,9 +85,6 @@ func (m *providerTMockStep) Name() string {
 	return m.name
 }
 
-func (m *providerTMockStep) Helper() {
-}
-
 func (m *providerTMockStep) GetRealT() provider.TestingT {
 	return m.testingT
 }
@@ -262,6 +259,7 @@ func TestStepCtx_Errorf_withParent(t *testing.T) {
 
 func TestStepCtx_Errorf_noParent(t *testing.T) {
 	mockT := new(providerTMockStep)
+	mockT.SetRealT(t)
 	step := allure.NewSimpleStep("testStep")
 	ctx := stepCtx{t: mockT, currentStep: step}
 	ctx.Errorf("test")
@@ -271,6 +269,8 @@ func TestStepCtx_Errorf_noParent(t *testing.T) {
 
 func TestStepCtx_Error_withParent(t *testing.T) {
 	mockT := new(providerTMockStep)
+	mockT.SetRealT(t)
+
 	parentStep := allure.NewSimpleStep("parentStep", allure.NewParameters("paramParent1", "v1", "paramParent2", "v2")...)
 	parentCtx := &stepCtx{t: mockT, currentStep: parentStep}
 	step := allure.NewSimpleStep("testStep")
@@ -283,6 +283,8 @@ func TestStepCtx_Error_withParent(t *testing.T) {
 
 func TestStepCtx_Error_noParent(t *testing.T) {
 	mockT := new(providerTMockStep)
+	mockT.SetRealT(t)
+
 	step := allure.NewSimpleStep("testStep")
 	ctx := stepCtx{t: mockT, currentStep: step}
 	ctx.Error("test")

diff --git a/pkg/framework/provider/test.go b/pkg/framework/provider/test.go
@@ -70,7 +70,6 @@ type StepCtx interface {
 	Break(args ...interface{})
 	Breakf(format string, args ...interface{})
 	Name() string
-	Helper()
 }
 
 // Asserts ...