move category expansion out of restmapper

pkg/kubectl/cmd/util/shortcut_restmapper_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package util
 
 import (
-	"strings"
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,43 +28,25 @@ func TestReplaceAliases(t *testing.T) {
 	tests := []struct {
 		name     string
 		arg      string
-		expected string
+		expected schema.GroupVersionResource
 		srvRes   []*metav1.APIResourceList
 	}{
-		{
-			name:     "no-replacement",
-			arg:      "service",
-			expected: "service",
-			srvRes:   []*metav1.APIResourceList{},
-		},
-		{
-			name:     "all-replacement",
-			arg:      "all",
-			expected: "pods,replicationcontrollers,services,statefulsets,horizontalpodautoscalers,jobs,deployments,replicasets",
-			srvRes:   []*metav1.APIResourceList{},
-		},
-		{
-			name:     "alias-in-comma-separated-arg",
-			arg:      "all,secrets",
-			expected: "pods,replicationcontrollers,services,statefulsets,horizontalpodautoscalers,jobs,deployments,replicasets,secrets",
-			srvRes:   []*metav1.APIResourceList{},
-		},
 		{
 			name:     "rc-resolves-to-replicationcontrollers",
 			arg:      "rc",
-			expected: "replicationcontrollers",
+			expected: schema.GroupVersionResource{Resource: "replicationcontrollers"},
 			srvRes:   []*metav1.APIResourceList{},
 		},
 		{
 			name:     "storageclasses-no-replacement",
 			arg:      "storageclasses",
-			expected: "storageclasses",
+			expected: schema.GroupVersionResource{Resource: "storageclasses"},
 			srvRes:   []*metav1.APIResourceList{},
 		},
 		{
 			name:     "hpa-priority",
 			arg:      "hpa",
-			expected: "superhorizontalpodautoscalers",
+			expected: schema.GroupVersionResource{Resource: "superhorizontalpodautoscalers"},
 			srvRes: []*metav1.APIResourceList{
 				{
 					GroupVersion: "autoscaling/v1",
@@ -96,16 +77,12 @@ func TestReplaceAliases(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		resources := []string{}
 		ds.serverResourcesHandler = func() ([]*metav1.APIResourceList, error) {
 			return test.srvRes, nil
 		}
-		for _, arg := range strings.Split(test.arg, ",") {
-			curr, _ := mapper.AliasesForResource(arg)
-			resources = append(resources, curr...)
-		}
-		if strings.Join(resources, ",") != test.expected {
-			t.Errorf("%s: unexpected argument: expected %s, got %s", test.name, test.expected, resources)
+		actual := mapper.expandResourceShortcut(schema.GroupVersionResource{Resource: test.arg})
+		if actual != test.expected {
+			t.Errorf("%s: unexpected argument: expected %s, got %s", test.name, test.expected, actual)
 		}
 	}
 }