Rename T to TestingT.

CHANGELOG.md

@@ -9,6 +9,13 @@ The format is based on [Keep a Changelog], and this project adheres to
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
+## [Unreleased]
+
+## Changed
+
+- **[BC]** Renamed `T` to `TestingT`, to avoid conflicts with `*testing.T` when dot-importing
+- **[BC]** Renamed `assert.T` to `S`, to avoid conflicts with `*testing.T` when dot-importing
+
 ## [0.5.0] - 2020-06-11
 
 ## Added

dogma.go

@@ -1,6 +1,6 @@
 package testkit
 
-func log(t T, args ...interface{}) { t.Log(args...) }
+func log(t TestingT, args ...interface{}) { t.Log(args...) }
 
 // ABOUT THIS FILE (dogma.go)
 //

interface.go

@@ -1,10 +1,10 @@
 package testkit
 
-// T is the interface via which the test framework consumes Go's *testing.T
-// value.
+// TestingT is the interface via which the test framework consumes Go's
+// *testing.T value.
 //
 // It allows use of stand-ins, such as Ginkgo's GinkgoT() value.
-type T interface {
+type TestingT interface {
 	Log(args ...interface{})
 	Logf(f string, args ...interface{})
 	FailNow()
@@ -19,7 +19,7 @@ type T interface {
 // See https://github.com/dogmatiq/testkit/issues/61
 // See https://github.com/onsi/ginkgo/pull/585
 type tHelper interface {
-	T
+	TestingT
 
 	Helper()
 }

runner.go

@@ -34,7 +34,7 @@ func New(
 }
 
 // Begin starts a new test.
-func (r *Runner) Begin(t T, options ...TestOption) *Test {
+func (r *Runner) Begin(t TestingT, options ...TestOption) *Test {
 	return r.BeginContext(
 		context.Background(),
 		t,
@@ -43,7 +43,7 @@ func (r *Runner) Begin(t T, options ...TestOption) *Test {
 }
 
 // BeginContext starts a new test within a context.
-func (r *Runner) BeginContext(ctx context.Context, t T, options ...TestOption) *Test {
+func (r *Runner) BeginContext(ctx context.Context, t TestingT, options ...TestOption) *Test {
 	to := newTestOptions(options, r.verbose)
 
 	opts := to.operationOptions

test.go

@@ -17,7 +17,7 @@ import (
 // Test contains the state of a single test.
 type Test struct {
 	ctx              context.Context
-	t                T
+	t                TestingT
 	verbose          bool
 	engine           *engine.Engine
 	now              time.Time