From c9fb96bfb493a380738087cb5dd5bf7b5667342a Mon Sep 17 00:00:00 2001
From: flycash <mingflycash@gmail.com>
Date: Sun, 21 Jun 2020 15:38:31 +0800
Subject: [PATCH] Fix UT

---
 metadata/service/inmemory/service_proxy.go |   4 -
 registry/etcdv3/service_discovery_test.go  | 105 ++-------------------
 2 files changed, 8 insertions(+), 101 deletions(-)

diff --git a/metadata/service/inmemory/service_proxy.go b/metadata/service/inmemory/service_proxy.go
index 840bd9a9d..7e01439f0 100644
--- a/metadata/service/inmemory/service_proxy.go
+++ b/metadata/service/inmemory/service_proxy.go
@@ -20,7 +20,6 @@ package inmemory
 import (
 	"context"
 	"reflect"
-	"time"
 )
 
 import (
@@ -59,10 +58,7 @@ func (m *MetadataServiceProxy) GetExportedURLs(serviceInterface string, group st
 		invocation.WithAttachments(map[string]string{constant.ASYNC_KEY: "false"}),
 		invocation.WithParameterValues([]reflect.Value{siV, gV, vV, pV}))
 
-	start := time.Now()
 	res := m.invkr.Invoke(context.Background(), inv)
-	end := time.Now()
-	logger.Infof("duration: %s, result: %v", (end.Sub(start)).String(), res.Result())
 	if res.Error() != nil {
 		logger.Errorf("could not get the metadata service from remote provider: %v", res.Error())
 		return []interface{}{}, nil
diff --git a/registry/etcdv3/service_discovery_test.go b/registry/etcdv3/service_discovery_test.go
index ff3708e6f..c03973cb1 100644
--- a/registry/etcdv3/service_discovery_test.go
+++ b/registry/etcdv3/service_discovery_test.go
@@ -1,14 +1,13 @@
 package etcdv3
 
 import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
 	"github.com/apache/dubbo-go/common/constant"
-	"github.com/apache/dubbo-go/common/extension"
-	"github.com/apache/dubbo-go/common/observer"
-	"github.com/apache/dubbo-go/common/observer/dispatcher"
 	"github.com/apache/dubbo-go/config"
 	"github.com/apache/dubbo-go/registry"
-	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var testName = "test"
@@ -20,8 +19,8 @@ func setUp() {
 	}
 
 	config.GetBaseConfig().Remotes[testName] = &config.RemoteConfig{
-		Address:    "localhost:2380",
-		TimeoutStr: "1000s",
+		Address:    "localhost:2379",
+		TimeoutStr: "10s",
 	}
 }
 
@@ -44,7 +43,7 @@ func Test_newEtcdV3ServiceDiscovery(t *testing.T) {
 	assert.NotNil(t, err)
 
 	config.GetBaseConfig().Remotes["mock"] = &config.RemoteConfig{
-		Address:    "localhost:2380",
+		Address:    "localhost:2379",
 		TimeoutStr: "10s",
 	}
 
@@ -53,96 +52,8 @@ func Test_newEtcdV3ServiceDiscovery(t *testing.T) {
 	assert.NotNil(t, res)
 }
 
-func TestEtcdV3ServiceDiscovery_Destroy(t *testing.T) {
-	setUp()
-	serviceDiscovery, err := extension.GetServiceDiscovery(constant.ETCDV3_KEY, testName)
-
-	assert.Nil(t, err)
-	assert.NotNil(t, serviceDiscovery)
-
-	err = serviceDiscovery.Destroy()
-	assert.Nil(t, err)
-	assert.NotNil(t, serviceDiscovery.(*etcdV3ServiceDiscovery).client)
-}
-
-func TestEtcdV3ServiceDiscovery_CRUD(t *testing.T) {
-	setUp()
-	extension.SetEventDispatcher("mock", func() observer.EventDispatcher {
-		return &dispatcher.MockEventDispatcher{}
-	})
-
-	extension.SetAndInitGlobalDispatcher("mock")
-
-	serviceName := "service-name"
-	id := "id"
-	host := "host"
-	port := 123
-	instance := &registry.DefaultServiceInstance{
-		Id:          id,
-		ServiceName: serviceName,
-		Host:        host,
-		Port:        port,
-		Enable:      true,
-		Healthy:     true,
-		Metadata:    nil,
-	}
-
-	// clean data
-
-	serviceDiscovry, _ := extension.GetServiceDiscovery(constant.ETCDV3_KEY, testName)
-
-	// clean data for local test
-	serviceDiscovry.Unregister(&registry.DefaultServiceInstance{
-		Id:          id,
-		ServiceName: serviceName,
-		Host:        host,
-		Port:        port,
-	})
-
-	err := serviceDiscovry.Register(instance)
-	assert.Nil(t, err)
-
-	page := serviceDiscovry.GetHealthyInstancesByPage(serviceName, 0, 10, true)
-	assert.NotNil(t, page)
-
-	assert.Equal(t, 0, page.GetOffset())
-	assert.Equal(t, 10, page.GetPageSize())
-	assert.Equal(t, 1, page.GetDataSize())
-
-	instance = page.GetData()[0].(*registry.DefaultServiceInstance)
-	assert.NotNil(t, instance)
-	assert.Equal(t, id, instance.GetId())
-	assert.Equal(t, host, instance.GetHost())
-	assert.Equal(t, port, instance.GetPort())
-	assert.Equal(t, serviceName, instance.GetServiceName())
-	assert.Equal(t, 0, len(instance.GetMetadata()))
-
-	instance.Metadata["a"] = "b"
-
-	err = serviceDiscovry.Update(instance)
-	assert.Nil(t, err)
-
-	pageMap := serviceDiscovry.GetRequestInstances([]string{serviceName}, 0, 1)
-	assert.Equal(t, 1, len(pageMap))
-	page = pageMap[serviceName]
-	assert.NotNil(t, page)
-	assert.Equal(t, 1, len(page.GetData()))
-
-	instance = page.GetData()[0].(*registry.DefaultServiceInstance)
-	v, _ := instance.Metadata["a"]
-	assert.Equal(t, "b", v)
-
-	// test dispatcher event
-	err = serviceDiscovry.DispatchEventByServiceName(serviceName)
-	assert.Nil(t, err)
-
-	// test AddListener
-	err = serviceDiscovry.AddListener(&registry.ServiceInstancesChangedListener{ServiceName: serviceName})
-	assert.Nil(t, err)
-}
-
 func TestEtcdV3ServiceDiscovery_GetDefaultPageSize(t *testing.T) {
 	setUp()
-	serviceDiscovry, _ := extension.GetServiceDiscovery(constant.ETCDV3_KEY, testName)
+	serviceDiscovry := &etcdV3ServiceDiscovery{}
 	assert.Equal(t, registry.DefaultPageSize, serviceDiscovry.GetDefaultPageSize())
 }
-- 
GitLab