Use gomega in predicate tests

Author: sjberman

internal/manager/predicate/gatewayclass_test.go

@@ -3,11 +3,14 @@ package predicate
 import (
 	"testing"
 
+	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/gateway-api/apis/v1beta1"
 )
 
 func TestGatewayClassPredicate(t *testing.T) {
+	g := NewGomegaWithT(t)
+
 	p := GatewayClassPredicate{ControllerName: "nginx-ctlr"}
 
 	gc := &v1beta1.GatewayClass{
@@ -16,18 +19,10 @@ func TestGatewayClassPredicate(t *testing.T) {
 		},
 	}
 
-	if !p.Create(event.CreateEvent{Object: gc}) {
-		t.Error("GatewayClassPredicate.Create() returned false; expected true")
-	}
-	if !p.Update(event.UpdateEvent{ObjectNew: gc}) {
-		t.Error("GatewayClassPredicate.Update() returned false; expected true")
-	}
+	g.Expect(p.Create(event.CreateEvent{Object: gc})).To(BeTrue())
+	g.Expect(p.Update(event.UpdateEvent{ObjectNew: gc})).To(BeTrue())
 
 	gc.Spec.ControllerName = "unknown"
-	if p.Create(event.CreateEvent{Object: gc}) {
-		t.Error("GatewayClassPredicate.Create() returned true; expected false")
-	}
-	if p.Update(event.UpdateEvent{ObjectNew: gc}) {
-		t.Error("GatewayClassPredicate.Update() returned true; expected false")
-	}
+	g.Expect(p.Create(event.CreateEvent{Object: gc})).To(BeFalse())
+	g.Expect(p.Update(event.UpdateEvent{ObjectNew: gc})).To(BeFalse())
 }

internal/manager/predicate/service_test.go

@@ -3,6 +3,7 @@ package predicate
 import (
 	"testing"
 
+	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -224,34 +225,24 @@ func TestServicePortsChangedPredicate_Update(t *testing.T) {
 	p := ServicePortsChangedPredicate{}
 
 	for _, tc := range testcases {
-		update := p.Update(event.UpdateEvent{
-			ObjectOld: tc.objectOld,
-			ObjectNew: tc.objectNew,
-		})
+		t.Run(tc.msg, func(t *testing.T) {
+			g := NewGomegaWithT(t)
+			update := p.Update(event.UpdateEvent{
+				ObjectOld: tc.objectOld,
+				ObjectNew: tc.objectNew,
+			})
 
-		if update != tc.expUpdate {
-			t.Errorf(
-				"ServicePortsChangedPredicate.Update() mismatch for %q; got %t, expected %t",
-				tc.msg,
-				update,
-				tc.expUpdate,
-			)
-		}
+			g.Expect(update).To(Equal(tc.expUpdate))
+		})
 	}
 }
 
 func TestServicePortsChangedPredicate(t *testing.T) {
-	p := ServicePortsChangedPredicate{}
-
-	if !p.Delete(event.DeleteEvent{Object: &v1.Service{}}) {
-		t.Errorf("ServicePortsChangedPredicate.Delete() returned false; expected true")
-	}
+	g := NewGomegaWithT(t)
 
-	if !p.Create(event.CreateEvent{Object: &v1.Service{}}) {
-		t.Errorf("ServicePortsChangedPredicate.Create() returned false; expected true")
-	}
+	p := ServicePortsChangedPredicate{}
 
-	if !p.Generic(event.GenericEvent{Object: &v1.Service{}}) {
-		t.Errorf("ServicePortsChangedPredicate.Generic() returned false; expected true")
-	}
+	g.Expect(p.Delete(event.DeleteEvent{Object: &v1.Service{}})).To(BeTrue())
+	g.Expect(p.Create(event.CreateEvent{Object: &v1.Service{}})).To(BeTrue())
+	g.Expect(p.Generic(event.GenericEvent{Object: &v1.Service{}})).To(BeTrue())
 }