单测:将gomonkey替换为xgo

apolloconfig · Apr 3, 2024 · e292702 · e292702
1 parent 9a87bea
commit e292702
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/client_test.go b/client_test.go
@@ -22,11 +22,10 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"reflect"
 	"testing"
 	"time"
 
-	"github.com/agiledragon/gomonkey/v2"
+	"github.com/xhd2015/xgo/runtime/mock"
 
 	"github.com/apolloconfig/agollo/v4/agcache/memory"
 	"github.com/apolloconfig/agollo/v4/component/remote"
@@ -358,8 +357,7 @@ func TestUseEventDispatch(t *testing.T) {
 }
 
 func TestGetConfigAndInitValNotNil(t *testing.T) {
-	var apc *remote.AbsApolloConfig
-	patch := gomonkey.ApplyMethod(reflect.TypeOf(apc), "SyncWithNamespace", func(_ *remote.AbsApolloConfig, namespace string, appConfigFunc func() config.AppConfig) *config.ApolloConfig {
+	mock.Patch((*remote.AbsApolloConfig).SyncWithNamespace, func(_ *remote.AbsApolloConfig, namespace string, appConfigFunc func() config.AppConfig) *config.ApolloConfig {
 		return &config.ApolloConfig{
 			ApolloConnConfig: config.ApolloConnConfig{
 				AppID:         "testID",
@@ -368,7 +366,6 @@ func TestGetConfigAndInitValNotNil(t *testing.T) {
 			Configurations: map[string]interface{}{"testKey": "testValue"},
 		}
 	})
-	defer patch.Reset()
 
 	client := createMockApolloConfig(120)
 	cf := client.GetConfig("testNotFound")
@@ -379,11 +376,9 @@ func TestGetConfigAndInitValNotNil(t *testing.T) {
 }
 
 func TestGetConfigAndInitValNil(t *testing.T) {
-	var apc *remote.AbsApolloConfig
-	patch := gomonkey.ApplyMethod(reflect.TypeOf(apc), "SyncWithNamespace", func(_ *remote.AbsApolloConfig, namespace string, appConfigFunc func() config.AppConfig) *config.ApolloConfig {
+	mock.Patch((*remote.AbsApolloConfig).SyncWithNamespace, func(_ *remote.AbsApolloConfig, namespace string, appConfigFunc func() config.AppConfig) *config.ApolloConfig {
 		return nil
 	})
-	defer patch.Reset()
 
 	client := createMockApolloConfig(120)
 	cf := client.GetConfig("testNotFound")

diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/apolloconfig/agollo/v4
 
 require (
-	github.com/agiledragon/gomonkey/v2 v2.11.0 // indirect
 	github.com/spf13/viper v1.8.1
 	github.com/tevid/gohamcrest v1.1.1
+	github.com/xhd2015/xgo/runtime v1.0.17
 )
 
 go 1.13
diff --git a/go.sum b/go.sum
@@ -230,6 +230,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU0=
 github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k=
+github.com/xhd2015/xgo/runtime v1.0.17 h1:CsGcGnEcffjAaQvI4Z6KaG0IS3SrCvz+Diw7+WJzeLs=
+github.com/xhd2015/xgo/runtime v1.0.17/go.mod h1:9GBQ2SzJCzpD3T+HRN+2C0TUOGv7qIz4s0mad1xJ8Jo=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=