From 2a89363d884c996e2d4a471c41089265bac34795 Mon Sep 17 00:00:00 2001
From: "vito.he" <hxmhlt@163.com>
Date: Thu, 9 Apr 2020 19:04:45 +0800
Subject: [PATCH] Mod:make ut run
---
config/service_config.go | 1 +
config/service_config_test.go | 3 +++
metadata/service/inmemory/service_test.go | 16 +++++++++-------
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/config/service_config.go b/config/service_config.go
index de263d8c5..53e6526da 100644
--- a/config/service_config.go
+++ b/config/service_config.go
@@ -328,6 +328,7 @@ func MockInitProviderWithSingleRegistry() {
Weight: 200,
},
},
+ exported: new(atomic.Bool),
},
},
Protocols: map[string]*ProtocolConfig{
diff --git a/config/service_config_test.go b/config/service_config_test.go
index 2b53dc385..26c558db1 100644
--- a/config/service_config_test.go
+++ b/config/service_config_test.go
@@ -18,6 +18,7 @@
package config
import (
+ "go.uber.org/atomic"
"testing"
)
@@ -92,6 +93,7 @@ func doInitProvider() {
Weight: 200,
},
},
+ exported: new(atomic.Bool),
},
"MockServiceNoRightProtocol": {
InterfaceName: "com.MockService",
@@ -116,6 +118,7 @@ func doInitProvider() {
Weight: 200,
},
},
+ exported: new(atomic.Bool),
},
},
Protocols: map[string]*ProtocolConfig{
diff --git a/metadata/service/inmemory/service_test.go b/metadata/service/inmemory/service_test.go
index 93e31b523..d68990b3f 100644
--- a/metadata/service/inmemory/service_test.go
+++ b/metadata/service/inmemory/service_test.go
@@ -69,27 +69,29 @@ func TestMetadataService(t *testing.T) {
"module=dubbogo+user-info+server&org=ikurento.com&owner=ZX&pid=1447&revision=0.0.1&"+
"side=provider&timeout=3000×tamp=1556509797245&group=%v&version=%v&bean.name=%v", protocol, serviceName, group, version, beanName))
mts.ExportURL(u)
- sets := mts.GetExportedURLs(serviceName, group, version, protocol)
+ sets, _ := mts.GetExportedURLs(serviceName, group, version, protocol)
assert.Equal(t, 1, sets.Size())
mts.SubscribeURL(u)
mts.SubscribeURL(u)
- sets2 := mts.GetSubscribedURLs()
+ sets2, _ := mts.GetSubscribedURLs()
assert.Equal(t, 1, sets2.Size())
mts.UnexportURL(u)
- sets11 := mts.GetExportedURLs(serviceName, group, version, protocol)
+ sets11, _ := mts.GetExportedURLs(serviceName, group, version, protocol)
assert.Equal(t, 0, sets11.Size())
mts.UnsubscribeURL(u)
- sets22 := mts.GetSubscribedURLs()
+ sets22, _ := mts.GetSubscribedURLs()
assert.Equal(t, 0, sets22.Size())
userProvider := &UserProvider{}
- common.ServiceMap.Register(protocol, userProvider)
+ common.ServiceMap.Register(serviceName, protocol, userProvider)
mts.PublishServiceDefinition(u)
expected := `{"CanonicalName":"com.ikurento.user.UserProvider","CodeSource":"","Methods":[{"Name":"GetUser","ParameterTypes":["slice"],"ReturnType":"ptr","Parameters":null}],"Types":null}`
- assert.Equal(t, mts.GetServiceDefinition(serviceName, group, version), expected)
+ def1, _ := mts.GetServiceDefinition(serviceName, group, version)
+ assert.Equal(t, def1, expected)
serviceKey := definition.ServiceDescriperBuild(serviceName, group, version)
- assert.Equal(t, mts.GetServiceDefinitionByServiceKey(serviceKey), expected)
+ def2, _ := mts.GetServiceDefinitionByServiceKey(serviceKey)
+ assert.Equal(t, def2, expected)
}
--
GitLab