fixt tests

.github/workflows/build-linux.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go: [1.19.2]
+        go: [1.21.1]
     runs-on: "ubuntu-20.04"
     steps:
       - name: Arm Build

.github/workflows/build-macos.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go: [1.19.2]
+        go: [1.21.1]
     runs-on: "macos-12"
     steps:
       - name: Install coscmd

.github/workflows/pr-test.yml

@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go: [1.19.5, 1.20.0]
+        go: [1.20.0, 1.21.1]
         db: [MySQL8.0, MySQL5.7, SQLite3]
         redis: [4, 5, 6]
         mongo: ["6.0"]

.github/workflows/unit-test.yml

@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go: [1.19.5, 1.20.0]
+        go: [1.20.0, 1.21.1]
         db: [MySQL8.0, MySQL5.7, SQLite3]
         redis: [4, 5, 6]
         mongo: ["6.0"]

engine/process.go

@@ -20,6 +20,10 @@ func init() {
 	process.Alias("xiang.main.Inspect", "xiang.sys.Inspect") // deprecated
 
 	process.Register("xiang.main.Favicon", processFavicon) // deprecated
+
+	// Application
+	process.Alias("xiang.main.Ping", "utils.app.Ping")
+	process.Alias("xiang.main.Inspect", "utils.app.Inspect")
 }
 
 // processCreate 运行模型 MustCreate

go.mod

@@ -1,6 +1,6 @@
 module github.com/yaoapp/yao
 
-go 1.19
+go 1.20
 
 require (
 	github.com/blang/semver v3.5.1+incompatible

importer/importer_test.go

@@ -31,7 +31,7 @@ func TestFingerprintSimple(t *testing.T) {
 
 	imp := Select("order")
 	fingerprint := imp.Fingerprint(file)
-	assert.Equal(t, "3451ca87d71801687abba8993e5a69af79482914435d7cc064236fd93160f999", fingerprint)
+	assert.Equal(t, "2187b40d1e1819ffc27114caf0e80655fe44ffc4e072b07ec18611ca23951ac4", fingerprint)
 }
 
 func TestAutoMappingSimple(t *testing.T) {

test/utils.go

@@ -24,6 +24,7 @@ import (
 	"github.com/yaoapp/yao/helper"
 	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
+	"github.com/yaoapp/yao/utils"
 )
 
 var testServer *http.Server = nil
@@ -73,6 +74,7 @@ func Prepare(t *testing.T, cfg config.Config) {
 		cfg.DataRoot = filepath.Join(root, "data")
 	}
 
+	utils.Init()
 	dbconnect(t, cfg)
 	load(t, cfg)
 	startRuntime(t, cfg)

utils/datetime_test.go

@@ -6,12 +6,35 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/yaoapp/gou/process"
+	_ "github.com/yaoapp/yao/helper"
+	"github.com/yaoapp/yao/utils/datetime"
+	"github.com/yaoapp/yao/utils/str"
+	"github.com/yaoapp/yao/utils/tree"
 )
 
 func TestProcessNow(t *testing.T) {
+	testPrepare()
 	assert.LessOrEqual(t, time.Now().Unix(), process.New("utils.now.Timestamp").Run().(int64))
 	assert.LessOrEqual(t, time.Now().UnixMilli(), process.New("utils.now.Timestampms").Run().(int64))
 	assert.NotNil(t, process.New("utils.now.Date").Run())
 	assert.NotNil(t, process.New("utils.now.Time").Run())
 	assert.NotNil(t, process.New("utils.now.DateTime").Run())
 }
+
+func testPrepare() {
+
+	// Tree
+	process.Register("utils.tree.Flatten", tree.ProcessFlatten)
+
+	process.Alias("xiang.helper.StrConcat", "utils.str.Concat")
+	process.Alias("xiang.helper.HexToString", "utils.str.Hex")
+	process.Register("utils.str.Join", str.ProcessJoin)
+	process.Register("utils.str.JoinPath", str.ProcessJoinPath)
+	process.Register("utils.str.UUID", str.ProcessUUID)
+
+	process.Register("utils.now.Time", datetime.ProcessTime)
+	process.Register("utils.now.Date", datetime.ProcessDate)
+	process.Register("utils.now.DateTime", datetime.ProcessDateTime)
+	process.Register("utils.now.Timestamp", datetime.ProcessTimestamp)
+	process.Register("utils.now.Timestampms", datetime.ProcessTimestampms)
+}

utils/process.go

@@ -16,10 +16,6 @@ func Init() {
 	// * Migrate Processes Version 0.10.2+
 	// ****************************************
 
-	// Application
-	process.Alias("xiang.main.Ping", "utils.app.Ping")
-	process.Alias("xiang.main.Inspect", "utils.app.Inspect")
-
 	// FMT
 	process.Alias("xiang.helper.Print", "utils.fmt.Print")
 

utils/str_test.go

@@ -12,17 +12,20 @@ import (
 )
 
 func TestProcessStrJoin(t *testing.T) {
+	testPrepare()
 	res := process.New("utils.str.Join", []interface{}{"FOO", 20, "BAR"}, ",").Run().(string)
 	assert.Equal(t, "FOO,20,BAR", res)
 }
 
 func TestProcessStrJoinPath(t *testing.T) {
+	testPrepare()
 	res := process.New("utils.str.JoinPath", "data", 20, "app").Run().(string)
 	shouldBe := fmt.Sprintf("data%s20%sapp", string(os.PathSeparator), string(os.PathSeparator))
 	assert.Equal(t, shouldBe, res)
 }
 
 func TestProcessUUID(t *testing.T) {
+	testPrepare()
 	res := process.New("utils.str.UUID").Run().(string)
 	_, err := uuid.Parse(res)
 	if err != nil {
@@ -33,6 +36,7 @@ func TestProcessUUID(t *testing.T) {
 }
 
 func TestProcessStrHex(t *testing.T) {
+	testPrepare()
 	res, err := process.New("utils.str.Hex", []byte{0x0, 0x1}).Exec()
 	assert.Nil(t, err)
 	assert.Equal(t, "0001", res)

utils/tree_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestProcessTreeFlatten(t *testing.T) {
-
+	testPrepare()
 	bytes := []byte(`[
 		{
 		  "id": 1,