React to moves

pkg/kubectl/cmd/cmd_test.go

@@ -18,127 +18,19 @@ package cmd
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"reflect"
-	stdstrings "strings"
+	"strings"
 	"testing"
 
 	"github.com/spf13/cobra"
 
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	restclient "k8s.io/client-go/rest"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/scheme"
 )
 
-func initTestErrorHandler(t *testing.T) {
-	cmdutil.BehaviorOnFatal(func(str string, code int) {
-		t.Errorf("Error running command (exit code %d): %s", code, str)
-	})
-}
-
-func defaultHeader() http.Header {
-	header := http.Header{}
-	header.Set("Content-Type", runtime.ContentTypeJSON)
-	return header
-}
-
-func defaultClientConfig() *restclient.Config {
-	return &restclient.Config{
-		APIPath: "/api",
-		ContentConfig: restclient.ContentConfig{
-			NegotiatedSerializer: scheme.Codecs,
-			ContentType:          runtime.ContentTypeJSON,
-			GroupVersion:         &corev1.SchemeGroupVersion,
-		},
-	}
-}
-
-func testData() (*corev1.PodList, *corev1.ServiceList, *corev1.ReplicationControllerList) {
-	grace := int64(30)
-	enableServiceLinks := corev1.DefaultEnableServiceLinks
-	pods := &corev1.PodList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "15",
-		},
-		Items: []corev1.Pod{
-			{
-				ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "test", ResourceVersion: "10"},
-				Spec: corev1.PodSpec{
-					RestartPolicy:                 corev1.RestartPolicyAlways,
-					DNSPolicy:                     corev1.DNSClusterFirst,
-					TerminationGracePeriodSeconds: &grace,
-					SecurityContext:               &corev1.PodSecurityContext{},
-					EnableServiceLinks:            &enableServiceLinks,
-				},
-			},
-			{
-				ObjectMeta: metav1.ObjectMeta{Name: "bar", Namespace: "test", ResourceVersion: "11"},
-				Spec: corev1.PodSpec{
-					RestartPolicy:                 corev1.RestartPolicyAlways,
-					DNSPolicy:                     corev1.DNSClusterFirst,
-					TerminationGracePeriodSeconds: &grace,
-					SecurityContext:               &corev1.PodSecurityContext{},
-					EnableServiceLinks:            &enableServiceLinks,
-				},
-			},
-		},
-	}
-	svc := &corev1.ServiceList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "16",
-		},
-		Items: []corev1.Service{
-			{
-				ObjectMeta: metav1.ObjectMeta{Name: "baz", Namespace: "test", ResourceVersion: "12"},
-				Spec: corev1.ServiceSpec{
-					SessionAffinity: "None",
-					Type:            corev1.ServiceTypeClusterIP,
-				},
-			},
-		},
-	}
-	rc := &corev1.ReplicationControllerList{
-		ListMeta: metav1.ListMeta{
-			ResourceVersion: "17",
-		},
-		Items: []corev1.ReplicationController{
-			{
-				ObjectMeta: metav1.ObjectMeta{Name: "rc1", Namespace: "test", ResourceVersion: "18"},
-				Spec: corev1.ReplicationControllerSpec{
-					Replicas: int32ptr(1),
-				},
-			},
-		},
-	}
-	return pods, svc, rc
-}
-
-func int32ptr(val int) *int32 {
-	t := int32(val)
-	return &t
-}
-
-func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj))))
-}
-
-func bytesBody(bodyBytes []byte) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader(bodyBytes))
-}
-
-func stringBody(body string) io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader([]byte(body)))
-}
-
 func TestNormalizationFuncGlobalExistence(t *testing.T) {
 	// This test can be safely deleted when we will not support multiple flag formats
 	root := NewKubectlCommand(os.Stdin, os.Stdout, os.Stderr)
@@ -165,14 +57,6 @@ func TestNormalizationFuncGlobalExistence(t *testing.T) {
 	}
 }
 
-func genResponseWithJsonEncodedBody(bodyStruct interface{}) (*http.Response, error) {
-	jsonBytes, err := json.Marshal(bodyStruct)
-	if err != nil {
-		return nil, err
-	}
-	return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: bytesBody(jsonBytes)}, nil
-}
-
 func Test_deprecatedAlias(t *testing.T) {
 	var correctCommandCalled bool
 	makeCobraCommand := func() *cobra.Command {
@@ -190,7 +74,7 @@ func Test_deprecatedAlias(t *testing.T) {
 	if len(alias.Deprecated) == 0 {
 		t.Error("deprecatedAlias should always have a non-empty .Deprecated")
 	}
-	if !stdstrings.Contains(alias.Deprecated, "print") {
+	if !strings.Contains(alias.Deprecated, "print") {
 		t.Error("deprecatedAlias should give the name of the new function in its .Deprecated field")
 	}
 	if !alias.Hidden {
@@ -210,7 +94,7 @@ func Test_deprecatedAlias(t *testing.T) {
 	alias.SetOutput(buffer)
 	alias.Execute()
 	str := buffer.String()
-	if !stdstrings.Contains(str, "deprecated") || !stdstrings.Contains(str, "print") {
+	if !strings.Contains(str, "deprecated") || !strings.Contains(str, "print") {
 		t.Errorf("deprecation warning %q does not include enough information", str)
 	}
 
@@ -240,7 +124,7 @@ func TestKubectlCommandHandlesPlugins(t *testing.T) {
 		{
 			name:             "test that a plugin executable is found based on command args",
 			args:             []string{"kubectl", "foo", "--bar"},
-			expectPlugin:     "testdata/plugin/kubectl-foo",
+			expectPlugin:     "plugin/testdata/kubectl-foo",
 			expectPluginArgs: []string{"foo", "--bar"},
 		},
 		{
@@ -252,7 +136,7 @@ func TestKubectlCommandHandlesPlugins(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			pluginsHandler := &testPluginHandler{
-				pluginsDirectory: "testdata/plugin",
+				pluginsDirectory: "plugin/testdata",
 			}
 			_, in, out, errOut := genericclioptions.NewTestIOStreams()