Expand tests

Author: Naatan

test/integration/executor_int_test.go

@@ -4,19 +4,22 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 	"time"
 
+	"github.com/ActiveState/termtest"
+
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/environment"
+	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/osutils"
 	"github.com/ActiveState/cli/internal/svcctl"
 	"github.com/ActiveState/cli/internal/testhelpers/e2e"
 	"github.com/ActiveState/cli/internal/testhelpers/suite"
 	"github.com/ActiveState/cli/internal/testhelpers/tagsuite"
 	"github.com/ActiveState/cli/pkg/platform/runtime/executors"
 	"github.com/ActiveState/cli/pkg/platform/runtime/target"
-	"github.com/ActiveState/termtest"
 )
 
 type ExecutorIntegrationTestSuite struct {
@@ -109,8 +112,8 @@ func (suite *ExecutorIntegrationTestSuite) TestExecutorBatArguments() {
 
 	root := environment.GetRootPathUnsafe()
 	executorsPath := filepath.Join(ts.Dirs.Work, "executors")
-	srcBatFile := filepath.Join(root, "test", "integration", "testdata", "batarguments", "batargtest.bat")
-	targetExeFile := filepath.Join(executorsPath, "batargtest.exe")
+	srcExes := fileutils.ListFilesUnsafe(filepath.Join(root, "test", "integration", "testdata", "batarguments"))
+	reportExe := filepath.Join(executorsPath, "report.exe")
 
 	t := target.NewCustomTarget("ActiveState-CLI", "test", constants.ValidZeroUUID, "", target.TriggerExecutor)
 	executors := executors.New(executorsPath)
@@ -119,17 +122,28 @@ func (suite *ExecutorIntegrationTestSuite) TestExecutorBatArguments() {
 		svcctl.NewIPCSockPathFromGlobals().String(),
 		t,
 		osutils.EnvSliceToMap(ts.Env),
-		[]string{srcBatFile},
+		srcExes,
 	)
 	suite.Require().NoError(err)
-	suite.Require().FileExists(targetExeFile)
+	suite.Require().FileExists(reportExe)
 
 	// Force override ACTIVESTATE_CI to false, because communicating with the svc will fail, and if this is true
 	// the executor will interrupt.
 	// For this test we don't care about the svc communication.
 	env := e2e.OptAppendEnv("ACTIVESTATE_CI=false")
 
-	cp := ts.SpawnCmdWithOpts(targetExeFile, e2e.OptArgs("a<b", "hello world"), env)
-	cp.Expect(`"a<b" "hello world"`, termtest.OptExpectTimeout(5*time.Second))
+	inputs := []string{"a<b", "b>a", "hello world", "&whoami", "imnot|apipe", "%NotAppData%", "^NotEscaped", "(NotAGroup)"}
+	outputs := `"` + strings.Join(inputs, `" "`) + `"`
+	cp := ts.SpawnCmdWithOpts(reportExe, e2e.OptArgs(inputs...), env)
+	cp.Expect(outputs, termtest.OptExpectTimeout(5*time.Second))
+	cp.ExpectExitCode(0)
+
+	cp = ts.SpawnCmdWithOpts(reportExe, e2e.OptArgs("&whoami"), env)
+	cp.Expect(`"&whoami"`, termtest.OptExpectTimeout(5*time.Second))
+	cp.ExpectExitCode(0)
+
+	// Ensure regular arguments aren't quoted
+	cp = ts.SpawnCmdWithOpts(reportExe, e2e.OptArgs("ImNormal", "I'm Special", "ImAlsoNormal"), env)
+	cp.Expect(`ImNormal "I'm Special" ImAlsoNormal`, termtest.OptExpectTimeout(5*time.Second))
 	cp.ExpectExitCode(0)
 }