add to TestT interface to be compatible with interface found

in terraform-plugin-test, unexposing testing package

Author: appilon

helper/resource/testing.go

@@ -576,7 +576,7 @@ func Test(t TestT, c TestCase) {
 		t.Fatal("Please configure the acctest binary driver")
 	}
 
-	RunNewTest(t.(*testing.T), c, providers)
+	RunNewTest(t, c, providers)
 }
 
 // testProviderConfig takes the list of Providers in a TestCase and returns a
@@ -985,10 +985,15 @@ func TestMatchOutput(name string, r *regexp.Regexp) TestCheckFunc {
 // Users should just use a *testing.T object, which implements this.
 type TestT interface {
 	Error(args ...interface{})
+	FailNow()
 	Fatal(args ...interface{})
-	Skip(args ...interface{})
+	Fatalf(format string, args ...interface{})
+	Helper()
+	Log(args ...interface{})
 	Name() string
 	Parallel()
+	Skip(args ...interface{})
+	SkipNow()
 }
 
 // modulePrimaryInstanceState returns the instance state for the given resource

helper/resource/testing_new.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"reflect"
 	"strings"
-	"testing"
 
 	"github.com/davecgh/go-spew/spew"
 	tfjson "github.com/hashicorp/terraform-json"
@@ -16,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func runPostTestDestroy(t *testing.T, c TestCase, wd *tftest.WorkingDir) error {
+func runPostTestDestroy(t TestT, c TestCase, wd *tftest.WorkingDir) error {
 	wd.RequireDestroy(t)
 
 	if c.CheckDestroy != nil {
@@ -30,7 +29,7 @@ func runPostTestDestroy(t *testing.T, c TestCase, wd *tftest.WorkingDir) error {
 	return nil
 }
 
-func RunNewTest(t *testing.T, c TestCase, providers map[string]*schema.Provider) {
+func RunNewTest(t TestT, c TestCase, providers map[string]*schema.Provider) {
 	spewConf := spew.NewDefaultConfig()
 	spewConf.SortKeys = true
 	wd := acctest.TestHelper.RequireNewWorkingDir(t)
@@ -102,7 +101,7 @@ func RunNewTest(t *testing.T, c TestCase, providers map[string]*schema.Provider)
 	}
 }
 
-func getState(t *testing.T, wd *tftest.WorkingDir) *terraform.State {
+func getState(t TestT, wd *tftest.WorkingDir) *terraform.State {
 	jsonState := wd.RequireState(t)
 	state, err := shimStateFromJson(jsonState)
 	if err != nil {
@@ -132,7 +131,7 @@ func planIsEmpty(plan *tfjson.Plan) bool {
 	return true
 }
 
-func testIDRefresh(c TestCase, t *testing.T, wd *tftest.WorkingDir, step TestStep, r *terraform.ResourceState) error {
+func testIDRefresh(c TestCase, t TestT, wd *tftest.WorkingDir, step TestStep, r *terraform.ResourceState) error {
 	spewConf := spew.NewDefaultConfig()
 	spewConf.SortKeys = true
 

helper/resource/testing_new_config.go

@@ -1,15 +1,13 @@
 package resource
 
 import (
-	"testing"
-
 	"github.com/davecgh/go-spew/spew"
 	tftest "github.com/hashicorp/terraform-plugin-test"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func testStepNewConfig(t *testing.T, c TestCase, wd *tftest.WorkingDir, step TestStep) error {
+func testStepNewConfig(t TestT, c TestCase, wd *tftest.WorkingDir, step TestStep) error {
 	spewConf := spew.NewDefaultConfig()
 	spewConf.SortKeys = true
 

helper/resource/testing_new_import_state.go

@@ -3,7 +3,6 @@ package resource
 import (
 	"reflect"
 	"strings"
-	"testing"
 
 	"github.com/davecgh/go-spew/spew"
 	tftest "github.com/hashicorp/terraform-plugin-test"
@@ -14,7 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func testStepNewImportState(t *testing.T, c TestCase, wd *tftest.WorkingDir, step TestStep, cfg string) error {
+func testStepNewImportState(t TestT, c TestCase, wd *tftest.WorkingDir, step TestStep, cfg string) error {
 	spewConf := spew.NewDefaultConfig()
 	spewConf.SortKeys = true
 

helper/resource/testing_test.go

@@ -173,6 +173,10 @@ func (t *mockT) Error(args ...interface{}) {
 	t.f = true
 }
 
+func (t *mockT) FailNow() {
+	panic("mockT.FailNow")
+}
+
 func (t *mockT) Fatal(args ...interface{}) {
 	t.FatalCalled = true
 	t.FatalArgs = args
@@ -181,6 +185,14 @@ func (t *mockT) Fatal(args ...interface{}) {
 	panic("mockT.Fatal")
 }
 
+func (t *mockT) Fatalf(format string, args ...interface{}) {
+	t.Fatal(format, args)
+}
+
+func (t *mockT) Helper() {}
+
+func (t *mockT) Log(args ...interface{}) {}
+
 func (t *mockT) Parallel() {
 	t.ParallelCalled = true
 }
@@ -191,6 +203,10 @@ func (t *mockT) Skip(args ...interface{}) {
 	t.f = true
 }
 
+func (t *mockT) SkipNow() {
+	t.Skip()
+}
+
 func (t *mockT) Name() string {
 	return "MockedName"
 }