Skip to content

Commit

Permalink
Remove unnecessary usage of gomega libraries (#166)
Browse files Browse the repository at this point in the history
* Remove dependence on gomega

None of our current tests need gomega mocking, and the tests are
clearer/more flexible/more standardized  using the core
testing.T library.

Signed-off-by: Will Beason <willbeason@google.com>

* Fix dependency issues

Signed-off-by: Will Beason <willbeason@google.com>

* Fix merge mistake

Signed-off-by: Will Beason <willbeason@google.com>
  • Loading branch information
Will Beason (he/him) authored Jan 7, 2022
1 parent 4e828a7 commit 527ad40
Show file tree
Hide file tree
Showing 142 changed files with 105 additions and 178,894 deletions.
1 change: 0 additions & 1 deletion constraint/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/google/go-cmp v0.5.6
github.com/google/gofuzz v1.2.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/onsi/gomega v1.13.0
github.com/open-policy-agent/opa v0.35.0
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
Expand Down
45 changes: 35 additions & 10 deletions constraint/pkg/apis/templates/v1/constrainttemplate_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/onsi/gomega"
"github.com/open-policy-agent/frameworks/constraint/pkg/core/templates"
"github.com/open-policy-agent/frameworks/constraint/pkg/schema"
"golang.org/x/net/context"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -43,26 +43,51 @@ func TestStorageConstraintTemplate(t *testing.T) {
Name: "foo",
},
}
g := gomega.NewGomegaWithT(t)

// Test Create
fetched := &ConstraintTemplate{}
g.Expect(c.Create(ctx, created)).NotTo(gomega.HaveOccurred())
var err error

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(created))
err = c.Create(ctx, created)
if err != nil {
t.Fatalf("got Create() error = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}

if diff := cmp.Diff(created, fetched); diff != "" {
t.Fatal(diff)
}

// Test Updating the Labels
updated := fetched.DeepCopy()
updated.Labels = map[string]string{"hello": "world"}
g.Expect(c.Update(ctx, updated)).NotTo(gomega.HaveOccurred())
err = c.Update(ctx, updated)
if err != nil {
t.Fatalf("got Update() error = %v, want nil", err)
}

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(updated))
err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}
if diff := cmp.Diff(updated, fetched); diff != "" {
t.Fatal(diff)
}

// Test Delete
g.Expect(c.Delete(ctx, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(c.Get(ctx, key, fetched)).To(gomega.HaveOccurred())
err = c.Delete(ctx, fetched)
if err != nil {
t.Fatalf("got Delete() errror = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if !apierrors.IsNotFound(err) {
t.Fatalf("got Get() error = %v, want IsNotFound", err)
}
}

func TestTypeConversion(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/onsi/gomega"
"github.com/open-policy-agent/frameworks/constraint/pkg/core/templates"
"github.com/open-policy-agent/frameworks/constraint/pkg/schema"
"golang.org/x/net/context"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -43,26 +43,51 @@ func TestStorageConstraintTemplate(t *testing.T) {
Name: "foo",
},
}
g := gomega.NewGomegaWithT(t)

// Test Create
fetched := &ConstraintTemplate{}
g.Expect(c.Create(ctx, created)).NotTo(gomega.HaveOccurred())
var err error

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(created))
err = c.Create(ctx, created)
if err != nil {
t.Fatalf("got Create() error = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}

if diff := cmp.Diff(created, fetched); diff != "" {
t.Fatal(diff)
}

// Test Updating the Labels
updated := fetched.DeepCopy()
updated.Labels = map[string]string{"hello": "world"}
g.Expect(c.Update(ctx, updated)).NotTo(gomega.HaveOccurred())
err = c.Update(ctx, updated)
if err != nil {
t.Fatalf("got Update() error = %v, want nil", err)
}

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(updated))
err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}
if diff := cmp.Diff(updated, fetched); diff != "" {
t.Fatal(diff)
}

// Test Delete
g.Expect(c.Delete(ctx, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(c.Get(ctx, key, fetched)).To(gomega.HaveOccurred())
err = c.Delete(ctx, fetched)
if err != nil {
t.Fatalf("got Delete() errror = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if !apierrors.IsNotFound(err) {
t.Fatalf("got Get() error = %v, want IsNotFound", err)
}
}

func TestTypeConversion(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/onsi/gomega"
"github.com/open-policy-agent/frameworks/constraint/pkg/core/templates"
"github.com/open-policy-agent/frameworks/constraint/pkg/schema"
"golang.org/x/net/context"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -43,26 +43,51 @@ func TestStorageConstraintTemplate(t *testing.T) {
Name: "foo",
},
}
g := gomega.NewGomegaWithT(t)

// Test Create
fetched := &ConstraintTemplate{}
g.Expect(c.Create(ctx, created)).NotTo(gomega.HaveOccurred())
var err error

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(created))
err = c.Create(ctx, created)
if err != nil {
t.Fatalf("got Create() error = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}

if diff := cmp.Diff(created, fetched); diff != "" {
t.Fatal(diff)
}

// Test Updating the Labels
updated := fetched.DeepCopy()
updated.Labels = map[string]string{"hello": "world"}
g.Expect(c.Update(ctx, updated)).NotTo(gomega.HaveOccurred())
err = c.Update(ctx, updated)
if err != nil {
t.Fatalf("got Update() error = %v, want nil", err)
}

g.Expect(c.Get(ctx, key, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(fetched).To(gomega.Equal(updated))
err = c.Get(ctx, key, fetched)
if err != nil {
t.Fatalf("got Get() error = %v, want nil", err)
}
if diff := cmp.Diff(updated, fetched); diff != "" {
t.Fatal(diff)
}

// Test Delete
g.Expect(c.Delete(ctx, fetched)).NotTo(gomega.HaveOccurred())
g.Expect(c.Get(ctx, key, fetched)).To(gomega.HaveOccurred())
err = c.Delete(ctx, fetched)
if err != nil {
t.Fatalf("got Delete() errror = %v, want nil", err)
}

err = c.Get(ctx, key, fetched)
if !apierrors.IsNotFound(err) {
t.Fatalf("got Get() error = %v, want IsNotFound", err)
}
}

func TestTypeConversion(t *testing.T) {
Expand Down
5 changes: 0 additions & 5 deletions constraint/vendor/github.com/onsi/gomega/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions constraint/vendor/github.com/onsi/gomega/.travis.yml

This file was deleted.

Loading

0 comments on commit 527ad40

Please sign in to comment.