run test script/suite and show results

src/biz/check.go

 package biz
 
 import (
-	"fmt"
 	"github.com/easysoft/zentaoatf/src/misc"
 	"github.com/easysoft/zentaoatf/src/model"
 	"github.com/easysoft/zentaoatf/src/utils"
@@ -10,8 +9,8 @@ import (
 )
 
 func CheckResults(files []string, dir string, langType string, report *model.TestReport) {
-	fmt.Println("\n")
-	PrintWholeLine(utils.I118Prt.Sprintf("begin_analyse"), "=", color.FgBlue)
+	Printt("\n")
+	PrintWholeLine(utils.I118Prt.Sprintf("begin_analyse"), "=", color.FgCyan)
 
 	for _, scriptFile := range files {
 		logFile := utils.ScriptToLogName(dir, scriptFile)
@@ -73,7 +72,6 @@ func ValidateTestCase(scriptFile string, langType string,
 }
 
 func ValidateStep(langType string, expectLines []string, actualLines []string) (bool, []model.CheckPointLog) {
-
 	stepResult := true
 
 	checkpointLogs := make([]model.CheckPointLog, 0)

src/biz/exe.go

 package biz
 
 import (
-	"fmt"
 	"github.com/easysoft/zentaoatf/src/misc"
 	"github.com/easysoft/zentaoatf/src/model"
 	"github.com/easysoft/zentaoatf/src/utils"
@@ -11,7 +10,7 @@ import (
 )
 
 func ExeScripts(files []string, dir string, langType string, report *model.TestReport) {
-	PrintWholeLine(utils.I118Prt.Sprintf("start_execution", ""), "=", color.FgBlue)
+	PrintWholeLine(utils.I118Prt.Sprintf("start_execution", ""), "=", color.FgCyan)
 
 	startTime := time.Now().Unix()
 	report.StartTime = startTime
@@ -20,7 +19,7 @@ func ExeScripts(files []string, dir string, langType string, report *model.TestR
 		ExeScript(file, langType, dir)
 	}
 
-	PrintWholeLine(utils.I118Prt.Sprintf("end_execution", ""), "=", color.FgBlue)
+	PrintWholeLine(utils.I118Prt.Sprintf("end_execution", ""), "=", color.FgCyan)
 
 	endTime := time.Now().Unix()
 	secs := endTime - startTime
@@ -44,22 +43,18 @@ func ExeScript(file string, langType string, dir string) {
 
 	startTime := time.Now()
 
-	fmt.Println("")
-
 	msg := utils.I118Prt.Sprintf("start_case", file, startTime.Format("2006-01-02 15:04:05"))
 	PrintWholeLine(msg, "-", color.FgCyan)
 
-	//fmt.Println("")
-
 	output := utils.ExecCommand(command)
 	utils.WriteFile(logFile, strings.Join(output, ""))
-	Printt(strings.Join(output, ""))
+	if utils.RunFromCui {
+		Printt(strings.Join(output, ""))
+	}
 
 	entTime := time.Now()
 	secs := int64(entTime.Sub(startTime) / time.Second)
 
 	msg = utils.I118Prt.Sprintf("end_case", file, entTime.Format("2006-01-02 15:04:05"), secs)
 	PrintWholeLine(msg, "-", color.FgCyan)
-
-	//fmt.Println("")
 }

src/biz/log.go

@@ -14,7 +14,7 @@ func PrintWholeLine(msg string, char string, attr color.Attribute) {
 	var postfixLen int
 	if utils.RunFromCui {
 		maxX, _ := utils.Cui.Size()
-		postfixLen = maxX - utils.LeftWidth - utf8.RuneCountInString(msg) - 8
+		postfixLen = maxX - utils.LeftWidth - utf8.RuneCountInString(msg) - 9
 	} else {
 		postfixLen = utils.Prefer.Width - utf8.RuneCountInString(msg) - 6
 		if postfixLen < 0 { // no width in debug mode
@@ -71,7 +71,7 @@ func Printt(str string) {
 		output = color.Output
 	}
 
-	fmt.Fprintf(output, str+"\n")
+	fmt.Fprintf(output, str)
 }
 
 func coloredStatus(status string) string {

src/biz/report.go

@@ -26,7 +26,7 @@ func Print(report model.TestReport, workDir string) {
 	PrintAndLogColorLn(&logs, fmt.Sprintf("  %s: %d", utils.I118Prt.Sprintf("skip"), report.Skip), color.FgYellow)
 
 	for _, cs := range report.Cases {
-		str := "\n %s %s "
+		str := "\n %s %s \n"
 		status := cs.Status.String()
 		statusColor := coloredStatus(status)
 
@@ -55,9 +55,9 @@ func Print(report model.TestReport, workDir string) {
 
 					cpStatus := utils.BoolToPass(step.Status)
 					cpStatusColored := coloredStatus(cpStatus)
-					logs = append(logs, fmt.Sprintf("    %s%d: %s", utils.I118Prt.Sprintf("checkpoint"), cp.Numb,
+					logs = append(logs, fmt.Sprintf("    %s%d: %s\n", utils.I118Prt.Sprintf("checkpoint"), cp.Numb,
 						utils.BoolToPass(cp.Status)))
-					Printt(fmt.Sprintf("    %s%d: %s", utils.I118Prt.Sprintf("checkpoint"), cp.Numb, cpStatusColored))
+					Printt(fmt.Sprintf("    %s%d: %s\n", utils.I118Prt.Sprintf("checkpoint"), cp.Numb, cpStatusColored))
 
 					PrintAndLog(&logs, fmt.Sprintf("      %s %s", utils.I118Prt.Sprintf("expect_result"), cp.Expect))
 					PrintAndLog(&logs, fmt.Sprintf("      %s %s", utils.I118Prt.Sprintf("actual_result"), cp.Actual))

src/script/display.go

@@ -10,7 +10,7 @@ import (
 func Summary(file string) {
 	content := utils.ReadFile(file)
 
-	myExp := regexp.MustCompile(`<<<TC[\S\s]*caseId:([^\n]*)\n+title:([^\n]*)\n`)
+	myExp := regexp.MustCompile(`<<TC[\S\s]*caseId:([^\n]*)\n+title:([^\n]*)\n`)
 	arr := myExp.FindStringSubmatch(content)
 
 	if len(arr) > 2 {
@@ -25,7 +25,7 @@ func Detail(file string) {
 	content := utils.ReadFile(file)
 
 	myExp := regexp.MustCompile(
-		`<<<TC[\S\s]*caseId:([^\n]*)\n+title:([^\n]*)\n+steps:([\S\s]*)\n+expects:([\S\s]*?)\n+(readme:|TC;)`)
+		`<<TC[\S\s]*caseId:([^\n]*)\n+title:([^\n]*)\n+steps:([\S\s]*)\n+expects:([\S\s]*?)\n+(readme:|TC;)`)
 	arr := myExp.FindStringSubmatch(content)
 
 	if len(arr) > 2 {

src/utils/file.go

@@ -174,7 +174,7 @@ func MkDirIfNeeded(dir string) {
 func ReadCheckpointSteps(file string) []string {
 	content := ReadFile(file)
 
-	myExp := regexp.MustCompile(`<<<TC[\S\s]*steps:[^\n]*\n*([\S\s]*)\n+expects:`)
+	myExp := regexp.MustCompile(`<<TC[\S\s]*steps:[^\n]*\n*([\S\s]*)\n+expects:`)
 	arr := myExp.FindStringSubmatch(content)
 
 	str := ""
@@ -191,7 +191,7 @@ func ReadCheckpointSteps(file string) []string {
 func ReadExpect(file string) [][]string {
 	content := ReadFile(file)
 
-	myExp := regexp.MustCompile(`<<<TC[\S\s]*expects:[^\n]*\n*([\S\s]*?)(readme:|TC;)`)
+	myExp := regexp.MustCompile(`<<TC[\S\s]*expects:[^\n]*\n+([\S\s]*?)(readme:|TC;)`)
 	arr := myExp.FindStringSubmatch(content)
 
 	str := ""