refactor(merge): merge 3.1 code

merge 3.1 code

Signed-off-by: ysicing <[email protected]>

.gitignore

@@ -43,3 +43,5 @@
 
 /zendata
 client/yarn-error.log
+**/allure-results/
+/test/unittest/out/

VERSION

@@ -1 +1 @@
-3.0.1
+3.1

cmd/command/action/generate.go

@@ -0,0 +1,21 @@
+package action
+
+import (
+	"github.com/easysoft/zendata/internal/command"
+	logUtils "github.com/easysoft/zendata/pkg/utils/log"
+)
+
+func GenData(files []string) {
+	command.PrintStartInfo()
+
+	err := command.SetOutFormat()
+	defer logUtils.OutputFileWriter.Close()
+	if err != nil {
+		return
+	}
+
+	mainCtrl, _ := command.InitCtrl()
+	mainCtrl.Generate(files)
+
+	command.PrintEndInfo()
+}

cmd/command/action/parse.go

@@ -0,0 +1,8 @@
+package action
+
+import "github.com/easysoft/zendata/internal/command"
+
+func GenYaml(input string) {
+	mainCtrl, _ := command.InitCtrl()
+	mainCtrl.GenYaml(input)
+}

cmd/command/main.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/easysoft/zendata/cmd/command/action"
 	"github.com/easysoft/zendata/internal/command"
 	commandConfig "github.com/easysoft/zendata/internal/command/config"
 	configUtils "github.com/easysoft/zendata/internal/pkg/config"
@@ -134,10 +135,10 @@ func main() {
 
 	flagSet.Parse(os.Args[1:])
 
-	execCommand()
+	ExecCommand()
 }
 
-func execCommand() {
+func ExecCommand() {
 	if len(os.Args) == 1 {
 		os.Args = append(os.Args, "-help")
 	}
@@ -169,12 +170,12 @@ func opts(files []string) {
 		logUtils.PrintVersion(AppVersion, BuildTime, GoVersion, GitHash)
 		return
 
-	} else if example {
-		logUtils.PrintExample()
-		return
 	} else if help {
 		logUtils.PrintUsage()
 		return
+	} else if example {
+		logUtils.PrintExample()
+		return
 	} else if set {
 		helper.Set()
 		return
@@ -191,7 +192,7 @@ func opts(files []string) {
 		helper.AddMd5(md5, salt)
 		return
 	} else if parse {
-		genYaml(input)
+		action.GenYaml(input)
 		return
 	} else if mock {
 		if input == "" {
@@ -202,34 +203,14 @@ func opts(files []string) {
 		return
 	}
 
-	genData(files)
-}
-
-func genYaml(input string) {
-	mainCtrl, _ := command.InitCtrl()
-	mainCtrl.GenYaml(input)
+	action.GenData(files)
 }
 
 func genMock(input string) {
 	mainCtrl, _ := command.InitCtrl()
 	mainCtrl.GenMock(input)
 }
 
-func genData(files []string) {
-	command.PrintStartInfo()
-
-	err := command.SetOutFormat()
-	defer logUtils.OutputFileWriter.Close()
-	if err != nil {
-		return
-	}
-
-	mainCtrl, _ := command.InitCtrl()
-	mainCtrl.Generate(files)
-
-	command.PrintEndInfo()
-}
-
 func init() {
 	cleanup()
 }

cmd/test/command/cmd_data_list_test.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/easysoft/zendata/cmd/test/consts"
+	testHelper "github.com/easysoft/zendata/cmd/test/helper"
+	"github.com/easysoft/zendata/internal/pkg/helper"
+	"github.com/ozontech/allure-go/pkg/framework/provider"
+	"github.com/ozontech/allure-go/pkg/framework/suite"
+)
+
+func TestDataListCmd(t *testing.T) {
+	suite.RunSuite(t, new(DataListCmdSuite))
+}
+
+type DataListCmdSuite struct {
+	suite.Suite
+}
+
+func (s *DataListCmdSuite) BeforeAll(t provider.T) {
+	testHelper.BeforeAll()
+	t.AddSubSuite("DataListCmd")
+}
+func (s *DataListCmdSuite) BeforeEach(t provider.T) {
+	testHelper.PreCase()
+
+	t.AddSubSuite("DataListCmd")
+}
+func (s *DataListCmdSuite) AfterEach(t provider.T) {
+	testHelper.PostCase()
+}
+
+func (s *DataListCmdSuite) TestDataList(t provider.T) {
+	t.ID("0")
+
+	helper.ListData()
+
+	out := consts.Buf.String()
+
+	t.Require().Contains(out, "test.v1.yaml", "check list content")
+}
+
+func (s *DataListCmdSuite) TestResList(t provider.T) {
+	t.ID("0")
+
+	helper.ListRes()
+
+	out := consts.Buf.String()
+
+	t.Require().Contains(out, "city.v1.xlsx", "check list content")
+}

cmd/test/command/cmd_data_view_test.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/easysoft/zendata/cmd/test/consts"
+	testHelper "github.com/easysoft/zendata/cmd/test/helper"
+	"github.com/easysoft/zendata/internal/pkg/helper"
+	"github.com/ozontech/allure-go/pkg/framework/provider"
+	"github.com/ozontech/allure-go/pkg/framework/suite"
+)
+
+func TestDataViewCmd(t *testing.T) {
+	suite.RunSuite(t, new(DataViewCmdSuite))
+}
+
+type DataViewCmdSuite struct {
+	suite.Suite
+}
+
+func (s *DataViewCmdSuite) BeforeAll(t provider.T) {
+	testHelper.BeforeAll()
+	t.AddSubSuite("DataListCmd")
+}
+func (s *DataViewCmdSuite) BeforeEach(t provider.T) {
+	testHelper.PreCase()
+	t.AddSubSuite("DataViewCmd")
+}
+func (s *DataViewCmdSuite) AfterEach(t provider.T) {
+	testHelper.PostCase()
+}
+
+func (s *DataViewCmdSuite) TestViewDataBuildinExcel(t provider.T) {
+	t.ID("0")
+
+	consts.Buf.Reset()
+	helper.View("city.v1.city")
+	out := consts.Buf.String()
+	t.Require().Contains(out, "北京市", "check excel content")
+}
+
+func (s *DataViewCmdSuite) TestViewDataBuildinConfig(t provider.T) {
+	t.ID("0")
+
+	consts.Buf.Reset()
+	helper.View("color/v1.yaml")
+	out := consts.Buf.String()
+	t.Require().Contains(out, "rgb", "check excel content")
+
+	consts.Buf.Reset()
+	helper.View("color.v1.yaml")
+	out = consts.Buf.String()
+
+	t.Require().Contains(out, "rgb", "check excel content")
+}

cmd/test/command/cmd_gen_article_test.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/easysoft/zendata/cmd/test/consts"
+	"github.com/easysoft/zendata/cmd/test/gen"
+	testHelper "github.com/easysoft/zendata/cmd/test/helper"
+	"github.com/ozontech/allure-go/pkg/framework/provider"
+	"github.com/ozontech/allure-go/pkg/framework/suite"
+)
+
+func TestGenerateArticleCmd(t *testing.T) {
+	suite.RunSuite(t, new(GenerateArticleCmdSuite))
+}
+
+type GenerateArticleCmdSuite struct {
+	suite.Suite
+}
+
+func (s *GenerateArticleCmdSuite) BeforeAll(t provider.T) {
+	testHelper.BeforeAll()
+	t.AddSubSuite("GenerateArticleCmd")
+}
+func (s *GenerateArticleCmdSuite) BeforeEach(t provider.T) {
+	testHelper.PreCase()
+	t.AddSubSuite("GenerateArticleCmd")
+}
+func (s *GenerateArticleCmdSuite) AfterEach(t provider.T) {
+	testHelper.PostCase()
+}
+
+func (s *GenerateArticleCmdSuite) TestGenerateArticle(t provider.T) {
+	t.ID("0")
+
+	out := gen.New().
+		SetConfigs([]string{consts.CommandTestFileArticleConfig}).
+		SetOutput(consts.CommandTestFileArticleOut).
+		Gen()
+
+	t.Require().NotContains(out, "{人称代词}", "check generated data")
+}