support set more than one id for unit testcase

internal/pkg/consts/enum.go

@@ -183,8 +183,9 @@ func (TestTool) Get(str string) TestTool {
 type BuildTool string
 
 const (
-	Maven BuildTool = "maven"
-	Mocha BuildTool = "mocha"
+	Maven      BuildTool = "maven"
+	MavenShort BuildTool = "mvn"
+	Mocha      BuildTool = "mocha"
 )
 
 func (e BuildTool) String() string {

internal/pkg/domain/testing.go

@@ -248,6 +248,7 @@ type UnitResult struct {
 
 	Id     int                     `json:"id"`
 	Cid    int                     `json:"cid"`
+	Cids   string                  `json:"-"`
 	Status commConsts.ResultStatus `json:"status"`
 }
 type CaseSlice []UnitResult

internal/pkg/helper/config/config.go

@@ -38,7 +38,9 @@ func LoadByWorkspacePath(workspacePath string) (config commDomain.WorkspaceConf)
 		GetInterpreterConfig(&config)
 		return
 	}
-	pth := filepath.Join(commConsts.ConfigPath, commConsts.ConfigFile)
+
+	pth := filepath.Join(workspacePath, commConsts.ConfigDir, commConsts.ConfigFile)
+
 	return LoadByConfigPath(pth)
 }
 

internal/pkg/helper/exec/report-unit.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
+	"github.com/jinzhu/copier"
 	"io/ioutil"
 	"os"
 	"path"
@@ -181,6 +182,8 @@ func RetrieveUnitResult(testset serverDomain.TestSet, startTime int64) (
 				i118Utils.Sprintf("must_provide_allure_report_dir")))
 		}
 
+		ExpandCaseForMultiIds(&suites)
+
 	} else {
 		failedCaseIdToThresholdMap := map[string]string{}
 
@@ -201,6 +204,26 @@ func RetrieveUnitResult(testset serverDomain.TestSet, startTime int64) (
 	return
 }
 
+func ExpandCaseForMultiIds(suites *[]commDomain.UnitTestSuite) {
+	for idx1, suite := range *suites {
+		cases := suite.Cases
+		(*suites)[idx1].Cases = []commDomain.UnitResult{}
+
+		for _, cs := range cases {
+			ids := strings.Split(cs.Cids, ",")
+
+			for _, id := range ids {
+				newCs := commDomain.UnitResult{}
+				copier.CopyWithOption(&newCs, cs, copier.Option{DeepCopy: true})
+
+				newCs.Cid = stringUtils.ParseInt(id)
+
+				(*suites)[idx1].Cases = append((*suites)[idx1].Cases, newCs)
+			}
+		}
+	}
+}
+
 func GetAllureSuites(resultDir string, startTime int64) (suites []commDomain.UnitTestSuite) {
 	files, err := ioutil.ReadDir(resultDir)
 	if err != nil {
@@ -401,9 +424,7 @@ func ConvertAllureResult(cases []commDomain.AllureCase) (testSuites []commDomain
 			suiteMap[suiteName] = &suite
 		}
 
-		//suiteMap[suiteName].Name = "111"
-
-		caseId := GetAllureCaseId(cs)
+		caseIds := GetAllureCaseId(cs)
 
 		// passed, failed
 		var status commConsts.ResultStatus
@@ -413,8 +434,7 @@ func ConvertAllureResult(cases []commDomain.AllureCase) (testSuites []commDomain
 			status = commConsts.FAIL
 		}
 		caseResult := commDomain.UnitResult{
-			Id:        caseId,
-			Cid:       caseId,
+			Cids:      caseIds,
 			Title:     cs.Name,
 			TestSuite: suiteName,
 			Duration:  float32(cs.Stop-cs.Start) / 1000,
@@ -466,10 +486,10 @@ func GetAllureCaseSuiteName(cs commDomain.AllureCase) (name string) {
 	return
 }
 
-func GetAllureCaseId(cs commDomain.AllureCase) (id int) {
+func GetAllureCaseId(cs commDomain.AllureCase) (ids string) {
 	// 1. from testCaseId
-	id, err := strconv.Atoi(cs.TestCaseId)
-	if err == nil && id > 0 {
+	ids = cs.TestCaseId
+	if ids != "" {
 		return
 	}
 
@@ -477,23 +497,18 @@ func GetAllureCaseId(cs commDomain.AllureCase) (id int) {
 	for _, label := range cs.Labels {
 		if label.Name == "as_id" {
 			if label.Value != "" {
-				cs.TestCaseId = label.Value // 2
+				ids = label.Value // 2
+				return
 			}
-
-			break
 		}
 	}
-	id = stringUtils.ParseInt(cs.TestCaseId)
 
-	// 2. from the ids param in name like [cs-1]
+	// 3. from the ids param in name like [1]
 	regx := regexp.MustCompile(`\[(.+)\]`)
 	arr := regx.FindAllStringSubmatch(cs.Name, -1)
 	if len(arr) > 0 {
 		item := arr[len(arr)-1]
-		idFromName := stringUtils.ParseInt(item[1])
-		if idFromName > 0 {
-			id = idFromName
-		}
+		ids = item[1]
 	}
 
 	return
@@ -776,7 +791,7 @@ func isAllureReport(testTool commConsts.TestTool) (ret bool) {
 }
 
 func getResultDirForDifferentTool(testset *serverDomain.TestSet) {
-	if testset.TestTool == commConsts.JUnit && testset.BuildTool == commConsts.Maven {
+	if (testset.TestTool == commConsts.TestNG || testset.TestTool == commConsts.JUnit) && testset.BuildTool == commConsts.Maven {
 		testset.ResultDir = filepath.Join("target", "surefire-reports")
 		testset.ZipDir = testset.ResultDir
 
@@ -827,7 +842,7 @@ func getZapReport() (ret string) {
 }
 
 func getCaseIdFromName(cs *commDomain.UnitResult, defaultVal int) {
-	if cs.Cid > 0 {
+	if cs.Cids != "" {
 		return
 	}
 
@@ -836,11 +851,10 @@ func getCaseIdFromName(cs *commDomain.UnitResult, defaultVal int) {
 	regx := regexp.MustCompile(`^(\d+)\. (.+)`)
 	arr := regx.FindAllStringSubmatch(cs.Title, -1)
 	if len(arr) > 0 {
-		cs.Cid = stringUtils.ParseInt(arr[0][1])
+		cs.Cids = arr[0][1]
 		cs.Title = arr[0][2]
 	}
 
-	cs.Id = cs.Cid
 	if cs.Id <= 0 {
 		cs.Id = defaultVal
 	}

internal/pkg/helper/exec/unit.go

@@ -81,12 +81,12 @@ func ExecUnit(ch chan int, req serverDomain.TestSet, wsMsg *websocket.Message) (
 
 	// submit result
 	if req.SubmitResult && (report.FuncResult != nil || report.UnitResult != nil) {
-		configDir := req.WorkspacePath
+		workspaceDir := req.WorkspacePath
 		if commConsts.ExecFrom == commConsts.FromCmd {
-			configDir = commConsts.ZtfDir
+			workspaceDir = commConsts.ZtfDir
 		}
 
-		config := configHelper.LoadByWorkspacePath(configDir)
+		config := configHelper.LoadByWorkspacePath(workspaceDir)
 
 		err = zentaoHelper.CommitResult(report, req.ProductId, req.TaskId, config, wsMsg)
 	}

internal/pkg/helper/unit/uint.go

@@ -11,7 +11,7 @@ func GetUnitTools(args []string, startIndex int) {
 
 	str := args[startIndex]
 
-	if str == commConsts.Maven.String() {
+	if str == commConsts.MavenShort.String() {
 		commConsts.UnitBuildTool = commConsts.Maven
 	} else if str == commConsts.Mocha.String() {
 		commConsts.UnitBuildTool = commConsts.Mocha

internal/pkg/helper/zentao/result.go

@@ -3,8 +3,6 @@ package zentaoHelper
 import (
 	"encoding/json"
 	"fmt"
-	"os"
-
 	commConsts "github.com/easysoft/zentaoatf/internal/pkg/consts"
 	commDomain "github.com/easysoft/zentaoatf/internal/pkg/domain"
 	websocketHelper "github.com/easysoft/zentaoatf/internal/pkg/helper/websocket"
@@ -13,6 +11,7 @@ import (
 	logUtils "github.com/easysoft/zentaoatf/pkg/lib/log"
 	"github.com/fatih/color"
 	"github.com/kataras/iris/v12/websocket"
+	"os"
 )
 
 func CommitResult(report commDomain.ZtfReport, productId, taskId int, config commDomain.WorkspaceConf,

test/restapi/api_result_test.go

@@ -37,11 +37,11 @@ func (s *ResultApiSuite) TestResultSubmitApi(t provider.T) {
 	json.Unmarshal([]byte(reportJson), &report)
 
 	_, err := httpHelper.Post(url, token, report)
-	t.Require().Equal(err, nil, "list testsuite failed")
+	t.Require().Equal(err, nil, "submit result failed")
 
 	latestIdNew := getCaseResult(CaseId)["latestId"].(int64)
 
-	t.Require().Equal(latestIdNew, latestId+1, "list testsuite failed")
+	t.Require().Equal(latestIdNew, latestId+1, "submit result failed")
 }
 
 func getCaseResult(caseId int) (result map[string]interface{}) {