refactor: remove Sprintf, increment, unlambda

allocate.go

@@ -527,10 +527,8 @@ func WSURLReadTimeout(t time.Duration) ExecAllocatorOption {
 // Use chromedp.NoModifyURL to prevent it from modifying the url.
 func NewRemoteAllocator(parent context.Context, url string, opts ...RemoteAllocatorOption) (context.Context, context.CancelFunc) {
 	a := &RemoteAllocator{
-		wsURL: url,
-		modifyURLFunc: func(ctx context.Context, wsURL string) (string, error) {
-			return modifyURL(ctx, wsURL)
-		},
+		wsURL:         url,
+		modifyURLFunc: modifyURL,
 	}
 	for _, o := range opts {
 		o(a)

allocate_test.go

@@ -314,7 +314,7 @@ func TestExecAllocatorMissingWebsocketAddr(t *testing.T) {
 	// in GitHub Actions, the error text could be:
 	// "chrome failed to start:\n/bin/bash: /etc/profile.d/env_vars.sh: Permission denied\nmkdir: cannot create directory ‘/run/user/1001’: Permission denied\n[0321/081807.491906:ERROR:headless_shell.cc(720)] Invalid devtools server address\n"
 	want := `failed to start`
-	got := fmt.Sprintf("%v", Run(ctx))
+	got := Run(ctx).Error()
 	if !strings.Contains(got, want) {
 		t.Fatalf("want error to match %q, got %q", want, got)
 	}
@@ -365,7 +365,7 @@ func TestCombinedOutputError(t *testing.T) {
 
 	ctx, cancel := NewContext(allocCtx)
 	defer cancel()
-	got := fmt.Sprint(Run(ctx))
+	got := Run(ctx).Error()
 	want := "failed to start"
 	if !strings.Contains(got, want) {
 		t.Fatalf("got %q, want %q", got, want)
@@ -456,7 +456,7 @@ func TestStartsWithNonBlankTab(t *testing.T) {
 	t.Parallel()
 
 	allocCtx, cancel := NewExecAllocator(context.Background(),
-		append(allocOpts[:],
+		append(allocOpts,
 			ModifyCmdFunc(func(cmd *exec.Cmd) {
 				// it assumes that the last argument is "about:blank" and
 				// replace it with other URL.

chromedp_test.go

@@ -138,8 +138,7 @@ func testAllocateSeparate(tb testing.TB) (context.Context, context.CancelFunc) {
 		tb.Fatal(err)
 	}
 	ListenBrowser(ctx, func(ev interface{}) {
-		switch ev := ev.(type) {
-		case *runtime.EventExceptionThrown:
+		if ev, ok := ev.(*runtime.EventExceptionThrown); ok {
 			tb.Errorf("%+v\n", ev.ExceptionDetails)
 		}
 	})
@@ -498,7 +497,7 @@ func TestDialTimeout(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		_, err = NewBrowser(ctx, url, WithDialTimeout(time.Microsecond))
-		got, want := fmt.Sprintf("%v", err), "i/o timeout"
+		got, want := err.Error(), "i/o timeout"
 		if !strings.Contains(got, want) {
 			t.Fatalf("got %q, want %q", got, want)
 		}
@@ -521,7 +520,7 @@ func TestDialTimeout(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		_, err = NewBrowser(ctx, url, WithDialTimeout(0))
-		got := fmt.Sprintf("%v", err)
+		got := err.Error()
 		if !strings.Contains(got, "EOF") && !strings.Contains(got, "connection reset") {
 			t.Fatalf("got %q, want %q or %q", got, "EOF", "connection reset")
 		}
@@ -957,7 +956,7 @@ func TestDirectCloseTarget(t *testing.T) {
 		err := Run(ctx, ActionFunc(func(ctx context.Context) error {
 			return target.CloseTarget(c.Target.TargetID).Do(ctx)
 		}))
-		got := fmt.Sprint(err)
+		got := err.Error()
 		if !strings.Contains(got, want) {
 			t.Fatalf("want %q, got %q", want, got)
 		}

query_test.go

@@ -227,7 +227,7 @@ func TestRetryInterval(t *testing.T) {
 			// only after the number of result nodes >= s.exp .
 			count := WaitFunc(
 				func(ctx context.Context, f *cdp.Frame, eci cdpruntime.ExecutionContextID, ni ...cdp.NodeID) ([]*cdp.Node, error) {
-					retryCount += 1
+					retryCount++
 					return nil, ErrInvalidTarget
 				},
 			)