From a48c9f2fb65e7378247031976867a5237d86a0e1 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 12 Feb 2019 12:43:24 +0100 Subject: [PATCH] kube-aggregator: split openapi tests --- .../pkg/controllers/openapi/aggregator/BUILD | 5 +- ...{aggregator_test.go => downloader_test.go} | 47 ------------- .../openapi/aggregator/priority_test.go | 69 +++++++++++++++++++ 3 files changed, 73 insertions(+), 48 deletions(-) rename staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/{aggregator_test.go => downloader_test.go} (71%) create mode 100644 staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/priority_test.go diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/BUILD b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/BUILD index b177a03de8..01e155402f 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/BUILD +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/BUILD @@ -26,7 +26,10 @@ go_library( go_test( name = "go_default_test", - srcs = ["aggregator_test.go"], + srcs = [ + "downloader_test.go", + "priority_test.go", + ], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator_test.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader_test.go similarity index 71% rename from staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator_test.go rename to staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader_test.go index 09aef30748..6d530d6154 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator_test.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/downloader_test.go @@ -19,58 +19,12 @@ package aggregator import ( "fmt" "net/http" - "reflect" "testing" "github.com/go-openapi/spec" "github.com/stretchr/testify/assert" - - "k8s.io/kube-aggregator/pkg/apis/apiregistration" ) -func newAPIServiceForTest(name, group string, minGroupPriority, versionPriority int32) apiregistration.APIService { - r := apiregistration.APIService{} - r.Spec.Group = group - r.Spec.GroupPriorityMinimum = minGroupPriority - r.Spec.VersionPriority = versionPriority - r.Spec.Service = &apiregistration.ServiceReference{} - r.Name = name - return r -} - -func assertSortedServices(t *testing.T, actual []openAPISpecInfo, expectedNames []string) { - actualNames := []string{} - for _, a := range actual { - actualNames = append(actualNames, a.apiService.Name) - } - if !reflect.DeepEqual(actualNames, expectedNames) { - t.Errorf("Expected %s got %s.", expectedNames, actualNames) - } -} - -func TestAPIServiceSort(t *testing.T) { - list := []openAPISpecInfo{ - { - apiService: newAPIServiceForTest("FirstService", "Group1", 10, 5), - spec: &spec.Swagger{}, - }, - { - apiService: newAPIServiceForTest("SecondService", "Group2", 15, 3), - spec: &spec.Swagger{}, - }, - { - apiService: newAPIServiceForTest("FirstServiceInternal", "Group1", 16, 3), - spec: &spec.Swagger{}, - }, - { - apiService: newAPIServiceForTest("ThirdService", "Group3", 15, 3), - spec: &spec.Swagger{}, - }, - } - sortByPriority(list) - assertSortedServices(t, list, []string{"FirstService", "FirstServiceInternal", "SecondService", "ThirdService"}) -} - type handlerTest struct { etag string data []byte @@ -136,7 +90,6 @@ func assertDownloadedSpec(actualSpec *spec.Swagger, actualEtag string, err error } func TestDownloadOpenAPISpec(t *testing.T) { - s := Downloader{} // Test with no eTag diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/priority_test.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/priority_test.go new file mode 100644 index 0000000000..085ed15fd6 --- /dev/null +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/priority_test.go @@ -0,0 +1,69 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package aggregator + +import ( + "reflect" + "testing" + + "github.com/go-openapi/spec" + + "k8s.io/kube-aggregator/pkg/apis/apiregistration" +) + +func newAPIServiceForTest(name, group string, minGroupPriority, versionPriority int32) apiregistration.APIService { + r := apiregistration.APIService{} + r.Spec.Group = group + r.Spec.GroupPriorityMinimum = minGroupPriority + r.Spec.VersionPriority = versionPriority + r.Spec.Service = &apiregistration.ServiceReference{} + r.Name = name + return r +} + +func assertSortedServices(t *testing.T, actual []openAPISpecInfo, expectedNames []string) { + actualNames := []string{} + for _, a := range actual { + actualNames = append(actualNames, a.apiService.Name) + } + if !reflect.DeepEqual(actualNames, expectedNames) { + t.Errorf("Expected %s got %s.", expectedNames, actualNames) + } +} + +func TestAPIServiceSort(t *testing.T) { + list := []openAPISpecInfo{ + { + apiService: newAPIServiceForTest("FirstService", "Group1", 10, 5), + spec: &spec.Swagger{}, + }, + { + apiService: newAPIServiceForTest("SecondService", "Group2", 15, 3), + spec: &spec.Swagger{}, + }, + { + apiService: newAPIServiceForTest("FirstServiceInternal", "Group1", 16, 3), + spec: &spec.Swagger{}, + }, + { + apiService: newAPIServiceForTest("ThirdService", "Group3", 15, 3), + spec: &spec.Swagger{}, + }, + } + sortByPriority(list) + assertSortedServices(t, list, []string{"FirstService", "FirstServiceInternal", "SecondService", "ThirdService"}) +}