Switch tests to use alecthomas/assert/v2

internal/chezmoi/findexecutable_darwin_test.go

@@ -3,6 +3,8 @@ package chezmoi
 import (
 	"fmt"
 	"testing"
+
+	"github.com/alecthomas/assert/v2"
 )
 
 func TestFindExecutableOneNeedle(t *testing.T) {
@@ -32,13 +34,8 @@ func TestFindExecutableOneNeedle(t *testing.T) {
 		name := fmt.Sprintf("FindExecutable %v in %#v as %v", test.file, test.paths, test.expected)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.file, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-			}
-
-			if actual != test.expected {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, test.expected, actual)
 		})
 	}
 }
@@ -75,14 +72,8 @@ func TestFindExecutableMultipleNeedles(t *testing.T) {
 		)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.files, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-				return
-			}
-
-			if actual != test.expected {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, test.expected, actual)
 		})
 	}
 }

internal/chezmoi/findexecutable_unix_test.go

@@ -5,6 +5,8 @@ package chezmoi
 import (
 	"fmt"
 	"testing"
+
+	"github.com/alecthomas/assert/v2"
 )
 
 func TestFindExecutableOneNeedle(t *testing.T) {
@@ -34,14 +36,8 @@ func TestFindExecutableOneNeedle(t *testing.T) {
 		name := fmt.Sprintf("FindExecutable %v in %#v as %v", test.file, test.paths, test.expected)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.file, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-				return
-			}
-
-			if actual != test.expected {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, test.expected, actual)
 		})
 	}
 }
@@ -78,14 +74,8 @@ func TestFindExecutableMultipleNeedles(t *testing.T) {
 		)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.files, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-				return
-			}
-
-			if actual != test.expected {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, test.expected, actual)
 		})
 	}
 }

internal/chezmoi/findexecutable_windows_test.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"strings"
 	"testing"
+
+	"github.com/alecthomas/assert/v2"
 )
 
 func TestFindExecutableOneNeedle(t *testing.T) {
@@ -56,14 +58,8 @@ func TestFindExecutableOneNeedle(t *testing.T) {
 		name := fmt.Sprintf("FindExecutable %v in %#v as %v", test.file, test.paths, test.expected)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.file, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-				return
-			}
-
-			if !strings.EqualFold(actual, test.expected) {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, strings.ToLower(test.expected), strings.ToLower(actual))
 		})
 	}
 }
@@ -116,14 +112,8 @@ func TestFindExecutableMultipleNeedles(t *testing.T) {
 		name := fmt.Sprintf("FindExecutable %v in %#v as %v", test.file, test.paths, test.expected)
 		t.Run(name, func(t *testing.T) {
 			actual, err := FindExecutable(test.file, test.paths)
-			if err != nil {
-				t.Errorf("FindExecutable() error = %v, expected = nil", err)
-				return
-			}
-
-			if !strings.EqualFold(actual, test.expected) {
-				t.Errorf("FindExecutable() actual = %v, expected = %v", actual, test.expected)
-			}
+			assert.NoError(t, err)
+			assert.Equal(t, strings.ToLower(test.expected), strings.ToLower(actual))
 		})
 	}
 }