From e83e799d1d5f56cdb0c644ae3b59b00dba7966b4 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Tue, 22 Aug 2017 10:57:48 +0800 Subject: [PATCH] fix-review --- pkg/kubectl/cmd/util/BUILD | 1 + pkg/kubectl/cmd/util/factory_test.go | 33 ++++++++++------------------ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 99473b51dc0..db6cc3037d1 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -114,6 +114,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/apimachinery/pkg/version:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index bfeaf5ee32d..ca2e8bd4b1a 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -37,6 +37,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/util/flag" manualfake "k8s.io/client-go/rest/fake" @@ -88,22 +89,16 @@ func TestPortsForObject(t *testing.T) { }, } - expected := []string{"101"} - got, err := f.PortsForObject(pod) + expected := sets.NewString("101") + ports, err := f.PortsForObject(pod) if err != nil { t.Fatalf("Unexpected error: %v", err) } - if len(expected) != len(got) { - t.Fatalf("Ports size mismatch! Expected %d, got %d", len(expected), len(got)) - } - sort.Strings(expected) - sort.Strings(got) + got := sets.NewString(ports...) - for i, port := range got { - if port != expected[i] { - t.Fatalf("Port mismatch! Expected %s, got %s", expected[i], port) - } + if !expected.Equal(got) { + t.Fatalf("Ports mismatch! Expected %v, got %v", expected, got) } } @@ -130,22 +125,18 @@ func TestProtocolsForObject(t *testing.T) { }, } - expected := "101/TCP,102/UDP" + expected := sets.NewString("101/TCP", "102/UDP") protocolsMap, err := f.ProtocolsForObject(pod) if err != nil { t.Fatalf("Unexpected error: %v", err) } - got := kubectl.MakeProtocols(protocolsMap) - expectedSlice := strings.Split(expected, ",") - gotSlice := strings.Split(got, ",") - sort.Strings(expectedSlice) - sort.Strings(gotSlice) + protocolsString := kubectl.MakeProtocols(protocolsMap) + protocolsStrings := strings.Split(protocolsString, ",") + got := sets.NewString(protocolsStrings...) - for i, protocol := range gotSlice { - if protocol != expectedSlice[i] { - t.Fatalf("Protocols mismatch! Expected %s, got %s", expectedSlice[i], protocol) - } + if !expected.Equal(got) { + t.Fatalf("Protocols mismatch! Expected %v, got %v", expected, got) } }