Add SPM support to the test command (#199)

* Test command SPM support

* Remove empty line parameter from tests

* Remove more empty lines

Author: tothszabi

xcodebuild/build.go

@@ -11,6 +11,8 @@ import (
 const (
 	// XCWorkspaceExtension ...
 	XCWorkspaceExtension = ".xcworkspace"
+	// XCProjExtension ...
+	XCProjExtension = ".xcodeproj"
 )
 
 /*

xcodebuild/test.go

@@ -3,6 +3,7 @@ package xcodebuild
 import (
 	"os"
 	"os/exec"
+	"path/filepath"
 
 	"github.com/bitrise-io/go-utils/command"
 )
@@ -32,9 +33,9 @@ xcodebuild -workspace <workspacename> \
 // TestCommandModel ...
 type TestCommandModel struct {
 	projectPath string
-	isWorkspace bool
 	scheme      string
 	destination string
+	workDir     string
 
 	// buildsetting
 	generateCodeCoverage      bool
@@ -48,10 +49,9 @@ type TestCommandModel struct {
 }
 
 // NewTestCommand ...
-func NewTestCommand(projectPath string, isWorkspace bool) *TestCommandModel {
+func NewTestCommand(projectPath string) *TestCommandModel {
 	return &TestCommandModel{
 		projectPath: projectPath,
-		isWorkspace: isWorkspace,
 	}
 }
 
@@ -61,6 +61,12 @@ func (c *TestCommandModel) SetScheme(scheme string) *TestCommandModel {
 	return c
 }
 
+// SetDir ...
+func (c *TestCommandModel) SetDir(workDir string) *TestCommandModel {
+	c.workDir = workDir
+	return c
+}
+
 // SetDestination ...
 func (c *TestCommandModel) SetDestination(destination string) *TestCommandModel {
 	c.destination = destination
@@ -95,9 +101,9 @@ func (c *TestCommandModel) cmdSlice() []string {
 	slice := []string{toolName}
 
 	if c.projectPath != "" {
-		if c.isWorkspace {
+		if filepath.Ext(c.projectPath) == XCWorkspaceExtension {
 			slice = append(slice, "-workspace", c.projectPath)
-		} else {
+		} else if filepath.Ext(c.projectPath) == XCProjExtension {
 			slice = append(slice, "-project", c.projectPath)
 		}
 	}
@@ -134,7 +140,9 @@ func (c TestCommandModel) PrintableCmd() string {
 // Command ...
 func (c TestCommandModel) Command() *command.Model {
 	cmdSlice := c.cmdSlice()
-	return command.New(cmdSlice[0], cmdSlice[1:]...)
+	cmd := command.New(cmdSlice[0], cmdSlice[1:]...)
+	cmd.SetDir(c.workDir)
+	return cmd
 }
 
 // Cmd ...

xcodebuild/test_test.go

@@ -10,7 +10,6 @@ func TestTestCommandModel_cmdSlice(t *testing.T) {
 	tests := []struct {
 		name                      string
 		projectPath               string
-		isWorkspace               bool
 		scheme                    string
 		destination               string
 		generateCodeCoverage      bool
@@ -22,141 +21,135 @@ func TestTestCommandModel_cmdSlice(t *testing.T) {
 		{
 			name:                      "simulator",
 			projectPath:               "",
-			isWorkspace:               false,
 			scheme:                    "",
 			destination:               "id 2323asd2s",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
-				"",
 				"test",
 				"-destination",
 				"id 2323asd2s",
-				"",
 			},
 		},
 		{
 			name:                      "generic iOS",
 			projectPath:               "",
-			isWorkspace:               false,
 			scheme:                    "",
 			destination:               "generic/platform=iOS",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
-				"",
 				"test",
 				"-destination",
 				"generic/platform=iOS",
-				"",
 			},
 		},
 		{
 			name:                      "scheme",
 			projectPath:               "",
-			isWorkspace:               false,
 			scheme:                    "ios_scheme",
 			destination:               "",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
 				"-scheme",
 				"ios_scheme",
-				"",
 				"test",
-				"",
 			},
 		},
 		{
 			name:                      "generate code coverage",
 			projectPath:               "",
-			isWorkspace:               false,
 			scheme:                    "",
 			destination:               "",
 			generateCodeCoverage:      true,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
 				"GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES",
 				"GCC_GENERATE_TEST_COVERAGE_FILES=YES",
-				"",
 				"test",
-				"",
 			},
 		},
 		{
 			name:                      "workspace",
 			projectPath:               "ios/project.xcworkspace",
-			isWorkspace:               true,
 			scheme:                    "",
 			destination:               "",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
 				"-workspace",
 				"ios/project.xcworkspace",
-				"",
 				"test",
-				"",
 			},
 		},
 		{
 			name:                      "project",
 			projectPath:               "ios/project.xcodeproj",
-			isWorkspace:               false,
 			scheme:                    "",
 			destination:               "",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: false,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
 				"-project",
 				"ios/project.xcodeproj",
-				"",
 				"test",
-				"",
 			},
 		},
 		{
 			name:                      "disable index while building",
 			projectPath:               "",
-			isWorkspace:               false,
 			scheme:                    "",
 			destination:               "",
 			generateCodeCoverage:      false,
 			disableIndexWhileBuilding: true,
-			customBuildActions:        []string{""},
-			customOptions:             []string{""},
+			customBuildActions:        nil,
+			customOptions:             nil,
 			want: []string{
 				"xcodebuild",
-				"",
 				"test",
 				"COMPILER_INDEX_STORE_ENABLE=NO",
-				"",
+			},
+		},
+		{
+			name:                      "SPM project",
+			projectPath:               "Package.swift",
+			scheme:                    "CoolLibrary",
+			destination:               "",
+			generateCodeCoverage:      false,
+			disableIndexWhileBuilding: false,
+			customBuildActions:        nil,
+			customOptions:             nil,
+			want: []string{
+				"xcodebuild",
+				"-scheme",
+				"CoolLibrary",
+				"test",
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &TestCommandModel{
 				projectPath:               tt.projectPath,
-				isWorkspace:               tt.isWorkspace,
 				scheme:                    tt.scheme,
 				destination:               tt.destination,
 				generateCodeCoverage:      tt.generateCodeCoverage,