update nacos_test

ext/datasource/nacos/nacos.go

@@ -33,7 +33,7 @@ type NacosDataSource struct {
 	datasource.Base
 	serverConfig  constant.ServerConfig
 	clientConfig  constant.ClientConfig
-	configClient  *config_client.ConfigClient
+	client        *config_client.ConfigClient
 	isInitialized util.AtomicBool
 	configParam   ConfigParam
 	listener      *vo.ConfigParam
@@ -63,8 +63,8 @@ func (s *NacosDataSource) Initialize() error {
 	if err != nil {
 		return errors.Errorf("Nacosclient failed to build, err: %+v", err)
 	}
-	s.configClient = &client
-	err = s.listen(s.configClient)
+	s.client = &client
+	err = s.listen(s.client)
 	return err
 }
 
@@ -76,7 +76,7 @@ func buildNacosClient(s *NacosDataSource) (nacos_client.INacosClient, error) {
 	return &nc, err
 }
 func (s *NacosDataSource) ReadSource() ([]byte, error) {
-	content, err := s.configClient.GetConfig(vo.ConfigParam{
+	content, err := s.client.GetConfig(vo.ConfigParam{
 		DataId: s.configParam.DataId,
 		Group:  s.configParam.Group,
 	})

ext/datasource/nacos/nacos_test.go

@@ -53,22 +53,22 @@ var configParam = ConfigParam{
 	DataId: "system-rules",
 	Group:  "sentinel-go",
 }
-var configParamErr = ConfigParam{
-	Group: "sentinel-go",
-}
 
-func cretateConfigClientTest() config_client.ConfigClient {
+func cretateConfigClientTest() (*config_client.ConfigClient, error) {
 	nc := nacos_client.NacosClient{}
-	nc.SetServerConfig([]constant.ServerConfig{serverConfig})
-	nc.SetClientConfig(clientConfigTest)
-	nc.SetHttpAgent(&http_agent.HttpAgent{})
-	client, _ := config_client.NewConfigClient(&nc)
+	err := nc.SetServerConfig([]constant.ServerConfig{serverConfig})
+	err = nc.SetClientConfig(constant.ClientConfig{
+		TimeoutMs:      10000,
+		ListenInterval: 20000,
+		BeatInterval:   10000,
+	})
+	err = nc.SetHttpAgent(&http_agent.HttpAgent{})
+	client, err := config_client.NewConfigClient(&nc)
 
-	return client
+	return &client, err
 }
 
-func prePushSystemRules(content string) (bool, error) {
-	client := cretateConfigClientTest()
+func prePushSystemRules(client *config_client.ConfigClient, content string) (bool, error) {
 	success, err := client.PublishConfig(vo.ConfigParam{
 		DataId:  configParam.DataId,
 		Group:   configParam.Group,
@@ -100,7 +100,9 @@ func TestNewNacosDataSource(t *testing.T) {
 func TestNacosDataSource_Initialize(t *testing.T) {
 
 	t.Run("NacosDataSource_Initialize_BuildNacosClient", func(t *testing.T) {
-		published, err := prePushSystemRules(TestSystemRules)
+		client, err := cretateConfigClientTest()
+		assert.Nil(t, err)
+		published, err := prePushSystemRules(client, TestSystemRules)
 		assert.True(t, err == nil && published, "Push systemRules configuration is successful.")
 
 		nds, err := getNacosDataSource(clientConfigTest, serverConfig, configParam)
@@ -110,7 +112,9 @@ func TestNacosDataSource_Initialize(t *testing.T) {
 	})
 
 	t.Run("NacosDataSource_Initialize_BuildNacosClientErr", func(t *testing.T) {
-		published, err := prePushSystemRules(TestSystemRules)
+		client, err := cretateConfigClientTest()
+		assert.Nil(t, err)
+		published, err := prePushSystemRules(client, TestSystemRules)
 		assert.True(t, err == nil && published, "Push systemRules configuration is successful.")
 
 		clientConfigTest.TimeoutMs = 0
@@ -123,10 +127,16 @@ func TestNacosDataSource_Initialize(t *testing.T) {
 
 func TestNacosDataSource_ReadSource(t *testing.T) {
 	t.Run("NacosDataSource_ReadSource", func(t *testing.T) {
-		published, err := prePushSystemRules(TestSystemRules)
+		client, err := cretateConfigClientTest()
+		assert.Nil(t, err)
+		published, err := prePushSystemRules(client, TestSystemRules)
 		assert.True(t, err == nil && published, "Push systemRules configuration is successful.")
 
-		nds, err := getNacosDataSource(clientConfigTest, serverConfig, configParam)
+		nds, err := getNacosDataSource(constant.ClientConfig{
+			TimeoutMs:      10000,
+			ListenInterval: 20000,
+			BeatInterval:   10000,
+		}, serverConfig, configParam)
 		assert.True(t, err == nil, "New NacosDataSource success.")
 		err = nds.Initialize()
 		assert.True(t, err == nil, "NacosDataSource initialize.")
@@ -137,10 +147,16 @@ func TestNacosDataSource_ReadSource(t *testing.T) {
 }
 
 func TestNacosDataSource_Close(t *testing.T) {
-	published, err := prePushSystemRules(TestSystemRules)
+	client, err := cretateConfigClientTest()
+	assert.Nil(t, err)
+	published, err := prePushSystemRules(client, TestSystemRules)
 	assert.True(t, err == nil && published, "Push systemRules configuration is successful.")
 
-	nds, err := getNacosDataSource(clientConfigTest, serverConfig, configParam)
+	nds, err := getNacosDataSource(constant.ClientConfig{
+		TimeoutMs:      10000,
+		ListenInterval: 20000,
+		BeatInterval:   10000,
+	}, serverConfig, configParam)
 	assert.True(t, err == nil, "New NacosDataSource success.")
 	err = nds.Initialize()
 	assert.True(t, err == nil, "NacosDataSource initialize.")