From 8367defc3e0b729345340807ecf62b3eced8b199 Mon Sep 17 00:00:00 2001 From: Aaron Chen <462826@qq.com> Date: Wed, 31 Jul 2019 15:43:51 +0800 Subject: [PATCH] run test script/suite and show results --- src/biz/check.go | 6 ++---- src/biz/exe.go | 15 +++++---------- src/biz/log.go | 4 ++-- src/biz/report.go | 6 +++--- src/script/display.go | 4 ++-- src/utils/file.go | 4 ++-- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/biz/check.go b/src/biz/check.go index 717d3407..e2ed8b76 100644 --- a/src/biz/check.go +++ b/src/biz/check.go @@ -1,7 +1,6 @@ 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) diff --git a/src/biz/exe.go b/src/biz/exe.go index 177d748e..6fb951d5 100644 --- a/src/biz/exe.go +++ b/src/biz/exe.go @@ -1,7 +1,6 @@ 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("") } diff --git a/src/biz/log.go b/src/biz/log.go index 8cc7e954..036cb037 100644 --- a/src/biz/log.go +++ b/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 { diff --git a/src/biz/report.go b/src/biz/report.go index 734ad213..92581cc3 100644 --- a/src/biz/report.go +++ b/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)) diff --git a/src/script/display.go b/src/script/display.go index ac4562cc..bb9bcb81 100644 --- a/src/script/display.go +++ b/src/script/display.go @@ -10,7 +10,7 @@ import ( func Summary(file string) { content := utils.ReadFile(file) - myExp := regexp.MustCompile(`<< 2 { @@ -25,7 +25,7 @@ func Detail(file string) { content := utils.ReadFile(file) myExp := regexp.MustCompile( - `<< 2 { diff --git a/src/utils/file.go b/src/utils/file.go index 84591b84..3d062427 100644 --- a/src/utils/file.go +++ b/src/utils/file.go @@ -174,7 +174,7 @@ func MkDirIfNeeded(dir string) { func ReadCheckpointSteps(file string) []string { content := ReadFile(file) - myExp := regexp.MustCompile(`<<