From 42c55993052fee16a1cdb6969e67c8c8383f773b Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 22 Mar 2018 19:18:00 +0000 Subject: [PATCH] Rename integration test framework to unit --- pkg/issuer/acme/http/util_test.go | 8 ++++---- pkg/issuer/acme/util_test.go | 8 ++++---- test/{integration => unit}/fixture.go | 2 +- test/{integration => unit}/util.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename test/{integration => unit}/fixture.go (99%) rename test/{integration => unit}/util.go (93%) diff --git a/pkg/issuer/acme/http/util_test.go b/pkg/issuer/acme/http/util_test.go index ac119ada7..1aa917b61 100644 --- a/pkg/issuer/acme/http/util_test.go +++ b/pkg/issuer/acme/http/util_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" - "github.com/jetstack/cert-manager/test/integration" + "github.com/jetstack/cert-manager/test/unit" ) const ( @@ -36,7 +36,7 @@ type solverFixture struct { Namespace string // f is the integration test fixture being used for this test - f *integration.Fixture + f *unit.Fixture // createdIngress is used to store a reference to an ingress resource created // during a tests PreFn. This should probably be removed in order to further // generalise this test fixture @@ -53,7 +53,7 @@ func (s *solverFixture) Setup(t *testing.T) { if s.Namespace == "" { s.Namespace = defaultTestNamespace } - s.f = &integration.Fixture{ + s.f = &unit.Fixture{ T: t, KubeObjects: s.KubeObjects, CertManagerObjects: s.CMObjects, @@ -77,7 +77,7 @@ func (s *solverFixture) Finish(t *testing.T) { } } -func buildFakeSolver(f *integration.Fixture, issuer v1alpha1.GenericIssuer) *Solver { +func buildFakeSolver(f *unit.Fixture, issuer v1alpha1.GenericIssuer) *Solver { s := &Solver{ issuer: issuer, client: f.KubeClient(), diff --git a/pkg/issuer/acme/util_test.go b/pkg/issuer/acme/util_test.go index c725fcc59..df6d2bb59 100644 --- a/pkg/issuer/acme/util_test.go +++ b/pkg/issuer/acme/util_test.go @@ -7,7 +7,7 @@ import ( "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack/cert-manager/pkg/issuer/acme/client" - "github.com/jetstack/cert-manager/test/integration" + "github.com/jetstack/cert-manager/test/unit" ) const ( @@ -29,14 +29,14 @@ type acmeFixture struct { Err bool // f is the integration test fixture being used for this test - f *integration.Fixture + f *unit.Fixture } func (s *acmeFixture) Setup(t *testing.T) { if s.Client == nil { s.Client = &client.FakeACME{} } - s.f = &integration.Fixture{ + s.f = &unit.Fixture{ T: t, KubeObjects: s.KubeObjects, CertManagerObjects: s.CMObjects, @@ -60,7 +60,7 @@ func (s *acmeFixture) Finish(t *testing.T) { } } -func buildFakeAcme(f *integration.Fixture, client *client.FakeACME, issuer v1alpha1.GenericIssuer) *Acme { +func buildFakeAcme(f *unit.Fixture, client *client.FakeACME, issuer v1alpha1.GenericIssuer) *Acme { a, err := New(issuer, f.KubeClient(), f.CertManagerClient(), diff --git a/test/integration/fixture.go b/test/unit/fixture.go similarity index 99% rename from test/integration/fixture.go rename to test/unit/fixture.go index f14b48bf7..eafd2fd3f 100644 --- a/test/integration/fixture.go +++ b/test/unit/fixture.go @@ -1,4 +1,4 @@ -package integration +package unit import ( "flag" diff --git a/test/integration/util.go b/test/unit/util.go similarity index 93% rename from test/integration/util.go rename to test/unit/util.go index 140dbdc47..6a173109a 100644 --- a/test/integration/util.go +++ b/test/unit/util.go @@ -1,4 +1,4 @@ -package integration +package unit import ( "math/rand"