more compact specification of recorded commands

2 files changed, 27 insertions, 25 deletions

diff --git a/pkg/rtree/get_test.go b/pkg/rtree/get_test.go
index 8ab21f1..bdd0f2e 100644
--- a/pkg/rtree/get_test.go
+++ b/pkg/rtree/get_test.go
@@ -22,8 +22,6 @@ import (
 	"fmt"
 	"path/filepath"
 	"testing"
-
-	"github.com/majewsky/gofu/pkg/cli"
 )
 
 var testIndexWithTwoRepos = Index{
@@ -63,14 +61,10 @@ func TestGetNewRepo(t *testing.T) {
 	target := filepath.Join(RootPath, "/github.com/another/repo")
 
 	Test{
-		Args:         []string{"get", "gh:another/repo"},
-		Index:        testIndexWithTwoRepos,
-		ExpectOutput: target + "\n",
-		ExpectExecution: []RecordedCommand{
-			{Cmd: cli.Command{
-				Program: []string{"git", "clone", "gh:another/repo", target},
-			}},
-		},
+		Args:            []string{"get", "gh:another/repo"},
+		Index:           testIndexWithTwoRepos,
+		ExpectOutput:    target + "\n",
+		ExpectExecution: Recorded("git clone gh:another/repo " + target),
 		ExpectIndex: &Index{
 			Repos: []*Repo{
 				{
@@ -99,16 +93,10 @@ func TestGetNewForkAsRemote(t *testing.T) {
 				"Enter remote name for https://example.com/git: myfork\n",
 			target,
 		),
-		ExpectExecution: []RecordedCommand{
-			{Cmd: cli.Command{
-				Program: []string{"git", "remote", "add", "myfork", "https://example.com/git"},
-				WorkDir: target,
-			}},
-			{Cmd: cli.Command{
-				Program: []string{"git", "remote", "update", "myfork"},
-				WorkDir: target,
-			}},
-		},
+		ExpectExecution: Recorded(
+			"@"+target+" git remote add myfork https://example.com/git",
+			"@"+target+" git remote update myfork",
+		),
 		ExpectIndex: &Index{
 			Repos: []*Repo{
 				testIndexWithTwoRepos.Repos[0],
@@ -135,11 +123,7 @@ func TestGetNewForkAsSeparate(t *testing.T) {
 			"Found possible fork candidates. What to do? -> clone to %s\n",
 			target,
 		),
-		ExpectExecution: []RecordedCommand{
-			{Cmd: cli.Command{
-				Program: []string{"git", "clone", "https://example.com/git", target},
-			}},
-		},
+		ExpectExecution: Recorded("git clone https://example.com/git " + target),
 		ExpectIndex: &Index{
 			Repos: []*Repo{
 				{
diff --git a/pkg/rtree/shared_test.go b/pkg/rtree/shared_test.go
index cad9378..3dadcec 100644
--- a/pkg/rtree/shared_test.go
+++ b/pkg/rtree/shared_test.go
@@ -137,6 +137,24 @@ type RecordedCommand struct {
 	Fails  bool
 }
 
+//Recorded is a shortcut function for initializing a []RecordedCommand. It
+//splits each line on whitespace to obtain the command line of that command,
+//and recognizes a leading "@/some/path" to set the workdir.
+//
+//This function can only be used for RecordedCommands without output that do not fail.
+func Recorded(lines ...string) (cs []RecordedCommand) {
+	cs = make([]RecordedCommand, len(lines))
+	for idx, line := range lines {
+		cmdline := strings.Fields(line)
+		if strings.HasPrefix(cmdline[0], "@") {
+			cs[idx].Cmd.WorkDir = strings.TrimPrefix(cmdline[0], "@")
+			cmdline = cmdline[1:]
+		}
+		cs[idx].Cmd.Program = cmdline
+	}
+	return
+}
+
 //CommandSimulator implements the cli.CommandRunner interface (via its Next
 //method). When a cli.Command is given to Next(), it is matched with the next
 //command in the .Cmd list, and the result from that RecordedCommand is