fix mock

apache · Jul 28, 2019 · 0653977 · 0653977
1 parent be07149
commit 0653977
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/cluster/cluster_impl/failback_cluster_test.go b/cluster/cluster_impl/failback_cluster_test.go
@@ -37,14 +37,15 @@ import (
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
+	"github.com/apache/dubbo-go/protocol/mock"
 )
 
 var (
 	failbackUrl, _ = common.NewURL(context.TODO(), "dubbo://192.168.1.1:20000/com.ikurento.user.UserProvider")
 )
 
 // register_failback register failbackCluster to cluster extension.
-func register_failback(t *testing.T, invoker *protocol.MockInvoker) protocol.Invoker {
+func register_failback(t *testing.T, invoker *mock.MockInvoker) protocol.Invoker {
 	extension.SetLoadbalance("random", loadbalance.NewRandomLoadBalance)
 	failbackCluster := NewFailbackCluster()
 
@@ -63,7 +64,7 @@ func Test_FailbackSuceess(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failback(t, invoker).(*failbackClusterInvoker)
 
 	invoker.EXPECT().GetUrl().Return(failbackUrl).Times(1)
@@ -80,7 +81,7 @@ func Test_FailbackRetryOneSuccess(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failback(t, invoker).(*failbackClusterInvoker)
 
 	invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes()
@@ -123,7 +124,7 @@ func Test_FailbackRetryFailed(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failback(t, invoker).(*failbackClusterInvoker)
 
 	invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes()
@@ -169,7 +170,7 @@ func Test_FailbackRetryFailed10Times(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failback(t, invoker).(*failbackClusterInvoker)
 	clusterInvoker.maxRetries = 10
 
@@ -211,7 +212,7 @@ func Test_FailbackOutOfLimit(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failback(t, invoker).(*failbackClusterInvoker)
 	clusterInvoker.failbackTasks = 1
 

diff --git a/cluster/cluster_impl/failsafe_cluster_test.go b/cluster/cluster_impl/failsafe_cluster_test.go
@@ -35,14 +35,15 @@ import (
 	"github.com/apache/dubbo-go/common/extension"
 	"github.com/apache/dubbo-go/protocol"
 	"github.com/apache/dubbo-go/protocol/invocation"
+	"github.com/apache/dubbo-go/protocol/mock"
 )
 
 var (
 	failsafeUrl, _ = common.NewURL(context.TODO(), "dubbo://192.168.1.1:20000/com.ikurento.user.UserProvider")
 )
 
 // register_failsafe register failsafeCluster to cluster extension.
-func register_failsafe(t *testing.T, invoker *protocol.MockInvoker) protocol.Invoker {
+func register_failsafe(t *testing.T, invoker *mock.MockInvoker) protocol.Invoker {
 	extension.SetLoadbalance("random", loadbalance.NewRandomLoadBalance)
 	failsafeCluster := NewFailsafeCluster()
 
@@ -60,7 +61,7 @@ func Test_FailSafeInvokeSuccess(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failsafe(t, invoker)
 
 	invoker.EXPECT().GetUrl().Return(failsafeUrl)
@@ -79,7 +80,7 @@ func Test_FailSafeInvokeFail(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	invoker := protocol.NewMockInvoker(ctrl)
+	invoker := mock.NewMockInvoker(ctrl)
 	clusterInvoker := register_failsafe(t, invoker)
 
 	invoker.EXPECT().GetUrl().Return(failsafeUrl)

diff --git a/protocol/invoker.go b/protocol/invoker.go
@@ -22,7 +22,7 @@ import (
 	"github.com/apache/dubbo-go/common/logger"
 )
 
-//go:generate mockgen -source invoker.go -destination mock_invoker.go  -self_package github.com/apache/dubbo-go/protocol --package protocol  Invoker
+//go:generate mockgen -source invoker.go -destination mock/mock_invoker.go  -self_package github.com/apache/dubbo-go/protocol --package mock  Invoker
 // Extension - Invoker
 type Invoker interface {
 	common.Node

diff --git a/protocol/mock_invoker.go → protocol/mock/mock_invoker.go b/protocol/mock_invoker.go → protocol/mock/mock_invoker.go