Further isolate unstructured with factories.

pkg/resmap/resmap_test.go

@@ -17,14 +17,12 @@ limitations under the License.
 package resmap
 
 import (
-	"fmt"
 	"reflect"
 	"testing"
 
 	"sigs.k8s.io/kustomize/internal/k8sdeps"
 	"sigs.k8s.io/kustomize/pkg/gvk"
 	"sigs.k8s.io/kustomize/pkg/ifc"
-	"sigs.k8s.io/kustomize/pkg/internal/loadertest"
 	"sigs.k8s.io/kustomize/pkg/resid"
 	"sigs.k8s.io/kustomize/pkg/resource"
 )
@@ -273,95 +271,6 @@ func TestErrorIfNotEqual(t *testing.T) {
 
 }
 
-func TestNewMapFromFiles(t *testing.T) {
-
-	resourceStr := `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dply1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dply2
----
-# some comment
----
----
-`
-
-	l := loadertest.NewFakeLoader("/home/seans/project")
-	if ferr := l.AddFile("/home/seans/project/deployment.yaml", []byte(resourceStr)); ferr != nil {
-		t.Fatalf("Error adding fake file: %v\n", ferr)
-	}
-	expected := ResMap{resid.NewResId(deploy, "dply1"): rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "dply1",
-			},
-		}),
-		resid.NewResId(deploy, "dply2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply2",
-				},
-			}),
-	}
-
-	m, _ := rmF.FromFiles(
-		l, []string{"/home/seans/project/deployment.yaml"})
-	if len(m) != 2 {
-		t.Fatalf("%#v should contain 2 appResource, but got %d", m, len(m))
-	}
-
-	if err := expected.ErrorIfNotEqual(m); err != nil {
-		t.Fatalf("actual doesn't match expected: %v", err)
-	}
-}
-
-func TestNewMapFromBytes(t *testing.T) {
-	encoded := []byte(`apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm1
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm2
-`)
-	expected := ResMap{
-		resid.NewResId(cmap, "cm1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "cm1",
-				},
-			}),
-		resid.NewResId(cmap, "cm2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "cm2",
-				},
-			}),
-	}
-	m, err := rmF.newResMapFromBytes(encoded)
-	fmt.Printf("%v\n", m)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if !reflect.DeepEqual(m, expected) {
-		t.Fatalf("%#v doesn't match expected %#v", m, expected)
-	}
-}
-
 func TestMergeWithoutOverride(t *testing.T) {
 	input1 := ResMap{
 		resid.NewResId(deploy, "deploy1"): rf.FromMap(