From 52517d0edee6cc0ac9007d38e185a540d9b40c64 Mon Sep 17 00:00:00 2001 From: shanalily Date: Tue, 25 Jan 2022 14:37:02 -0800 Subject: [PATCH] removing more not directly related tests --- api/resource/resource_test.go | 55 ++++----------------------------- api/types/kustomization_test.go | 39 ----------------------- 2 files changed, 6 insertions(+), 88 deletions(-) diff --git a/api/resource/resource_test.go b/api/resource/resource_test.go index 82854403158..106c827ae0b 100644 --- a/api/resource/resource_test.go +++ b/api/resource/resource_test.go @@ -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)) } } @@ -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) @@ -587,7 +547,6 @@ apiVersion: v1 kind: BlahBlah metadata: name: clown - namespace: "01234" data: fruit: pear `)) @@ -599,7 +558,6 @@ apiVersion: v1 kind: Whatever metadata: name: spaceship - namespace: "01234" data: spaceship: enterprise `)) @@ -616,7 +574,6 @@ data: kind: BlahBlah metadata: name: clown - namespace: "01234" `, string(bytes)) } diff --git a/api/types/kustomization_test.go b/api/types/kustomization_test.go index e07699c81f2..74101b1ab1f 100644 --- a/api/types/kustomization_test.go +++ b/api/types/kustomization_test.go @@ -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) - } -}