kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

chore: move removetest_testutils.go to internal/testutils

Browse Source
This commit is contained in:
Mauren Berti
2023-12-20 18:50:51 -05:00
parent f814039f99
commit 42d5870546
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kustomize/commands/edit/remove/removeresource_test.go
View File

@@ -7,14 +7,14 @@ import (
"errors"
"testing"
"sigs.k8s.io/kustomize/kustomize/v5/commands/internal/remove"
testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
)
func TestRemoveResources(t *testing.T) {
testCases := []remove.Case{
testCases := []testutils_test.Case{
{
Description: "remove resources",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"resource1.yaml",
"resource2.yaml",
@@ -22,7 +22,7 @@ func TestRemoveResources(t *testing.T) {
},
RemoveArgs: []string{"resource1.yaml"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"resource2.yaml",
"resource3.yaml",
@@ -34,7 +34,7 @@ func TestRemoveResources(t *testing.T) {
},
{
Description: "remove resource with pattern",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"foo/resource1.yaml",
"foo/resource2.yaml",
@@ -43,7 +43,7 @@ func TestRemoveResources(t *testing.T) {
},
RemoveArgs: []string{"foo/resource*.yaml"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"do/not/deleteme/please.yaml",
},
@@ -56,7 +56,7 @@ func TestRemoveResources(t *testing.T) {
},
{
Description: "nothing found to remove",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"resource1.yaml",
"resource2.yaml",
@@ -64,7 +64,7 @@ func TestRemoveResources(t *testing.T) {
},
RemoveArgs: []string{"foo"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"resource2.yaml",
"resource3.yaml",
@@ -74,14 +74,14 @@ func TestRemoveResources(t *testing.T) {
},
{
Description: "no arguments",
Given: remove.Given{},
Expected: remove.Expected{
Given: testutils_test.Given{},
Expected: testutils_test.Expected{
Err: errors.New("must specify a resource file"),
},
},
{
Description: "remove with multiple pattern arguments",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"foo/foo.yaml",
"bar/bar.yaml",
@@ -94,7 +94,7 @@ func TestRemoveResources(t *testing.T) {
"res*.yaml",
},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"do/not/deleteme/please.yaml",
},
@@ -107,5 +107,5 @@ func TestRemoveResources(t *testing.T) {
},
}
remove.ExecuteRemoveTestCases(t, testCases, "resources", newCmdRemoveResource)
testutils_test.ExecuteRemoveTestCases(t, testCases, "resources", newCmdRemoveResource)
}

27
kustomize/commands/edit/remove/removetransformer_test.go
View File

@@ -6,15 +6,16 @@ package remove
import (
"testing"
"sigs.k8s.io/kustomize/kustomize/v5/commands/internal/remove"
testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
"sigs.k8s.io/kustomize/kyaml/errors"
)
func TestRemoveTransformer(t *testing.T) {
testCases := []remove.Case{
testCases := []testutils_test.Case{
{
Description: "remove transformers",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"transformer1.yaml",
"transformer2.yaml",
@@ -22,7 +23,7 @@ func TestRemoveTransformer(t *testing.T) {
},
RemoveArgs: []string{"transformer1.yaml"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"transformer2.yaml",
"transformer3.yaml",
@@ -34,7 +35,7 @@ func TestRemoveTransformer(t *testing.T) {
},
{
Description: "remove transformer with pattern",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"foo/transformer1.yaml",
"foo/transformer2.yaml",
@@ -43,7 +44,7 @@ func TestRemoveTransformer(t *testing.T) {
},
RemoveArgs: []string{"foo/transformer*.yaml"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"do/not/deleteme/please.yaml",
},
@@ -56,7 +57,7 @@ func TestRemoveTransformer(t *testing.T) {
},
{
Description: "nothing found to remove",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"transformer1.yaml",
"transformer2.yaml",
@@ -64,7 +65,7 @@ func TestRemoveTransformer(t *testing.T) {
},
RemoveArgs: []string{"foo"},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"transformer2.yaml",
"transformer3.yaml",
@@ -74,14 +75,14 @@ func TestRemoveTransformer(t *testing.T) {
},
{
Description: "no arguments",
Given: remove.Given{},
Expected: remove.Expected{
Given: testutils_test.Given{},
Expected: testutils_test.Expected{
Err: errors.Errorf("must specify a transformer file"),
},
},
{
Description: "remove with multiple pattern arguments",
Given: remove.Given{
Given: testutils_test.Given{
Items: []string{
"foo/foo.yaml",
"bar/bar.yaml",
@@ -94,7 +95,7 @@ func TestRemoveTransformer(t *testing.T) {
"tra*.yaml",
},
},
Expected: remove.Expected{
Expected: testutils_test.Expected{
Items: []string{
"do/not/deleteme/please.yaml",
},
@@ -107,5 +108,5 @@ func TestRemoveTransformer(t *testing.T) {
},
}
remove.ExecuteRemoveTestCases(t, testCases, "transformers", newCmdRemoveTransformer)
testutils_test.ExecuteRemoveTestCases(t, testCases, "transformers", newCmdRemoveTransformer)
}

7
kustomize/commands/internal/remove/remove_testutils.go → kustomize/commands/internal/testutils/remove_testutils.go
View File

@@ -1,7 +1,7 @@
// Copyright 2022 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0
package remove
package testutils_test
import (
"fmt"
@@ -9,7 +9,6 @@ import (
"testing"
"github.com/spf13/cobra"
testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
@@ -54,7 +53,7 @@ func ExecuteRemoveTestCases(
for _, tc := range testCases {
t.Run(tc.Description, func(t *testing.T) {
fSys := filesys.MakeFsInMemory()
testutils_test.WriteTestKustomizationWith(
WriteTestKustomizationWith(
fSys,
[]byte(fmt.Sprintf("%s:\n - %s",
collectionName,
@@ -71,7 +70,7 @@ func ExecuteRemoveTestCases(
}
return
}
content, err := testutils_test.ReadTestKustomization(fSys)
content, err := ReadTestKustomization(fSys)
if err != nil {
t.Errorf("unexpected read error: %v", err)
}