captureTestingT.checkResultAndErrMsg

stretchr · Jul 31, 2023 · 18ce90d · 18ce90d
1 parent 8e8d1e1
commit 18ce90d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/assert/assertions_test.go b/assert/assertions_test.go
@@ -2894,21 +2894,21 @@ func (ctt *captureTestingT) Errorf(format string, args ...interface{}) {
 	ctt.msg = fmt.Sprintf(format, args...)
 }
 
-func checkResultAndErrMsg(t *testing.T, expectedRes, res bool, expectedErrMsg, rawErrOutput string) {
+func (ctt *captureTestingT) checkResultAndErrMsg(t *testing.T, expectedRes, res bool, expectedErrMsg string) {
 	t.Helper()
 	if res != expectedRes {
 		t.Errorf("Should return %t", expectedRes)
 		return
 	}
-	contents := parseLabeledOutput(rawErrOutput)
+	contents := parseLabeledOutput(ctt.msg)
 	if res == true {
 		if contents != nil {
 			t.Errorf("Should not log an error")
 		}
 		return
 	}
 	if contents == nil {
-		t.Errorf("Should log an error. Log output: %v", rawErrOutput)
+		t.Errorf("Should log an error. Log output: %v", ctt.msg)
 		return
 	}
 	for _, content := range contents {
@@ -2983,7 +2983,7 @@ func TestErrorIs(t *testing.T) {
 		mockT := new(captureTestingT)
 		t.Run(fmt.Sprintf("ErrorIs(%#v,%#v)", tt.err, tt.target), func(t *testing.T) {
 			res := ErrorIs(mockT, tt.err, tt.target)
-			checkResultAndErrMsg(t, tt.result, res, tt.resultErrMsg, mockT.msg)
+			mockT.checkResultAndErrMsg(t, tt.result, res, tt.resultErrMsg)
 		})
 	}
 }
@@ -3046,7 +3046,7 @@ func TestNotErrorIs(t *testing.T) {
 		mockT := new(captureTestingT)
 		t.Run(fmt.Sprintf("NotErrorIs(%#v,%#v)", tt.err, tt.target), func(t *testing.T) {
 			res := NotErrorIs(mockT, tt.err, tt.target)
-			checkResultAndErrMsg(t, tt.result, res, tt.resultErrMsg, mockT.msg)
+			mockT.checkResultAndErrMsg(t, tt.result, res, tt.resultErrMsg)
 		})
 	}
 }