More cleanup

Author: AdamDrewsTR

cmd/tools/status_test.go

@@ -6,13 +6,11 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/go-nv/goenv/internal/utils"
-
 	"github.com/go-nv/goenv/internal/cmdtest"
 	"github.com/go-nv/goenv/internal/config"
 	"github.com/go-nv/goenv/internal/manager"
 	toolspkg "github.com/go-nv/goenv/internal/tools"
-	"github.com/go-nv/goenv/testing/testutil"
+	"github.com/go-nv/goenv/internal/utils"
 )
 
 func TestStatusCommand_NoVersions(t *testing.T) {
@@ -255,14 +253,8 @@ func TestStatusCommand_EmptyTools(t *testing.T) {
 	// Create versions but no tools
 	versions := []string{"1.21.0", "1.22.0", "1.23.0"}
 	for _, v := range versions {
-		versionPath := filepath.Join(tmpDir, "versions", v)
-		// Create Go binary (required by ListInstalledVersions)
-		goBinDir := filepath.Join(versionPath, "bin")
-		if err := utils.EnsureDirWithContext(goBinDir, "create test directory"); err != nil {
-			t.Fatal(err)
-		}
-		goBin := filepath.Join(goBinDir, "go")
-		testutil.WriteTestFile(t, goBin, []byte("#!/bin/sh\necho go version"), utils.PermFileExecutable)
+		// Create Go binary using helper (handles .bat on Windows)
+		cmdtest.CreateTestBinary(t, tmpDir, v, "go")
 	}
 
 	mgr := manager.NewManager(cfg)

cmd/tools/sync_tools_test.go

@@ -23,23 +23,14 @@ func setupSyncTestEnv(t *testing.T, versions []string, tools map[string][]string
 	for _, version := range versions {
 		versionPath := filepath.Join(tmpDir, "versions", version)
 
-		// Create go binary directory (manager expects versionPath/go/bin/go)
+		// Create go binary directory (tools manager expects versionPath/go/bin/go)
 		goBinDir := filepath.Join(versionPath, "go", "bin")
 		if err := utils.EnsureDirWithContext(goBinDir, "create test directory"); err != nil {
 			t.Fatalf("Failed to create go bin directory: %v", err)
 		}
 
-		// Create mock go binary
-		goBinary := filepath.Join(goBinDir, "go")
-		var content string
-		if utils.IsWindows() {
-			goBinary += ".bat"
-			content = "@echo off\necho 'mock go'\n"
-		} else {
-			content = "#!/bin/sh\necho 'mock go'\n"
-		}
-
-		testutil.WriteTestFile(t, goBinary, []byte(content), utils.PermFileExecutable)
+		// Create mock go binary using helper (handles .bat on Windows)
+		cmdtest.CreateToolExecutable(t, goBinDir, "go")
 
 		// Create GOPATH/bin directory
 		gopathBin := filepath.Join(versionPath, "gopath", "bin")