Skip to content

Commit

Permalink
removing more not directly related tests
Browse files Browse the repository at this point in the history
  • Loading branch information
shanalily committed Jan 25, 2022
1 parent 8ef9cfa commit 52517d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 88 deletions.
55 changes: 6 additions & 49 deletions api/resource/resource_test.go
Expand Up @@ -43,54 +43,18 @@ var testDeployment = factory.FromMap(

const deploymentAsString = `{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"name":"pooh"}}`

var testConfigMapNumericNs = factory.FromMap(
map[string]interface{}{
"apiVersion": "v1",
"kind": "ConfigMap",
"metadata": map[string]interface{}{
"name": "winnie",
"namespace": "01234",
},
})

//nolint:gosec
const configMapNumericNsAsString = `{"apiVersion":"v1","kind":"ConfigMap","metadata":{"name":"winnie","namespace":"01234"}}`

func TestAsYAML(t *testing.T) {
expectedDeployment := `apiVersion: apps/v1
expected := `apiVersion: apps/v1
kind: Deployment
metadata:
name: pooh
`
expectedConfigMapNumericNs := `apiVersion: v1
kind: ConfigMap
metadata:
name: winnie
namespace: "01234"
`

tests := []struct {
in *Resource
s string
}{
{
in: testDeployment,
s: expectedDeployment,
},
{
in: testConfigMapNumericNs,
s: expectedConfigMapNumericNs,
},
yaml, err := testDeployment.AsYAML()
if err != nil {
t.Fatal(err)
}

for _, test := range tests {
yaml, err := test.in.AsYAML()
if err != nil {
t.Fatal(err)
}
if string(yaml) != test.s {
t.Fatalf("--- expected\n%s\n--- got\n%s\n", test.s, string(yaml))
}
if string(yaml) != expected {
t.Fatalf("--- expected\n%s\n--- got\n%s\n", expected, string(yaml))
}
}

Expand All @@ -107,10 +71,6 @@ func TestResourceString(t *testing.T) {
in: testDeployment,
s: deploymentAsString,
},
{
in: testConfigMapNumericNs,
s: configMapNumericNsAsString,
},
}
for _, test := range tests {
assert.Equal(t, test.in.String(), test.s)
Expand Down Expand Up @@ -587,7 +547,6 @@ apiVersion: v1
kind: BlahBlah
metadata:
name: clown
namespace: "01234"
data:
fruit: pear
`))
Expand All @@ -599,7 +558,6 @@ apiVersion: v1
kind: Whatever
metadata:
name: spaceship
namespace: "01234"
data:
spaceship: enterprise
`))
Expand All @@ -616,7 +574,6 @@ data:
kind: BlahBlah
metadata:
name: clown
namespace: "01234"
`, string(bytes))
}

Expand Down
39 changes: 0 additions & 39 deletions api/types/kustomization_test.go
Expand Up @@ -223,42 +223,3 @@ unknown`)
t.Fatalf("expect an error")
}
}

func TestUnmarshalIntNamespace(t *testing.T) {
y := []byte(`
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
metadata:
name: kust
namespace: "01234"
labels:
foo: bar
annotations:
foo: bar
resources:
- foo
- bar
nameSuffix: dog
namePrefix: cat`)
var k Kustomization
err := k.Unmarshal(y)
if err != nil {
t.Fatal(err)
}
meta := ObjectMeta{
Name: "kust",
Namespace: "01234",
Labels: map[string]string{
"foo": "bar",
},
Annotations: map[string]string{
"foo": "bar",
},
}
if k.Kind != KustomizationKind || k.APIVersion != KustomizationVersion ||
len(k.Resources) != 2 || k.NamePrefix != "cat" || k.NameSuffix != "dog" ||
k.MetaData.Name != meta.Name || k.MetaData.Namespace != meta.Namespace ||
k.MetaData.Labels["foo"] != meta.Labels["foo"] || k.MetaData.Annotations["foo"] != meta.Annotations["foo"] {
t.Fatalf("wrong unmarshal result: %v", k)
}
}

0 comments on commit 52517d0

Please sign in to comment.