Improve naming

dannykopping · dannykopping · commit 993904caa51b · 2024-03-15T14:59:31.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -146,14 +146,14 @@ type outExpecter struct {
 }
 
 func (e *outExpecter) ExpectMatch(str string) string {
-	return e.expectMatchContext(str, e.ExpectMatchContext)
+	return e.expectMatchContextFunc(str, e.ExpectMatchContext)
 }
 
 func (e *outExpecter) ExpectRegexMatch(str string) string {
-	return e.expectMatchContext(str, e.ExpectRegexMatchContext)
+	return e.expectMatchContextFunc(str, e.ExpectRegexMatchContext)
 }
 
-func (e *outExpecter) expectMatchContext(str string, impl func(ctx context.Context, str string) string) string {
+func (e *outExpecter) expectMatchContextFunc(str string, impl func(ctx context.Context, str string) string) string {
 	e.t.Helper()
 
 	timeout, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
@@ -164,18 +164,18 @@ func (e *outExpecter) expectMatchContext(str string, impl func(ctx context.Conte
 
 // TODO(mafredri): Rename this to ExpectMatch when refactoring.
 func (e *outExpecter) ExpectMatchContext(ctx context.Context, str string) string {
-	return e.expectMatcher(ctx, str, func(src, pattern string) bool {
+	return e.expectMatcherFunc(ctx, str, func(src, pattern string) bool {
 		return strings.Contains(src, pattern)
 	})
 }
 
 func (e *outExpecter) ExpectRegexMatchContext(ctx context.Context, str string) string {
-	return e.expectMatcher(ctx, str, func(src, pattern string) bool {
+	return e.expectMatcherFunc(ctx, str, func(src, pattern string) bool {
 		return regexp.MustCompile(pattern).MatchString(src)
 	})
 }
 
-func (e *outExpecter) expectMatcher(ctx context.Context, str string, matchFn func(src, pattern string) bool) string {
+func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, matchFn func(src, pattern string) bool) string {
 	e.t.Helper()
 
 	var buffer bytes.Buffer
