weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove util_test.go from issuers & clusterissuers

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-07-26 13:13:37 +01:00
parent 7b8a343d53
commit 331f490312
6 changed files with 24 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/clusterissuers/BUILD.bazel
View File

@ -33,15 +33,11 @@ go_library(
go_test(
name = "go_default_test",
srcs = [
"sync_test.go",
"util_test.go",
],
srcs = ["sync_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/apis/certmanager/v1alpha1:go_default_library",
"//pkg/controller/test:go_default_library",
"//test/util/generate:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library",

16
pkg/controller/clusterissuers/sync_test.go
View File

@ -26,6 +26,7 @@ import (
clientgotesting "k8s.io/client-go/testing"
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
testpkg "github.com/jetstack/cert-manager/pkg/controller/test"
)
func newFakeIssuerWithStatus(name string, status v1alpha1.IssuerStatus) *v1alpha1.ClusterIssuer {
@ -42,12 +43,17 @@ func TestSync(t *testing.T) {
}
func TestUpdateIssuerStatus(t *testing.T) {
f := &controllerFixture{}
f.Setup(t)
defer f.Finish(t)
b := &testpkg.Builder{
T: t,
}
b.Start()
defer b.Stop()
c := f.Controller
fakeClient := f.Builder.FakeCMClient()
c := &controller{}
c.Register(b.Context)
b.Sync()
fakeClient := b.FakeCMClient()
assertNumberOfActions(t, fatalf, filter(fakeClient.Actions()), 0)
originalIssuer := newFakeIssuerWithStatus("test", v1alpha1.IssuerStatus{})

91
pkg/controller/clusterissuers/util_test.go
View File

@ -1,91 +0,0 @@
/*
Copyright 2019 The Jetstack cert-manager contributors.
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 clusterissuers
import (
"testing"
"github.com/jetstack/cert-manager/test/util/generate"
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack/cert-manager/pkg/controller/test"
)
type controllerFixture struct {
// The Solver under test
Controller *controller
Builder *test.Builder
// Issuer to be passed to functions on the Solver (a default will be used if nil)
Issuer *v1alpha1.ClusterIssuer
// PreFn will run before the test is run, but after the fixture has been initialised.
// This is useful if you want to load the clientset with some resources *after* the
// fixture has been created.
PreFn func(*testing.T, *controllerFixture)
// CheckFn should performs checks to ensure the output of the test is as expected.
// Optional additional values may be provided, which represent the output of the
// function under test.
CheckFn func(*testing.T, *controllerFixture, ...interface{})
// Err should be true if an error is expected from the function under test
Err bool
// testResources is used to store references to resources used or created during
// the test.
testResources map[string]interface{}
}
const (
defaultTestIssuerName = "issuer"
defaultTestNamespace = "default"
)
func (s *controllerFixture) Setup(t *testing.T) {
if s.Issuer == nil {
s.Issuer = generate.ClusterIssuer(generate.ClusterIssuerConfig{
Name: defaultTestIssuerName,
Namespace: defaultTestNamespace,
})
}
if s.testResources == nil {
s.testResources = map[string]interface{}{}
}
if s.Builder == nil {
s.Builder = &test.Builder{}
}
if s.Builder.T == nil {
s.Builder.T = t
}
s.Builder.Start()
s.Controller = &controller{}
s.Controller.Register(s.Builder.Context)
s.Builder.Sync()
if s.PreFn != nil {
s.PreFn(t, s)
s.Builder.Sync()
}
}
func (s *controllerFixture) Finish(t *testing.T, args ...interface{}) {
defer s.Builder.Stop()
// resync listers before running checks
s.Builder.Sync()
// run custom checks
if s.CheckFn != nil {
s.CheckFn(t, s, args...)
}
}

6
pkg/controller/issuers/BUILD.bazel
View File

@ -33,15 +33,11 @@ go_library(
go_test(
name = "go_default_test",
srcs = [
"sync_test.go",
"util_test.go",
],
srcs = ["sync_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/apis/certmanager/v1alpha1:go_default_library",
"//pkg/controller/test:go_default_library",
"//test/util/generate:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library",

16
pkg/controller/issuers/sync_test.go
View File

@ -26,6 +26,7 @@ import (
clientgotesting "k8s.io/client-go/testing"
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
testpkg "github.com/jetstack/cert-manager/pkg/controller/test"
)
func newFakeIssuerWithStatus(name string, status v1alpha1.IssuerStatus) *v1alpha1.Issuer {
@ -42,12 +43,17 @@ func TestSync(t *testing.T) {
}
func TestUpdateIssuerStatus(t *testing.T) {
f := &controllerFixture{}
f.Setup(t)
defer f.Finish(t)
b := &testpkg.Builder{
T: t,
}
b.Start()
defer b.Stop()
cmClient := f.Builder.FakeCMClient()
c := f.Controller
c := &controller{}
c.Register(b.Context)
b.Sync()
cmClient := b.FakeCMClient()
assertNumberOfActions(t, fatalf, filter(cmClient.Actions()), 0)
originalIssuer := newFakeIssuerWithStatus("test", v1alpha1.IssuerStatus{})

91
pkg/controller/issuers/util_test.go
View File

@ -1,91 +0,0 @@
/*
Copyright 2019 The Jetstack cert-manager contributors.
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 issuers
import (
"testing"
"github.com/jetstack/cert-manager/test/util/generate"
"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
"github.com/jetstack/cert-manager/pkg/controller/test"
)
type controllerFixture struct {
// The Solver under test
Controller *controller
Builder *test.Builder
// Issuer to be passed to functions on the Solver (a default will be used if nil)
Issuer *v1alpha1.Issuer
// PreFn will run before the test is run, but after the fixture has been initialised.
// This is useful if you want to load the clientset with some resources *after* the
// fixture has been created.
PreFn func(*testing.T, *controllerFixture)
// CheckFn should performs checks to ensure the output of the test is as expected.
// Optional additional values may be provided, which represent the output of the
// function under test.
CheckFn func(*testing.T, *controllerFixture, ...interface{})
// Err should be true if an error is expected from the function under test
Err bool
// testResources is used to store references to resources used or created during
// the test.
testResources map[string]interface{}
}
const (
defaultTestIssuerName = "issuer"
defaultTestNamespace = "default"
)
func (s *controllerFixture) Setup(t *testing.T) {
if s.Issuer == nil {
s.Issuer = generate.Issuer(generate.IssuerConfig{
Name: defaultTestIssuerName,
Namespace: defaultTestNamespace,
})
}
if s.testResources == nil {
s.testResources = map[string]interface{}{}
}
if s.Builder == nil {
s.Builder = &test.Builder{}
}
if s.Builder.T == nil {
s.Builder.T = t
}
s.Builder.Start()
s.Controller = &controller{}
s.Controller.Register(s.Builder.Context)
s.Builder.Sync()
if s.PreFn != nil {
s.PreFn(t, s)
s.Builder.Sync()
}
}
func (s *controllerFixture) Finish(t *testing.T, args ...interface{}) {
defer s.Builder.Stop()
// resync listers before running checks
s.Builder.Sync()
// run custom checks
if s.CheckFn != nil {
s.CheckFn(t, s, args...)
}
}