From d28ef820eaef8569be5f85e4c34b3a8a8abad273 Mon Sep 17 00:00:00 2001
From: Dingshujie <dingshujie@huawei.com>
Date: Sat, 30 Nov 2019 14:50:36 +0800
Subject: [PATCH] mv resourceconflict_test to api/krusty/, Provide another high
 level example.

---
 .../resourceconflict_test.go                  | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)
 rename api/{internal/target => krusty}/resourceconflict_test.go (86%)

diff --git a/api/internal/target/resourceconflict_test.go b/api/krusty/resourceconflict_test.go
similarity index 86%
rename from api/internal/target/resourceconflict_test.go
rename to api/krusty/resourceconflict_test.go
index 4b03406b0..54919fb44 100644
--- a/api/internal/target/resourceconflict_test.go
+++ b/api/krusty/resourceconflict_test.go
@@ -1,16 +1,14 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package target_test
+package krusty_test
 
 import (
 	"strings"
 	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
-func writeBase(th *kusttest_test.KustTestHarness) {
+func writeBase(th testingHarness) {
 	th.WriteK("/app/base", `
 resources:
 - serviceaccount.yaml
@@ -64,7 +62,7 @@ rules:
 `)
 }
 
-func writeMidOverlays(th *kusttest_test.KustTestHarness) {
+func writeMidOverlays(th testingHarness) {
 	// Mid-level overlays
 	th.WriteK("/app/overlays/a", `
 resources:
@@ -80,7 +78,7 @@ nameSuffix: -suffixB
 `)
 }
 
-func writeTopOverlay(th *kusttest_test.KustTestHarness) {
+func writeTopOverlay(th testingHarness) {
 	// Top overlay, combining the mid-level overlays
 	th.WriteK("/app/combined", `
 resources:
@@ -90,12 +88,10 @@ resources:
 }
 
 func TestBase(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/base")
+	//th := kusttest_test.NewKustTestHarness(t, "/app/base")
+	th := makeTestHarness(t)
 	writeBase(th)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
+	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: ServiceAccount
@@ -143,13 +139,10 @@ rules:
 }
 
 func TestMidLevelA(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/overlays/a")
+	th := makeTestHarness(t)
 	writeBase(th)
 	writeMidOverlays(th)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
+	m := th.Run("/app/overlays/a", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: ServiceAccount
@@ -197,13 +190,10 @@ rules:
 }
 
 func TestMidLevelB(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/overlays/b")
+	th := makeTestHarness(t)
 	writeBase(th)
 	writeMidOverlays(th)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
+	m := th.Run("/app/overlays/b", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: ServiceAccount
@@ -251,14 +241,11 @@ rules:
 }
 
 func TestMultibasesNoConflict(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/combined")
+	th := makeTestHarness(t)
 	writeBase(th)
 	writeMidOverlays(th)
 	writeTopOverlay(th)
-	m, err := th.MakeKustTarget().MakeCustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected err: %v", err)
-	}
+	m := th.Run("/app/combined", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: ServiceAccount
@@ -349,7 +336,8 @@ rules:
 }
 
 func TestMultibasesWithConflict(t *testing.T) {
-	th := kusttest_test.NewKustTestHarness(t, "/app/combined")
+	th := makeTestHarness(t)
+	//th := kusttest_test.NewKustTestHarness(t, "/app/combined")
 	writeBase(th)
 	writeMidOverlays(th)
 	writeTopOverlay(th)
@@ -370,7 +358,7 @@ metadata:
   name: serviceaccount
 `)
 
-	_, err := th.MakeKustTarget().MakeCustomizedResMap()
+	err := th.RunWithErr("/app/combined", th.MakeDefaultOptions())
 	if err == nil {
 		t.Fatalf("expected error")
 	}