From 85c89b779c4eda2bff329345af6093f5b19e5ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=BE=9B=E6=A0=BC?= <xg.gao@tianrang-inc.com>
Date: Mon, 19 Aug 2019 22:43:30 +0800
Subject: [PATCH] revert

---
 registry/nacos/registry_test.go | 132 ++++++++++++++++----------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/registry/nacos/registry_test.go b/registry/nacos/registry_test.go
index b195ba9e7..bee53994f 100644
--- a/registry/nacos/registry_test.go
+++ b/registry/nacos/registry_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/apache/dubbo-go/common/constant"
 )
 
-func Test_Register(t *testing.T) {
+func TestNacosRegistry_Register(t *testing.T) {
 	regurl, _ := common.NewURL(context.TODO(), "registry://console.nacos.io:80", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
 	urlMap := url.Values{}
 	urlMap.Set(constant.GROUP_KEY, "guangzhou-idc")
@@ -85,71 +85,71 @@ func TestNacosRegistry_Subscribe(t *testing.T) {
 
 }
 
-//func TestNacosRegistry_Subscribe_del(t *testing.T) {
-//	regurl, _ := common.NewURL(context.TODO(), "registry://console.nacos.io:80", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
-//	urlMap := url.Values{}
-//	urlMap.Set(constant.GROUP_KEY, "guangzhou-idc")
-//	urlMap.Set(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER))
-//	urlMap.Set(constant.INTERFACE_KEY, "com.ikurento.user.UserProvider")
-//	urlMap.Set(constant.VERSION_KEY, "1.0.0")
-//	urlMap.Set(constant.CLUSTER_KEY, "mock")
-//	urlMap.Set(constant.NACOS_PATH_KEY, "")
-//	url1, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParams(urlMap), common.WithMethods([]string{"GetUser", "AddUser"}))
-//	url2, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.2:20000/com.ikurento.user.UserProvider", common.WithParams(urlMap), common.WithMethods([]string{"GetUser", "AddUser"}))
-//
-//	reg, _ := newNacosRegistry(&regurl)
-//	err := reg.Register(url1)
-//	assert.Nil(t, err)
-//	if err != nil {
-//		t.Errorf("register1 error:%s \n", err.Error())
-//		return
-//	}
-//	err = reg.Register(url2)
-//	assert.Nil(t, err)
-//	if err != nil {
-//		t.Errorf("register2 error:%s \n", err.Error())
-//		return
-//	}
-//
-//	regurl.Params.Set(constant.ROLE_KEY, strconv.Itoa(common.CONSUMER))
-//	reg2, _ := newNacosRegistry(&regurl)
-//	listener, err := reg2.Subscribe(url1)
-//	assert.Nil(t, err)
-//	if err != nil {
-//		t.Errorf("subscribe error:%s \n", err.Error())
-//		return
-//	}
-//
-//	serviceEvent1, _ := listener.Next()
-//	assert.NoError(t, err)
-//	if err != nil {
-//		t.Errorf("listener1 error:%s \n", err.Error())
-//		return
-//	}
-//	t.Logf("serviceEvent1:%+v \n", serviceEvent1)
-//	assert.Regexp(t, ".*ServiceEvent{Action{add}.*", serviceEvent1.String())
-//
-//	serviceEvent2, _ := listener.Next()
-//	assert.NoError(t, err)
-//	if err != nil {
-//		t.Errorf("listener2 error:%s \n", err.Error())
-//		return
-//	}
-//	t.Logf("serviceEvent2:%+v \n", serviceEvent2)
-//	assert.Regexp(t, ".*ServiceEvent{Action{add}.*", serviceEvent2.String())
-//
-//	nacosReg := reg.(*nacosRegistry)
-//	//deregister instance to mock instance offline
-//	nacosReg.namingClient.DeregisterInstance(vo.DeregisterInstanceParam{Ip: "127.0.0.2", Port: 20000, ServiceName: "providers:com.ikurento.user.UserProvider:1.0.0:guangzhou-idc"})
-//
-//	serviceEvent3, _ := listener.Next()
-//	assert.NoError(t, err)
-//	if err != nil {
-//		return
-//	}
-//	t.Logf("serviceEvent3:%+v \n", serviceEvent3)
-//	assert.Regexp(t, ".*ServiceEvent{Action{delete}.*", serviceEvent3.String())
-//}
+func TestNacosRegistry_Subscribe_del(t *testing.T) {
+	regurl, _ := common.NewURL(context.TODO(), "registry://console.nacos.io:80", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
+	urlMap := url.Values{}
+	urlMap.Set(constant.GROUP_KEY, "guangzhou-idc")
+	urlMap.Set(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER))
+	urlMap.Set(constant.INTERFACE_KEY, "com.ikurento.user.UserProvider")
+	urlMap.Set(constant.VERSION_KEY, "1.0.0")
+	urlMap.Set(constant.CLUSTER_KEY, "mock")
+	urlMap.Set(constant.NACOS_PATH_KEY, "")
+	url1, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParams(urlMap), common.WithMethods([]string{"GetUser", "AddUser"}))
+	url2, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.2:20000/com.ikurento.user.UserProvider", common.WithParams(urlMap), common.WithMethods([]string{"GetUser", "AddUser"}))
+
+	reg, _ := newNacosRegistry(&regurl)
+	err := reg.Register(url1)
+	assert.Nil(t, err)
+	if err != nil {
+		t.Errorf("register1 error:%s \n", err.Error())
+		return
+	}
+	err = reg.Register(url2)
+	assert.Nil(t, err)
+	if err != nil {
+		t.Errorf("register2 error:%s \n", err.Error())
+		return
+	}
+
+	regurl.Params.Set(constant.ROLE_KEY, strconv.Itoa(common.CONSUMER))
+	reg2, _ := newNacosRegistry(&regurl)
+	listener, err := reg2.Subscribe(url1)
+	assert.Nil(t, err)
+	if err != nil {
+		t.Errorf("subscribe error:%s \n", err.Error())
+		return
+	}
+
+	serviceEvent1, _ := listener.Next()
+	assert.NoError(t, err)
+	if err != nil {
+		t.Errorf("listener1 error:%s \n", err.Error())
+		return
+	}
+	t.Logf("serviceEvent1:%+v \n", serviceEvent1)
+	assert.Regexp(t, ".*ServiceEvent{Action{add}.*", serviceEvent1.String())
+
+	serviceEvent2, _ := listener.Next()
+	assert.NoError(t, err)
+	if err != nil {
+		t.Errorf("listener2 error:%s \n", err.Error())
+		return
+	}
+	t.Logf("serviceEvent2:%+v \n", serviceEvent2)
+	assert.Regexp(t, ".*ServiceEvent{Action{add}.*", serviceEvent2.String())
+
+	nacosReg := reg.(*nacosRegistry)
+	//deregister instance to mock instance offline
+	nacosReg.namingClient.DeregisterInstance(vo.DeregisterInstanceParam{Ip: "127.0.0.2", Port: 20000, ServiceName: "providers:com.ikurento.user.UserProvider:1.0.0:guangzhou-idc"})
+
+	serviceEvent3, _ := listener.Next()
+	assert.NoError(t, err)
+	if err != nil {
+		return
+	}
+	t.Logf("serviceEvent3:%+v \n", serviceEvent3)
+	assert.Regexp(t, ".*ServiceEvent{Action{delete}.*", serviceEvent3.String())
+}
 
 func TestNacosListener_Close(t *testing.T) {
 	regurl, _ := common.NewURL(context.TODO(), "registry://console.nacos.io:80", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
-- 
GitLab