From 6f7898049e0d66589622824e01ecb31eff4266d3 Mon Sep 17 00:00:00 2001 From: yunlzheng Date: Fri, 13 Mar 2020 10:27:27 +0800 Subject: [PATCH] test: refact generate mock data package --- .gitignore | 2 +- Makefile | 24 ++++++++++++------------ pkg/kt/command/check_test.go | 15 ++++++++------- pkg/kt/command/connect_test.go | 10 +++++----- pkg/kt/command/dashboard_test.go | 4 ++-- pkg/kt/command/exchange_test.go | 4 ++-- pkg/kt/command/mesh_test.go | 4 ++-- pkg/kt/command/run_test.go | 8 ++++---- pkg/kt/connect/inbound_test.go | 4 ++-- pkg/kt/connect/outbound_test.go | 8 ++++---- 10 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 2b7b3f6..c90e1ea 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ note/ vendor/ c.out c.out.tmp -pkg/fake/ \ No newline at end of file +fake/ \ No newline at end of file diff --git a/Makefile b/Makefile index 14441b5..d6ec6fc 100644 --- a/Makefile +++ b/Makefile @@ -9,18 +9,18 @@ SERVER_IMAGE = kt-connect-server # generate mock generate-mock: - mkdir -p pkg/fake/kt/action - mockgen -source=pkg/kt/command/types.go -destination=pkg/fake/kt/action/action_mock.go -package=action - mkdir -p pkg/fake/kt/cluster - mockgen -source=pkg/kt/cluster/types.go -destination=pkg/fake/kt/cluster/kubernetes_mock.go -package=cluster - mkdir -p pkg/fake/kt/connect - mockgen -source=pkg/kt/connect/types.go -destination=pkg/fake/kt/connect/connect_mock.go -package=connect - mkdir -p pkg/fake/kt/exec - mockgen -source=pkg/kt/exec/kubectl/types.go -destination=pkg/fake/kt/exec/kubectl/kubectl_mock.go -package=kubectl - mockgen -source=pkg/kt/exec/ssh/types.go -destination=pkg/fake/kt/exec/ssh/ssh_mock.go -package=ssh - mockgen -source=pkg/kt/exec/sshuttle/types.go -destination=pkg/fake/kt/exec/sshuttle/sshuttle_mock.go -package=sshuttle - mockgen -source=pkg/kt/exec/types.go -destination=pkg/fake/kt/exec/exec_mock.go -package=exec - mockgen -source=pkg/kt/types.go -destination=pkg/fake/kt/kt_mock.go -package=kt + mkdir -p fake/kt/action + mockgen -source=pkg/kt/command/types.go -destination=fake/kt/action/action_mock.go -package=action + mkdir -p fake/kt/cluster + mockgen -source=pkg/kt/cluster/types.go -destination=fake/kt/cluster/kubernetes_mock.go -package=cluster + mkdir -p fake/kt/connect + mockgen -source=pkg/kt/connect/types.go -destination=fake/kt/connect/connect_mock.go -package=connect + mkdir -p fake/kt/exec + mockgen -source=pkg/kt/exec/kubectl/types.go -destination=fake/kt/exec/kubectl/kubectl_mock.go -package=kubectl + mockgen -source=pkg/kt/exec/ssh/types.go -destination=fake/kt/exec/ssh/ssh_mock.go -package=ssh + mockgen -source=pkg/kt/exec/sshuttle/types.go -destination=fake/kt/exec/sshuttle/sshuttle_mock.go -package=sshuttle + mockgen -source=pkg/kt/exec/types.go -destination=fake/kt/exec/exec_mock.go -package=exec + mockgen -source=pkg/kt/types.go -destination=fake/kt/kt_mock.go -package=kt # run unit test unit-test: generate-mock diff --git a/pkg/kt/command/check_test.go b/pkg/kt/command/check_test.go index 8e31287..6530f62 100644 --- a/pkg/kt/command/check_test.go +++ b/pkg/kt/command/check_test.go @@ -6,14 +6,15 @@ import ( "os/exec" "testing" - fakeExec "github.com/alibaba/kt-connect/pkg/fake/kt/exec" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/kubectl" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/ssh" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/sshuttle" - - fakeKt "github.com/alibaba/kt-connect/pkg/fake/kt" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" "github.com/alibaba/kt-connect/pkg/kt/options" + + fakeExec "github.com/alibaba/kt-connect/fake/kt/exec" + "github.com/alibaba/kt-connect/fake/kt/exec/kubectl" + "github.com/alibaba/kt-connect/fake/kt/exec/ssh" + "github.com/alibaba/kt-connect/fake/kt/exec/sshuttle" + + fakeKt "github.com/alibaba/kt-connect/fake/kt" + "github.com/alibaba/kt-connect/fake/kt/action" "github.com/golang/mock/gomock" "github.com/urfave/cli" ) diff --git a/pkg/kt/command/connect_test.go b/pkg/kt/command/connect_test.go index cc4ca97..399e925 100644 --- a/pkg/kt/command/connect_test.go +++ b/pkg/kt/command/connect_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "testing" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec" + "github.com/alibaba/kt-connect/fake/kt/exec" "github.com/alibaba/kt-connect/pkg/kt/cluster" "github.com/alibaba/kt-connect/pkg/kt/connect" @@ -14,10 +14,10 @@ import ( "github.com/golang/mock/gomock" "github.com/urfave/cli" - "github.com/alibaba/kt-connect/pkg/fake/kt" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" - fakeCluster "github.com/alibaba/kt-connect/pkg/fake/kt/cluster" - fakeConnect "github.com/alibaba/kt-connect/pkg/fake/kt/connect" + "github.com/alibaba/kt-connect/fake/kt" + "github.com/alibaba/kt-connect/fake/kt/action" + fakeCluster "github.com/alibaba/kt-connect/fake/kt/cluster" + fakeConnect "github.com/alibaba/kt-connect/fake/kt/connect" ) func Test_newConnectCommand(t *testing.T) { diff --git a/pkg/kt/command/dashboard_test.go b/pkg/kt/command/dashboard_test.go index 1d8bc3a..87d60e2 100644 --- a/pkg/kt/command/dashboard_test.go +++ b/pkg/kt/command/dashboard_test.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "testing" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" + "github.com/alibaba/kt-connect/fake/kt/action" "github.com/golang/mock/gomock" - fakeKt "github.com/alibaba/kt-connect/pkg/fake/kt" + fakeKt "github.com/alibaba/kt-connect/fake/kt" "github.com/alibaba/kt-connect/pkg/kt/options" "github.com/urfave/cli" ) diff --git a/pkg/kt/command/exchange_test.go b/pkg/kt/command/exchange_test.go index 32bfc6c..77b85cd 100644 --- a/pkg/kt/command/exchange_test.go +++ b/pkg/kt/command/exchange_test.go @@ -6,9 +6,9 @@ import ( "io/ioutil" "testing" - "github.com/alibaba/kt-connect/pkg/fake/kt" + "github.com/alibaba/kt-connect/fake/kt" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" + "github.com/alibaba/kt-connect/fake/kt/action" "github.com/golang/mock/gomock" "github.com/alibaba/kt-connect/pkg/kt/options" diff --git a/pkg/kt/command/mesh_test.go b/pkg/kt/command/mesh_test.go index 640f524..cd3eef8 100644 --- a/pkg/kt/command/mesh_test.go +++ b/pkg/kt/command/mesh_test.go @@ -6,9 +6,9 @@ import ( "io/ioutil" "testing" - "github.com/alibaba/kt-connect/pkg/fake/kt" + "github.com/alibaba/kt-connect/fake/kt" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" + "github.com/alibaba/kt-connect/fake/kt/action" "github.com/alibaba/kt-connect/pkg/kt/options" "github.com/golang/mock/gomock" "github.com/urfave/cli" diff --git a/pkg/kt/command/run_test.go b/pkg/kt/command/run_test.go index 59fb490..d6fd2f9 100644 --- a/pkg/kt/command/run_test.go +++ b/pkg/kt/command/run_test.go @@ -6,10 +6,10 @@ import ( "io/ioutil" "testing" - fakeKt "github.com/alibaba/kt-connect/pkg/fake/kt" - "github.com/alibaba/kt-connect/pkg/fake/kt/action" - "github.com/alibaba/kt-connect/pkg/fake/kt/cluster" - "github.com/alibaba/kt-connect/pkg/fake/kt/connect" + fakeKt "github.com/alibaba/kt-connect/fake/kt" + "github.com/alibaba/kt-connect/fake/kt/action" + "github.com/alibaba/kt-connect/fake/kt/cluster" + "github.com/alibaba/kt-connect/fake/kt/connect" "github.com/alibaba/kt-connect/pkg/kt/options" "github.com/alibaba/kt-connect/pkg/kt/util" "github.com/golang/mock/gomock" diff --git a/pkg/kt/connect/inbound_test.go b/pkg/kt/connect/inbound_test.go index 2548001..7c9dd73 100644 --- a/pkg/kt/connect/inbound_test.go +++ b/pkg/kt/connect/inbound_test.go @@ -4,8 +4,8 @@ import ( "os/exec" "testing" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/kubectl" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/ssh" + "github.com/alibaba/kt-connect/fake/kt/exec/kubectl" + "github.com/alibaba/kt-connect/fake/kt/exec/ssh" "github.com/golang/mock/gomock" "github.com/alibaba/kt-connect/pkg/kt/options" diff --git a/pkg/kt/connect/outbound_test.go b/pkg/kt/connect/outbound_test.go index 66339c2..1006c01 100644 --- a/pkg/kt/connect/outbound_test.go +++ b/pkg/kt/connect/outbound_test.go @@ -4,10 +4,10 @@ import ( "os/exec" "testing" - fakeExec "github.com/alibaba/kt-connect/pkg/fake/kt/exec" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/kubectl" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/ssh" - "github.com/alibaba/kt-connect/pkg/fake/kt/exec/sshuttle" + fakeExec "github.com/alibaba/kt-connect/fake/kt/exec" + "github.com/alibaba/kt-connect/fake/kt/exec/kubectl" + "github.com/alibaba/kt-connect/fake/kt/exec/ssh" + "github.com/alibaba/kt-connect/fake/kt/exec/sshuttle" "github.com/alibaba/kt-connect/pkg/kt/options" "github.com/golang/mock/gomock"