refact

Author: adamluzsi

T_test.go

@@ -131,7 +131,7 @@ func TestT_Defer_failNowWillNotHang(t *testing.T) {
 			s := testcase.NewSpec(&doubles.TB{})
 			s.Test(``, func(t *testcase.T) {
 				t.Defer(func() { t.FailNow() })
-				
+
 				panic(`die`)
 			})
 		})
@@ -176,6 +176,26 @@ func TestT_Defer_withArguments(t *testing.T) {
 	assert.Must(t).Equal(expected, actually)
 }
 
+func TestT_Defer_runsOnlyAfterTestIsdone(t *testing.T) {
+	s := testcase.NewSpec(t)
+
+	CTX := testcase.Let(s, func(t *testcase.T) func() context.Context {
+		return func() context.Context {
+			ctx, cancel := context.WithCancel(context.Background())
+			t.Cleanup(cancel)
+			t.Defer(cancel)
+			return ctx
+		}
+	})
+
+	s.Before(func(t *testcase.T) {
+		t.Cleanup(func() { t.Must.NoError(CTX.Get(t)().Err()) })
+		t.Defer(func() { t.Must.NoError(CTX.Get(t)().Err()) })
+	})
+
+	s.Test("", func(t *testcase.T) {})
+}
+
 func TestT_Defer_withArgumentsButArgumentCountMismatch(t *testing.T) {
 	s := testcase.NewSpec(t)
 

assert/Asserter.go

@@ -717,12 +717,12 @@ func (a Asserter) containExactlySlice(exp reflect.Value, act reflect.Value, msg
 			Message: msg,
 			Values: []fmterror.Value{
 				{
-					Label: "actual:",
-					Value: act.Interface(),
+					Label: "expected:",
+					Value: exp.Len(),
 				},
 				{
-					Label: "value",
-					Value: exp.Interface(),
+					Label: "actual:",
+					Value: act.Len(),
 				},
 			},
 		})

assert/Diff.go

@@ -6,4 +6,4 @@ type diffFn func(value, othValue any) string
 
 // DiffFunc is the function that will be used to print out two object if they are not equal.
 // You can use your preferred diff implementation if you are not happy with the pretty print diff format.
-var DiffFunc diffFn = pp.DiffFormat
+var DiffFunc diffFn = pp.DiffFormat[any]

internal/fmterror/Message.go

@@ -16,7 +16,7 @@ type Message struct {
 
 type Value struct {
 	Label string
-	Value interface{}
+	Value any
 }
 
 type Raw string

internal/teardown/Teardown.go

@@ -32,9 +32,9 @@ type Teardown struct {
 // even in tests where this is not needed.
 //
 // e.g.:
-//	- mock initialization with mock controller, where the mock controller #Finish function must be executed after each testCase suite.
-//	- sql.DB / sql.Tx
-//	- basically anything that has the io.Closer interface
+//   - mock initialization with mock controller, where the mock controller #Finish function must be executed after each testCase suite.
+//   - sql.DB / sql.Tx
+//   - basically anything that has the io.Closer interface
 //
 // https://github.com/golang/go/issues/41891
 func (td *Teardown) Defer(fn interface{}, args ...interface{}) {
@@ -142,6 +142,7 @@ func (td *Teardown) run() {
 	td.fns = nil
 	td.mutex.Unlock()
 	for _, cu := range fns {
+		//goland:noinspection GoDeferInLoop
 		defer cu()
 	}
 }

pp/Diff.go

@@ -9,12 +9,12 @@ import (
 )
 
 // Diff will pretty print two value and show side-by-side the difference between them.
-func Diff(v1, v2 any) {
+func Diff[T any](v1, v2 T) {
 	_, _ = defaultWriter.Write([]byte(DiffString(Format(v1), Format(v2))))
 }
 
 // DiffFormat format the values in pp.Format and compare the results line by line in a side-by-side style.
-func DiffFormat(v1, v2 any) string {
+func DiffFormat[T any](v1, v2 T) string {
 	return DiffString(Format(v1), Format(v2))
 }