Delete diff command and code it uses.

pkg/app/application_test.go

@@ -96,7 +96,6 @@ var deploy = schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deploy
 var cmap = schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}
 var secret = schema.GroupVersionKind{Version: "v1", Kind: "Secret"}
 var ns = schema.GroupVersionKind{Version: "v1", Kind: "Namespace"}
-var svc = schema.GroupVersionKind{Version: "v1", Kind: "Service"}
 
 func TestResources1(t *testing.T) {
 	expected := resmap.ResMap{
@@ -227,153 +226,6 @@ func TestResourceNotFound(t *testing.T) {
 	}
 }
 
-func TestRawResources1(t *testing.T) {
-	expected := resmap.ResMap{
-		resource.NewResId(deploy, "dply1"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply1",
-				},
-			}),
-		resource.NewResId(ns, "ns1"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "Namespace",
-				"metadata": map[string]interface{}{
-					"name": "ns1",
-				},
-			}),
-	}
-	l := makeLoader1(t)
-	app, err := NewApplication(l, fs.MakeFakeFS())
-	if err != nil {
-		t.Fatalf("Unexpected construction error %v", err)
-	}
-	actual, err := app.MakeUncustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected RawResources error %v", err)
-	}
-
-	if err := expected.ErrorIfNotEqual(actual); err != nil {
-		t.Fatalf("unexpected inequality: %v", err)
-	}
-}
-
-const (
-	kustomizationContentBase = `
-namePrefix: foo-
-commonLabels:
-  app: banana
-resources:
-  - deployment.yaml
-`
-	kustomizationContentOverlay = `
-commonLabels:
-  env: staging
-resources:
-  - service.yaml
-bases:
-  - base
-`
-	serviceContent = `apiVersion: v1
-kind: Service
-metadata:
-  name: svc
-spec:
-  type: LoadBalancer
-`
-)
-
-func makeLoader2(t *testing.T) loader.Loader {
-	ldr := loadertest.NewFakeLoader("/testpath")
-	err := ldr.AddFile("/testpath/"+constants.KustomizationFileName, []byte(kustomizationContentOverlay))
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = ldr.AddFile("/testpath/service.yaml", []byte(serviceContent))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	err = ldr.AddDirectory("/testpath/base")
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	err = ldr.AddFile("/testpath/base/"+constants.KustomizationFileName, []byte(kustomizationContentBase))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	err = ldr.AddFile("/testpath/base/deployment.yaml", []byte(deploymentContent))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	return ldr
-}
-
-// TODO: This test covers incorrect behavior; it should not pass.
-// It asks for raw resources.  The Service resource is returned in raw form,
-// but the resources in the base are modified to have the banana label,
-// the 'foo' name prefix, etc.  This method exists only to support the
-// diff command comparing customized to non-customized resources;
-// perhaps it's not worth supporting the command.
-func TestRawResources2(t *testing.T) {
-	expected := resmap.ResMap{
-		resource.NewResIdWithPrefix(deploy, "dply1", "foo-"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "foo-dply1",
-					"labels": map[string]interface{}{
-						"app": "banana",
-					},
-				},
-				"spec": map[string]interface{}{
-					"selector": map[string]interface{}{
-						"matchLabels": map[string]interface{}{
-							"app": "banana",
-						},
-					},
-					"template": map[string]interface{}{
-						"metadata": map[string]interface{}{
-							"labels": map[string]interface{}{
-								"app": "banana",
-							},
-						},
-					},
-				},
-			}),
-		resource.NewResId(svc, "svc"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "Service",
-				"metadata": map[string]interface{}{
-					"name": "svc",
-				},
-				"spec": map[string]interface{}{
-					"type": "LoadBalancer",
-				},
-			}),
-	}
-	l := makeLoader2(t)
-	app, err := NewApplication(l, fs.MakeFakeFS())
-	if err != nil {
-		t.Fatalf("Unexpected construction error %v", err)
-	}
-	actual, err := app.MakeUncustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected RawResources error %v", err)
-	}
-
-	if err := expected.ErrorIfNotEqual(actual); err != nil {
-		t.Fatalf("unexpected inequality: %v", err)
-	}
-	if !loadertest.CleanupCalled {
-		t.Fatalf("Cleanup should be called")
-	}
-}
-
 func TestSecretTimeout(t *testing.T) {
 	l := loadertest.NewFakeLoader("/testpath")
 	err := l.AddFile("/testpath/"+constants.KustomizationFileName, []byte(kustomizationContent2))