Improve cmd/bd test coverage from 21% to 23.1% (bd-27ea)

Added comprehensive tests for: - validate.go (parseChecks, validation results, orphaned deps, duplicates, git conflicts) - restore.go (readIssueFromJSONL, git helpers) - sync.go (git helpers, JSONL counting) Progress: 21.0% → 23.1% (+2.1%) Target: 40% (multi-session effort) Amp-Thread-ID: https://ampcode.com/threads/T-540ebf64-e14f-4541-b098-586d2b07dc3e Co-authored-by: Amp <amp@ampcode.com>
2025-10-31 19:44:43 -07:00
parent ef69d08afc
commit 76069a09dc
4 changed files with 813 additions and 31 deletions
--- a/cmd/bd/sync_test.go
+++ b/cmd/bd/sync_test.go
@@ -0,0 +1,270 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+)
+
+func TestIsGitRepo_InGitRepo(t *testing.T) {
+	// This test assumes we're running in the beads git repo
+	if !isGitRepo() {
+		t.Skip("not in a git repository")
+	}
+}
+
+func TestIsGitRepo_NotInGitRepo(t *testing.T) {
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	os.Chdir(tmpDir)
+
+	if isGitRepo() {
+		t.Error("expected false when not in git repo")
+	}
+}
+
+func TestGitHasUpstream_NoUpstream(t *testing.T) {
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a fresh git repo without upstream
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create initial commit
+	os.WriteFile("test.txt", []byte("test"), 0644)
+	exec.Command("git", "add", "test.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Should not have upstream
+	if gitHasUpstream() {
+		t.Error("expected false when no upstream configured")
+	}
+}
+
+func TestGitHasChanges_NoFile(t *testing.T) {
+	ctx := context.Background()
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a git repo
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create and commit a file
+	testFile := filepath.Join(tmpDir, "test.txt")
+	os.WriteFile(testFile, []byte("original"), 0644)
+	exec.Command("git", "add", "test.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Check - should have no changes
+	hasChanges, err := gitHasChanges(ctx, "test.txt")
+	if err != nil {
+		t.Fatalf("gitHasChanges() error = %v", err)
+	}
+	if hasChanges {
+		t.Error("expected no changes for committed file")
+	}
+}
+
+func TestGitHasChanges_ModifiedFile(t *testing.T) {
+	ctx := context.Background()
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a git repo
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create and commit a file
+	testFile := filepath.Join(tmpDir, "test.txt")
+	os.WriteFile(testFile, []byte("original"), 0644)
+	exec.Command("git", "add", "test.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Modify the file
+	os.WriteFile(testFile, []byte("modified"), 0644)
+
+	// Check - should have changes
+	hasChanges, err := gitHasChanges(ctx, "test.txt")
+	if err != nil {
+		t.Fatalf("gitHasChanges() error = %v", err)
+	}
+	if !hasChanges {
+		t.Error("expected changes for modified file")
+	}
+}
+
+func TestGitHasUnmergedPaths_CleanRepo(t *testing.T) {
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a git repo
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create initial commit
+	os.WriteFile("test.txt", []byte("test"), 0644)
+	exec.Command("git", "add", "test.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Should not have unmerged paths
+	hasUnmerged, err := gitHasUnmergedPaths()
+	if err != nil {
+		t.Fatalf("gitHasUnmergedPaths() error = %v", err)
+	}
+	if hasUnmerged {
+		t.Error("expected no unmerged paths in clean repo")
+	}
+}
+
+func TestGitCommit_Success(t *testing.T) {
+	ctx := context.Background()
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a git repo
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create initial commit
+	os.WriteFile("initial.txt", []byte("initial"), 0644)
+	exec.Command("git", "add", "initial.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Create a new file
+	testFile := "test.txt"
+	os.WriteFile(testFile, []byte("content"), 0644)
+
+	// Commit the file
+	err := gitCommit(ctx, testFile, "test commit")
+	if err != nil {
+		t.Fatalf("gitCommit() error = %v", err)
+	}
+
+	// Verify file is committed
+	hasChanges, err := gitHasChanges(ctx, testFile)
+	if err != nil {
+		t.Fatalf("gitHasChanges() error = %v", err)
+	}
+	if hasChanges {
+		t.Error("expected no changes after commit")
+	}
+}
+
+func TestGitCommit_AutoMessage(t *testing.T) {
+	ctx := context.Background()
+	tmpDir := t.TempDir()
+	originalWd, _ := os.Getwd()
+	defer os.Chdir(originalWd)
+
+	// Create a git repo
+	os.Chdir(tmpDir)
+	exec.Command("git", "init").Run()
+	exec.Command("git", "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "config", "user.name", "Test User").Run()
+
+	// Create initial commit
+	os.WriteFile("initial.txt", []byte("initial"), 0644)
+	exec.Command("git", "add", "initial.txt").Run()
+	exec.Command("git", "commit", "-m", "initial").Run()
+
+	// Create a new file
+	testFile := "test.txt"
+	os.WriteFile(testFile, []byte("content"), 0644)
+
+	// Commit with auto-generated message (empty string)
+	err := gitCommit(ctx, testFile, "")
+	if err != nil {
+		t.Fatalf("gitCommit() error = %v", err)
+	}
+
+	// Verify it committed (message generation worked)
+	cmd := exec.Command("git", "log", "-1", "--pretty=%B")
+	output, _ := cmd.Output()
+	if len(output) == 0 {
+		t.Error("expected commit message to be generated")
+	}
+}
+
+func TestCountIssuesInJSONL_NonExistent(t *testing.T) {
+	count, err := countIssuesInJSONL("/nonexistent/path.jsonl")
+	if err == nil {
+		t.Error("expected error for nonexistent file")
+	}
+	if count != 0 {
+		t.Errorf("count = %d, want 0 on error", count)
+	}
+}
+
+func TestCountIssuesInJSONL_EmptyFile(t *testing.T) {
+	tmpDir := t.TempDir()
+	jsonlPath := filepath.Join(tmpDir, "empty.jsonl")
+	os.WriteFile(jsonlPath, []byte(""), 0644)
+
+	count, err := countIssuesInJSONL(jsonlPath)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if count != 0 {
+		t.Errorf("count = %d, want 0", count)
+	}
+}
+
+func TestCountIssuesInJSONL_MultipleIssues(t *testing.T) {
+	tmpDir := t.TempDir()
+	jsonlPath := filepath.Join(tmpDir, "issues.jsonl")
+	content := `{"id":"bd-1"}
+{"id":"bd-2"}
+{"id":"bd-3"}
+`
+	os.WriteFile(jsonlPath, []byte(content), 0644)
+
+	count, err := countIssuesInJSONL(jsonlPath)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if count != 3 {
+		t.Errorf("count = %d, want 3", count)
+	}
+}
+
+func TestCountIssuesInJSONL_WithMalformedLines(t *testing.T) {
+	tmpDir := t.TempDir()
+	jsonlPath := filepath.Join(tmpDir, "mixed.jsonl")
+	content := `{"id":"bd-1"}
+not valid json
+{"id":"bd-2"}
+{"id":"bd-3"}
+`
+	os.WriteFile(jsonlPath, []byte(content), 0644)
+
+	count, err := countIssuesInJSONL(jsonlPath)
+	// countIssuesInJSONL returns error on malformed JSON
+	if err == nil {
+		t.Error("expected error for malformed JSON")
+	}
+	// Should have counted the first valid issue before hitting error
+	if count != 1 {
+		t.Errorf("count = %d, want 1 (before malformed line)", count)
+	}
+}