From c3cdd15769f38be6352a600eac78da54238d00d6 Mon Sep 17 00:00:00 2001
From: jregan <jregan@google.com>
Date: Thu, 26 Nov 2020 06:36:24 -0800
Subject: [PATCH] Clean up selector test.

---
 api/resmap/selector_test.go | 55 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/api/resmap/selector_test.go b/api/resmap/selector_test.go
index f4ef6b2ea..5e5f0f647 100644
--- a/api/resmap/selector_test.go
+++ b/api/resmap/selector_test.go
@@ -6,6 +6,7 @@ package resmap_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/resid"
 	. "sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
@@ -48,38 +49,36 @@ metadata:
   name: x-name1
   namespace: x-default
 `))
-	if err != nil {
-		t.Fatalf("unexpected error %v", err)
-	}
+	assert.NoError(t, err)
 	return result
 }
 
 func TestFindPatchTargets(t *testing.T) {
 	rm := setupRMForPatchTargets(t)
-	testcases := []struct {
+	testcases := map[string]struct {
 		target types.Selector
 		count  int
 	}{
-		{
+		"select_01": {
 			target: types.Selector{
 				Name: "name.*",
 			},
 			count: 3,
 		},
-		{
+		"select_02": {
 			target: types.Selector{
 				Name:               "name.*",
 				AnnotationSelector: "foo=bar",
 			},
 			count: 2,
 		},
-		{
+		"select_03": {
 			target: types.Selector{
 				LabelSelector: "app=name1",
 			},
 			count: 1,
 		},
-		{
+		"select_04": {
 			target: types.Selector{
 				Gvk: resid.Gvk{
 					Kind: "Kind1",
@@ -88,31 +87,31 @@ func TestFindPatchTargets(t *testing.T) {
 			},
 			count: 2,
 		},
-		{
+		"select_05": {
 			target: types.Selector{
 				Name: "NotMatched",
 			},
 			count: 0,
 		},
-		{
+		"select_06": {
 			target: types.Selector{
 				Name: "",
 			},
 			count: 4,
 		},
-		{
+		"select_07": {
 			target: types.Selector{
 				Namespace: "default",
 			},
 			count: 2,
 		},
-		{
+		"select_08": {
 			target: types.Selector{
 				Namespace: "",
 			},
 			count: 4,
 		},
-		{
+		"select_09": {
 			target: types.Selector{
 				Namespace: "default",
 				Name:      "name.*",
@@ -122,69 +121,65 @@ func TestFindPatchTargets(t *testing.T) {
 			},
 			count: 1,
 		},
-		{
+		"select_10": {
 			target: types.Selector{
 				Name: "^name.*",
 			},
 			count: 3,
 		},
-		{
+		"select_11": {
 			target: types.Selector{
 				Name: "name.*$",
 			},
 			count: 3,
 		},
-		{
+		"select_12": {
 			target: types.Selector{
 				Name: "^name.*$",
 			},
 			count: 3,
 		},
-		{
+		"select_13": {
 			target: types.Selector{
 				Namespace: "^def.*",
 			},
 			count: 2,
 		},
-		{
+		"select_14": {
 			target: types.Selector{
 				Namespace: "def.*$",
 			},
 			count: 2,
 		},
-		{
+		"select_15": {
 			target: types.Selector{
 				Namespace: "^def.*$",
 			},
 			count: 2,
 		},
-		{
+		"select_16": {
 			target: types.Selector{
 				Namespace: "default",
 			},
 			count: 2,
 		},
-		{
+		"select_17": {
 			target: types.Selector{
 				Namespace: "NotMatched",
 			},
 			count: 0,
 		},
-		{
+		"select_18": {
 			target: types.Selector{
 				Namespace: "ns1",
 			},
 			count: 1,
 		},
 	}
-	for _, testcase := range testcases {
+	for n, testcase := range testcases {
 		actual, err := rm.Select(testcase.target)
-		if err != nil {
-			t.Errorf("unexpected error %v", err)
-		}
-		if len(actual) != testcase.count {
-			t.Errorf("expected %d objects, but got %d:\n%v", testcase.count, len(actual), actual)
-		}
+		assert.NoError(t, err)
+		assert.Equalf(
+			t, testcase.count, len(actual), "test=%s target=%v", n, testcase.target)
 	}
-
 }