Fix UT

filter/impl/tps_limiter_method_service_impl_test.go

@@ -22,8 +22,8 @@ import (
 	"testing"
 )
 import (
-	"github.com/coreos/etcd/pkg/testutil"
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
 )
 
 import (
@@ -34,51 +34,57 @@ import (
 	"github.com/apache/dubbo-go/protocol/invocation"
 )
 
-const methodName = "hello"
-
-var methodConfigPrefix = "methods." + methodName + "."
-var invoc = invocation.NewRPCInvocation(methodName, []interface{}{"OK"}, make(map[string]string, 0))
-
 func TestMethodServiceTpsLimiterImpl_IsAllowable_Only_Service_Level(t *testing.T) {
+	methodName := "hello"
+	invoc := invocation.NewRPCInvocation(methodName, []interface{}{"OK"}, make(map[string]string, 0))
+
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	invokeUrl := common.NewURLWithOptions(
 		common.WithParams(url.Values{}),
+		common.WithParamsValue(constant.INTERFACE_KEY, methodName),
 		common.WithParamsValue(constant.TPS_LIMIT_RATE_KEY, "20"))
 
 	mockStrategyImpl := filter.NewMockTpsLimitStrategy(ctrl)
 	mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
 	extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) filter.TpsLimitStrategy {
-		testutil.AssertEqual(t, 20, rate)
-		testutil.AssertEqual(t, 60000, interval)
+		assert.Equal(t, 20, rate)
+		assert.Equal(t, 60000, interval)
 		return mockStrategyImpl
 	})
 
 	limiter := GetMethodServiceTpsLimiter()
 	result := limiter.IsAllowable(*invokeUrl, invoc)
-	testutil.AssertTrue(t, result)
+	assert.True(t, result)
 }
 
 func TestMethodServiceTpsLimiterImpl_IsAllowable_No_Config(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
+	methodName := "hello1"
+	invoc := invocation.NewRPCInvocation(methodName, []interface{}{"OK"}, make(map[string]string, 0))
+	// ctrl := gomock.NewController(t)
+	// defer ctrl.Finish()
 
 	invokeUrl := common.NewURLWithOptions(
 		common.WithParams(url.Values{}),
+		common.WithParamsValue(constant.INTERFACE_KEY, methodName),
 		common.WithParamsValue(constant.TPS_LIMIT_RATE_KEY, ""))
 
 	limiter := GetMethodServiceTpsLimiter()
 	result := limiter.IsAllowable(*invokeUrl, invoc)
-	testutil.AssertTrue(t, result)
+	assert.True(t, result)
 }
 
 func TestMethodServiceTpsLimiterImpl_IsAllowable_Method_Level_Override(t *testing.T) {
+	methodName := "hello2"
+	methodConfigPrefix := "methods." + methodName + "."
+	invoc := invocation.NewRPCInvocation(methodName, []interface{}{"OK"}, make(map[string]string, 0))
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	invokeUrl := common.NewURLWithOptions(
 		common.WithParams(url.Values{}),
+		common.WithParamsValue(constant.INTERFACE_KEY, methodName),
 		common.WithParamsValue(constant.TPS_LIMIT_RATE_KEY, "20"),
 		common.WithParamsValue(constant.TPS_LIMIT_INTERVAL_KEY, "3000"),
 		common.WithParamsValue(constant.TPS_LIMIT_STRATEGY_KEY, "invalid"),
@@ -90,22 +96,26 @@ func TestMethodServiceTpsLimiterImpl_IsAllowable_Method_Level_Override(t *testin
 	mockStrategyImpl := filter.NewMockTpsLimitStrategy(ctrl)
 	mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
 	extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) filter.TpsLimitStrategy {
-		testutil.AssertEqual(t, 40, rate)
-		testutil.AssertEqual(t, 7000, interval)
+		assert.Equal(t, 40, rate)
+		assert.Equal(t, 7000, interval)
 		return mockStrategyImpl
 	})
 
 	limiter := GetMethodServiceTpsLimiter()
 	result := limiter.IsAllowable(*invokeUrl, invoc)
-	testutil.AssertTrue(t, result)
+	assert.True(t, result)
 }
 
 func TestMethodServiceTpsLimiterImpl_IsAllowable_Both_Method_And_Service(t *testing.T) {
+	methodName := "hello3"
+	methodConfigPrefix := "methods." + methodName + "."
+	invoc := invocation.NewRPCInvocation(methodName, []interface{}{"OK"}, make(map[string]string, 0))
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	invokeUrl := common.NewURLWithOptions(
 		common.WithParams(url.Values{}),
+		common.WithParamsValue(constant.INTERFACE_KEY, methodName),
 		common.WithParamsValue(constant.TPS_LIMIT_RATE_KEY, "20"),
 		common.WithParamsValue(constant.TPS_LIMIT_INTERVAL_KEY, "3000"),
 		common.WithParamsValue(methodConfigPrefix+constant.TPS_LIMIT_RATE_KEY, "40"),
@@ -114,12 +124,12 @@ func TestMethodServiceTpsLimiterImpl_IsAllowable_Both_Method_And_Service(t *test
 	mockStrategyImpl := filter.NewMockTpsLimitStrategy(ctrl)
 	mockStrategyImpl.EXPECT().IsAllowable().Return(true).Times(1)
 	extension.SetTpsLimitStrategy(constant.DEFAULT_KEY, func(rate int, interval int) filter.TpsLimitStrategy {
-		testutil.AssertEqual(t, 40, rate)
-		testutil.AssertEqual(t, 3000, interval)
+		assert.Equal(t, 40, rate)
+		assert.Equal(t, 3000, interval)
 		return mockStrategyImpl
 	})
 
 	limiter := GetMethodServiceTpsLimiter()
 	result := limiter.IsAllowable(*invokeUrl, invoc)
-	testutil.AssertTrue(t, result)
+	assert.True(t, result)
 }

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
 	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190802083043-4cd0c391755e // indirect
 	github.com/apache/dubbo-go-hessian2 v1.2.5-0.20190923055845-e3dd5d131df5
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 // indirect
 	github.com/coreos/bbolt v1.3.3 // indirect
 	github.com/coreos/etcd v3.3.13+incompatible