Add test for BatchCommand

Author: lunny

modules/git/batch_reader.go

@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/git/gitcmd"
+	"code.gitea.io/gitea/modules/git/internal"
 	"code.gitea.io/gitea/modules/log"
 
 	"github.com/djherbis/buffer"
@@ -69,7 +70,7 @@ func newCatFileBatch(ctx context.Context, repoPath, batchArg string) *batchCatFi
 	go func() {
 		stderr := strings.Builder{}
 		err := gitcmd.NewCommand("cat-file").
-			AddArguments(gitcmd.ToTrustCmdArg(batchArg)).
+			AddArguments(internal.CmdArg(batchArg)).
 			WithDir(repoPath).
 			WithStdin(batchStdinReader).
 			WithStdout(batchStdoutWriter).

modules/git/blob_test.go

@@ -9,11 +9,25 @@ import (
 	"path/filepath"
 	"testing"
 
+	"code.gitea.io/gitea/modules/test"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func TestBlob_Data(t *testing.T) {
+func TestBlob_Data_Batch(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, false)()
+
+	testBlobData(t)
+}
+
+func TestBlob_Data_BatchCommand(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testBlobData(t)
+}
+
+func testBlobData(t *testing.T) {
 	output := "file2\n"
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
 	repo, err := OpenRepository(t.Context(), bareRepo1Path)

modules/git/commit_info_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"code.gitea.io/gitea/modules/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -30,28 +31,57 @@ func cloneRepo(tb testing.TB, url string) (string, error) {
 }
 
 func testGetCommitsInfo(t *testing.T, repo1 *Repository) {
+	type expectedEntryInfo struct {
+		CommitID string
+		Size     int64
+	}
+
 	// these test case are specific to the repo1 test repo
 	testCases := []struct {
 		CommitID           string
 		Path               string
-		ExpectedIDs        map[string]string
+		ExpectedIDs        map[string]expectedEntryInfo
 		ExpectedTreeCommit string
 	}{
-		{"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", "", map[string]string{
-			"file1.txt": "95bb4d39648ee7e325106df01a621c530863a653",
-			"file2.txt": "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
+		{"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", "", map[string]expectedEntryInfo{
+			"file1.txt": {
+				CommitID: "95bb4d39648ee7e325106df01a621c530863a653",
+				Size:     6,
+			},
+			"file2.txt": {
+				CommitID: "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
+				Size:     6,
+			},
 		}, "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2"},
-		{"2839944139e0de9737a044f78b0e4b40d989a9e3", "", map[string]string{
-			"file1.txt":   "2839944139e0de9737a044f78b0e4b40d989a9e3",
-			"branch1.txt": "9c9aef8dd84e02bc7ec12641deb4c930a7c30185",
+		{"2839944139e0de9737a044f78b0e4b40d989a9e3", "", map[string]expectedEntryInfo{
+			"file1.txt": {
+				CommitID: "2839944139e0de9737a044f78b0e4b40d989a9e3",
+				Size:     15,
+			},
+			"branch1.txt": {
+				CommitID: "9c9aef8dd84e02bc7ec12641deb4c930a7c30185",
+				Size:     8,
+			},
 		}, "2839944139e0de9737a044f78b0e4b40d989a9e3"},
-		{"5c80b0245c1c6f8343fa418ec374b13b5d4ee658", "branch2", map[string]string{
-			"branch2.txt": "5c80b0245c1c6f8343fa418ec374b13b5d4ee658",
+		{"5c80b0245c1c6f8343fa418ec374b13b5d4ee658", "branch2", map[string]expectedEntryInfo{
+			"branch2.txt": {
+				CommitID: "5c80b0245c1c6f8343fa418ec374b13b5d4ee658",
+				Size:     8,
+			},
 		}, "5c80b0245c1c6f8343fa418ec374b13b5d4ee658"},
-		{"feaf4ba6bc635fec442f46ddd4512416ec43c2c2", "", map[string]string{
-			"file1.txt": "95bb4d39648ee7e325106df01a621c530863a653",
-			"file2.txt": "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
-			"foo":       "37991dec2c8e592043f47155ce4808d4580f9123",
+		{"feaf4ba6bc635fec442f46ddd4512416ec43c2c2", "", map[string]expectedEntryInfo{
+			"file1.txt": {
+				CommitID: "95bb4d39648ee7e325106df01a621c530863a653",
+				Size:     6,
+			},
+			"file2.txt": {
+				CommitID: "8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2",
+				Size:     6,
+			},
+			"foo": {
+				CommitID: "37991dec2c8e592043f47155ce4808d4580f9123",
+				Size:     0,
+			},
 		}, "feaf4ba6bc635fec442f46ddd4512416ec43c2c2"},
 	}
 	for _, testCase := range testCases {
@@ -93,16 +123,29 @@ func testGetCommitsInfo(t *testing.T, repo1 *Repository) {
 		for _, commitInfo := range commitsInfo {
 			entry := commitInfo.Entry
 			commit := commitInfo.Commit
-			expectedID, ok := testCase.ExpectedIDs[entry.Name()]
+			expectedInfo, ok := testCase.ExpectedIDs[entry.Name()]
 			if !assert.True(t, ok) {
 				continue
 			}
-			assert.Equal(t, expectedID, commit.ID.String())
+			assert.Equal(t, expectedInfo.CommitID, commit.ID.String())
+			assert.Equal(t, expectedInfo.Size, entry.Size(), entry.Name())
 		}
 	}
 }
 
-func TestEntries_GetCommitsInfo(t *testing.T) {
+func TestEntries_GetCommitsInfo_Batch(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, false)()
+
+	testEntriesGetCommitsInfo(t)
+}
+
+func TestEntries_GetCommitsInfo_BatchCommand(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testEntriesGetCommitsInfo(t)
+}
+
+func testEntriesGetCommitsInfo(t *testing.T) {
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
 	bareRepo1, err := OpenRepository(t.Context(), bareRepo1Path)
 	assert.NoError(t, err)

modules/git/gitcmd/command.go

@@ -185,12 +185,6 @@ func (c *Command) AddConfig(key, value string) *Command {
 	return c
 }
 
-// ToTrustCmdArg converts a string (trusted as argument) to CmdArg
-// In most cases, it shouldn't be used. Use AddXxx function instead
-func ToTrustCmdArg(arg string) internal.CmdArg {
-	return internal.CmdArg(arg)
-}
-
 // ToTrustedCmdArgs converts a list of strings (trusted as argument) to TrustedCmdArgs
 // In most cases, it shouldn't be used. Use NewCommand().AddXxx() function instead
 func ToTrustedCmdArgs(args []string) TrustedCmdArgs {

modules/git/languagestats/language_stats_test.go

@@ -10,12 +10,25 @@ import (
 
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func TestRepository_GetLanguageStats(t *testing.T) {
+func TestRepository_GetLanguageStats_Batch(t *testing.T) {
+	defer test.MockVariableValue(&git.DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testRepositoryGetLanguageStats(t)
+}
+
+func TestRepository_GetLanguageStats_BatchCommand(t *testing.T) {
+	defer test.MockVariableValue(&git.DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testRepositoryGetLanguageStats(t)
+}
+
+func testRepositoryGetLanguageStats(t *testing.T) {
 	setting.AppDataPath = t.TempDir()
 	repoPath := "../tests/repos/language_stats_repo"
 	gitRepo, err := git.OpenRepository(t.Context(), repoPath)

modules/git/pipeline/lfs_test.go

@@ -0,0 +1,53 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package pipeline
+
+import (
+	"testing"
+	"time"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/test"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFindLFSFile_Batch(t *testing.T) {
+	defer test.MockVariableValue(&git.DefaultFeatures().SupportCatFileBatchCommand, false)()
+
+	testFindLFSFile(t)
+}
+
+func TestFindLFSFile_BatchCommand(t *testing.T) {
+	defer test.MockVariableValue(&git.DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testFindLFSFile(t)
+}
+
+func testFindLFSFile(t *testing.T) {
+	repoPath := "../tests/repos/repo_lfs"
+	gitRepo, err := git.OpenRepository(t.Context(), repoPath)
+	require.NoError(t, err)
+	defer gitRepo.Close()
+
+	objectID := git.MustIDFromString("2b6c6c4eaefa24b22f2092c3d54b263ff26feb58")
+
+	stats, err := FindLFSFile(gitRepo, objectID)
+	require.NoError(t, err)
+
+	tm, err := time.Parse(time.RFC3339, "2022-12-21T17:56:42-05:00")
+	require.NoError(t, err)
+
+	assert.Equal(t, []*LFSResult{
+		{
+			Name:           "CONTRIBUTING.md",
+			SHA:            "73cf03db6ece34e12bf91e8853dc58f678f2f82d",
+			Summary:        "Initial commit",
+			When:           tm,
+			BranchName:     "master",
+			FullCommitName: "master",
+		},
+	}, stats)
+}

modules/git/pipeline/main_test.go

@@ -0,0 +1,40 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package pipeline
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
+)
+
+func testRun(m *testing.M) error {
+	gitHomePath, err := os.MkdirTemp(os.TempDir(), "git-home")
+	if err != nil {
+		return fmt.Errorf("unable to create temp dir: %w", err)
+	}
+	defer util.RemoveAll(gitHomePath)
+	setting.Git.HomePath = gitHomePath
+
+	if err = git.InitFull(); err != nil {
+		return fmt.Errorf("failed to call Init: %w", err)
+	}
+
+	exitCode := m.Run()
+	if exitCode != 0 {
+		return fmt.Errorf("run test failed, ExitCode=%d", exitCode)
+	}
+	return nil
+}
+
+func TestMain(m *testing.M) {
+	if err := testRun(m); err != nil {
+		_, _ = fmt.Fprintf(os.Stderr, "Test failed: %v", err)
+		os.Exit(1)
+	}
+}

modules/git/repo_branch_test.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"code.gitea.io/gitea/modules/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -96,7 +97,19 @@ func BenchmarkGetRefsBySha(b *testing.B) {
 	_, _ = bareRepo5.GetRefsBySha("58a4bcc53ac13e7ff76127e0fb518b5262bf09af", "")
 }
 
-func TestRepository_IsObjectExist(t *testing.T) {
+func TestRepository_IsObjectExist_Batch(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, false)()
+
+	testRepositoryIsObjectExist(t)
+}
+
+func TestRepository_IsObjectExist_BatchCommand(t *testing.T) {
+	defer test.MockVariableValue(&DefaultFeatures().SupportCatFileBatchCommand, true)()
+
+	testRepositoryIsObjectExist(t)
+}
+
+func testRepositoryIsObjectExist(t *testing.T) {
 	repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare"))
 	require.NoError(t, err)
 	defer repo.Close()