[dubbo-go] branch develop updated: fix test case

[fangyc]

This is an automated email from the ASF dual-hosted git repository.

fangyc pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git


The following commit(s) were added to refs/heads/develop by this push:
     new 54e27b3  fix test case
     new ce99993  Merge pull request #356 from zouyx/develop
54e27b3 is described below

commit 54e27b30c67d29cda8ba8b20117a101f54e5f7e6
Author: Joe Zou <yixian....@gmail.com>
AuthorDate: Sat Feb 8 21:13:50 2020 +0800

    fix test case
---
 common/url_test.go                                 |  2 +-
 filter/filter_impl/auth/consumer_sign_test.go      |  2 +-
 .../filter_impl/auth/default_authenticator_test.go |  9 +++----
 filter/filter_impl/auth/provider_auth_test.go      |  2 +-
 filter/filter_impl/metrics_filter_test.go          | 10 ++++----
 metrics/prometheus/reporter_test.go                | 30 +++++++++++-----------
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/common/url_test.go b/common/url_test.go
index cf6473c..8359730 100644
--- a/common/url_test.go
+++ b/common/url_test.go
@@ -272,7 +272,7 @@ func TestClone(t *testing.T) {
 }
 
 func TestColonSeparatedKey(t *testing.T) {
-       u1, _ := NewURL(context.TODO(), "dubbo://127.0.0.1:20000")
+       u1, _ := NewURL("dubbo://127.0.0.1:20000")
        u1.AddParam(constant.INTERFACE_KEY, "com.ikurento.user.UserProvider")
 
        assert.Equal(t, u1.ColonSeparatedKey(), 
u1.GetParam(constant.INTERFACE_KEY, "")+"::")
diff --git a/filter/filter_impl/auth/consumer_sign_test.go 
b/filter/filter_impl/auth/consumer_sign_test.go
index c90a769..9a90970 100644
--- a/filter/filter_impl/auth/consumer_sign_test.go
+++ b/filter/filter_impl/auth/consumer_sign_test.go
@@ -19,7 +19,7 @@ import (
 )
 
 func TestConsumerSignFilter_Invoke(t *testing.T) {
-       url, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       url, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        url.SetParam(constant.SECRET_ACCESS_KEY_KEY, "sk")
        url.SetParam(constant.ACCESS_KEY_ID_KEY, "ak")
        inv := invocation.NewRPCInvocation("test", []interface{}{"OK"}, nil)
diff --git a/filter/filter_impl/auth/default_authenticator_test.go 
b/filter/filter_impl/auth/default_authenticator_test.go
index f1e014b..72220ee 100644
--- a/filter/filter_impl/auth/default_authenticator_test.go
+++ b/filter/filter_impl/auth/default_authenticator_test.go
@@ -1,7 +1,6 @@
 package auth
 
 import (
-       "context"
        "fmt"
        "net/url"
        "strconv"
@@ -22,7 +21,7 @@ import (
 func TestDefaultAuthenticator_Authenticate(t *testing.T) {
        secret := "dubbo-sk"
        access := "dubbo-ak"
-       testurl, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       testurl, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        testurl.SetParam(constant.PARAMTER_SIGNATURE_ENABLE_KEY, "true")
        testurl.SetParam(constant.ACCESS_KEY_ID_KEY, access)
        testurl.SetParam(constant.SECRET_ACCESS_KEY_KEY, secret)
@@ -58,7 +57,7 @@ func TestDefaultAuthenticator_Authenticate(t *testing.T) {
 
 func TestDefaultAuthenticator_Sign(t *testing.T) {
        authenticator := &DefaultAuthenticator{}
-       testurl, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?application=test&interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       testurl, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?application=test&interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        testurl.SetParam(constant.ACCESS_KEY_ID_KEY, "akey")
        testurl.SetParam(constant.SECRET_ACCESS_KEY_KEY, "skey")
        testurl.SetParam(constant.PARAMTER_SIGNATURE_ENABLE_KEY, "false")
@@ -101,7 +100,7 @@ func Test_getAccessKeyPairFailed(t *testing.T) {
 }
 
 func Test_getSignatureWithinParams(t *testing.T) {
-       testurl, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       testurl, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        testurl.SetParam(constant.PARAMTER_SIGNATURE_ENABLE_KEY, "true")
        inv := invocation.NewRPCInvocation("test", []interface{}{"OK"}, 
map[string]string{
                "": "",
@@ -117,7 +116,7 @@ func Test_getSignatureWithinParams(t *testing.T) {
 }
 
 func Test_getSignature(t *testing.T) {
-       testurl, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       testurl, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        testurl.SetParam(constant.PARAMTER_SIGNATURE_ENABLE_KEY, "false")
        inv := invocation.NewRPCInvocation("test", []interface{}{"OK"}, nil)
        secret := "dubbo"
diff --git a/filter/filter_impl/auth/provider_auth_test.go 
b/filter/filter_impl/auth/provider_auth_test.go
index 7552a4a..88d6423 100644
--- a/filter/filter_impl/auth/provider_auth_test.go
+++ b/filter/filter_impl/auth/provider_auth_test.go
@@ -23,7 +23,7 @@ import (
 func TestProviderAuthFilter_Invoke(t *testing.T) {
        secret := "dubbo-sk"
        access := "dubbo-ak"
-       url, _ := common.NewURL(context.TODO(), 
"dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
+       url, _ := 
common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=gg&version=2.6.0")
        url.SetParam(constant.ACCESS_KEY_ID_KEY, access)
        url.SetParam(constant.SECRET_ACCESS_KEY_KEY, secret)
        parmas := []interface{}{
diff --git a/filter/filter_impl/metrics_filter_test.go 
b/filter/filter_impl/metrics_filter_test.go
index 83697f0..709404a 100644
--- a/filter/filter_impl/metrics_filter_test.go
+++ b/filter/filter_impl/metrics_filter_test.go
@@ -49,11 +49,11 @@ func TestMetricsFilter_Invoke(t *testing.T) {
 
        instance := extension.GetFilter(metricFilterName)
 
-       url, _ := common.NewURL(context.Background(),
-               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"+
-                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."+
-                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="+
-                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=3&retries=&"+
+       url, _ := common.NewURL(
+               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"
 +
+                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."
 +
+                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="
 +
+                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=3&retries=&" +
                        
"service.filter=echo%2Ctoken%2Caccesslog&timestamp=1569153406&token=934804bf-b007-4174-94eb-96e3e1d60cc7&version=&warmup=100")
        invoker := protocol.NewBaseInvoker(url)
 
diff --git a/metrics/prometheus/reporter_test.go 
b/metrics/prometheus/reporter_test.go
index d1741d1..0cb7d09 100644
--- a/metrics/prometheus/reporter_test.go
+++ b/metrics/prometheus/reporter_test.go
@@ -35,11 +35,11 @@ import (
 
 func TestPrometheusReporter_Report(t *testing.T) {
        reporter := extension.GetMetricReporter(reporterName)
-       url, _ := common.NewURL(context.Background(),
-               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"+
-                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."+
-                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="+
-                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=3&retries=&"+
+       url, _ := common.NewURL(
+               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"
 +
+                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."
 +
+                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="
 +
+                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=3&retries=&" +
                        
"service.filter=echo%2Ctoken%2Caccesslog&timestamp=1569153406&token=934804bf-b007-4174-94eb-96e3e1d60cc7&version=&warmup=100")
        invoker := protocol.NewBaseInvoker(url)
 
@@ -51,21 +51,21 @@ func TestPrometheusReporter_Report(t *testing.T) {
        reporter.Report(ctx, invoker, inv, 100*time.Millisecond, nil)
 
        // consumer side
-       url, _ = common.NewURL(context.Background(),
-               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"+
-                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."+
-                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="+
-                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=0&retries=&"+
+       url, _ = common.NewURL(
+               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"
 +
+                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."
 +
+                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="
 +
+                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=0&retries=&" +
                        
"service.filter=echo%2Ctoken%2Caccesslog&timestamp=1569153406&token=934804bf-b007-4174-94eb-96e3e1d60cc7&version=&warmup=100")
        invoker = protocol.NewBaseInvoker(url)
        reporter.Report(ctx, invoker, inv, 100*time.Millisecond, nil)
 
        // invalid role
-       url, _ = common.NewURL(context.Background(),
-               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"+
-                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."+
-                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="+
-                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=9&retries=&"+
+       url, _ = common.NewURL(
+               
"dubbo://:20000/UserProvider?app.version=0.0.1&application=BDTService&bean.name=UserProvider"
 +
+                       
"&cluster=failover&environment=dev&group=&interface=com.ikurento.user.UserProvider&loadbalance=random&methods.GetUser."
 +
+                       
"loadbalance=random&methods.GetUser.retries=1&methods.GetUser.weight=0&module=dubbogo+user-info+server&name="
 +
+                       
"BDTService&organization=ikurento.com&owner=ZX&registry.role=9&retries=&" +
                        
"service.filter=echo%2Ctoken%2Caccesslog&timestamp=1569153406&token=934804bf-b007-4174-94eb-96e3e1d60cc7&version=&warmup=100")
        invoker = protocol.NewBaseInvoker(url)
        reporter.Report(ctx, invoker, inv, 100*time.Millisecond, nil)