Skip to content

K
k3s
Commit a8d9a8da authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24851 from pmorie/master-test-loc

Automatic merge from submit-queue Reduce LOC in third party controller test Extract method refactor to make this test a little more readable @kubernetes/sig-api-machinery
parents fc8fa698 c386850d
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 40 deletions
pkg/master/thirdparty_controller_test.go
View file @ a8d9a8da
...@@ -63,6 +63,14 @@ func (f *FakeAPIInterface) ListThirdPartyResources() []string { ...@@ -63,6 +63,14 @@ func (f *FakeAPIInterface) ListThirdPartyResources() []string {
} }
func TestSyncAPIs(t *testing.T) { func TestSyncAPIs(t *testing.T) {
resourcesNamed := func(names ...string) []expapi.ThirdPartyResource {
result := []expapi.ThirdPartyResource{}
for _, name := range names {
result = append(result, expapi.ThirdPartyResource{ObjectMeta: api.ObjectMeta{Name: name}})
}
return result
}
tests := []struct { tests := []struct {
list *expapi.ThirdPartyResourceList list *expapi.ThirdPartyResourceList
apis []string apis []string
...@@ -72,26 +80,14 @@ func TestSyncAPIs(t *testing.T) { ...@@ -72,26 +80,14 @@ func TestSyncAPIs(t *testing.T) {
}{ }{
{ {
list: &expapi.ThirdPartyResourceList{ list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{ Items: resourcesNamed("foo.example.com"),
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
},
}, },
expectedInstalled: []string{"foo.example.com"}, expectedInstalled: []string{"foo.example.com"},
name: "simple add", name: "simple add",
}, },
{ {
list: &expapi.ThirdPartyResourceList{ list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{ Items: resourcesNamed("foo.example.com"),
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
},
}, },
apis: []string{ apis: []string{
"/apis/example.com", "/apis/example.com",
...@@ -101,13 +97,7 @@ func TestSyncAPIs(t *testing.T) { ...@@ -101,13 +97,7 @@ func TestSyncAPIs(t *testing.T) {
}, },
{ {
list: &expapi.ThirdPartyResourceList{ list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{ Items: resourcesNamed("foo.example.com"),
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
},
}, },
apis: []string{ apis: []string{
"/apis/example.com", "/apis/example.com",
...@@ -123,18 +113,7 @@ func TestSyncAPIs(t *testing.T) { ...@@ -123,18 +113,7 @@ func TestSyncAPIs(t *testing.T) {
}, },
{ {
list: &expapi.ThirdPartyResourceList{ list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{ Items: resourcesNamed("foo.example.com", "foo.company.com"),
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
{
ObjectMeta: api.ObjectMeta{
Name: "foo.company.com",
},
},
},
}, },
apis: []string{ apis: []string{
"/apis/company.com", "/apis/company.com",
...@@ -145,13 +124,7 @@ func TestSyncAPIs(t *testing.T) { ...@@ -145,13 +124,7 @@ func TestSyncAPIs(t *testing.T) {
}, },
{ {
list: &expapi.ThirdPartyResourceList{ list: &expapi.ThirdPartyResourceList{
Items: []expapi.ThirdPartyResource{ Items: resourcesNamed("foo.example.com"),
{
ObjectMeta: api.ObjectMeta{
Name: "foo.example.com",
},
},
},
}, },
apis: []string{ apis: []string{
"/apis/company.com", "/apis/company.com",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment