Merge pull request #463 from cpanato/GH-454-cloud

cloud/tests: standardize gomega usage
kubernetes-sigs · Mar 19, 2020 · d28e87b · d28e87b
2 parents 61b6a1e + 64efc35
commit d28e87b
Show file tree

Hide file tree

Showing 14 changed files with 339 additions and 499 deletions.
diff --git a/cloud/defaults_test.go b/cloud/defaults_test.go
@@ -19,11 +19,12 @@ package azure
 import (
 	"testing"
 
-	"github.com/onsi/gomega"
+	. "github.com/onsi/gomega"
 )
 
 func TestGetDefaultImageSKUID(t *testing.T) {
-	g := gomega.NewGomegaWithT(t)
+	g := NewWithT(t)
+
 	var tests = []struct {
 		k8sVersion     string
 		expectedResult string
@@ -74,12 +75,13 @@ func TestGetDefaultImageSKUID(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.k8sVersion, func(t *testing.T) {
 			id, err := getDefaultImageSKUID(test.k8sVersion)
-			g.Expect(id).To(gomega.Equal(test.expectedResult))
+
 			if test.expectedError {
-				g.Expect(err).ToNot(gomega.BeNil())
+				g.Expect(err).To(HaveOccurred())
 			} else {
-				g.Expect(err).To(gomega.BeNil())
+				g.Expect(err).NotTo(HaveOccurred())
 			}
+			g.Expect(id).To(Equal(test.expectedResult))
 		})
 	}
 }
diff --git a/cloud/services/availabilityzones/availabilityzones_test.go b/cloud/services/availabilityzones/availabilityzones_test.go
@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"testing"
 
+	. "github.com/onsi/gomega"
 	"sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilityzones/mock_availabilityzones"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
@@ -40,6 +41,8 @@ func init() {
 }
 
 func TestGetAvailabilityZones(t *testing.T) {
+	g := NewWithT(t)
+
 	testcases := []struct {
 		name                 string
 		availabilityZoneSpec Spec
@@ -106,24 +109,19 @@ func TestGetAvailabilityZones(t *testing.T) {
 					},
 				},
 			})
-			if err != nil {
-				t.Fatalf("Failed to create test context: %v", err)
-			}
+			g.Expect(err).NotTo(HaveOccurred())
 
 			s := &Service{
 				Scope:  clusterScope,
 				Client: azMock,
 			}
 
-			if _, err := s.Get(context.TODO(), &tc.availabilityZoneSpec); err != nil {
-				if tc.expectedError == "" || err.Error() != tc.expectedError {
-					t.Fatalf("got an unexpected error: %v", err)
-				}
+			_, err = s.Get(context.TODO(), &tc.availabilityZoneSpec)
+			if tc.expectedError != "" {
+				g.Expect(err).To(HaveOccurred())
+				g.Expect(err).To(MatchError(tc.expectedError))
 			} else {
-				if tc.expectedError != "" {
-					t.Fatalf("expected an error: %v", tc.expectedError)
-
-				}
+				g.Expect(err).NotTo(HaveOccurred())
 			}
 		})
 	}

diff --git a/cloud/services/disks/disks_test.go b/cloud/services/disks/disks_test.go
@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"testing"
 
+	. "github.com/onsi/gomega"
 	"sigs.k8s.io/cluster-api-provider-azure/cloud/services/disks/mock_disks"
 
 	"github.com/Azure/go-autorest/autorest"
@@ -40,6 +41,8 @@ func init() {
 }
 
 func TestInvalidDiskSpec(t *testing.T) {
+	g := NewWithT(t)
+
 	mockCtrl := gomock.NewController(t)
 	disksMock := mock_disks.NewMockClient(mockCtrl)
 
@@ -66,9 +69,7 @@ func TestInvalidDiskSpec(t *testing.T) {
 			},
 		},
 	})
-	if err != nil {
-		t.Fatalf("Failed to create test context: %v", err)
-	}
+	g.Expect(err).NotTo(HaveOccurred())
 
 	s := &Service{
 		Scope:  clusterScope,
@@ -79,15 +80,13 @@ func TestInvalidDiskSpec(t *testing.T) {
 	wrongSpec := &network.PublicIPAddress{}
 
 	err = s.Delete(context.TODO(), &wrongSpec)
-	if err == nil {
-		t.Fatalf("it should fail")
-	}
-	if err.Error() != "invalid disk specification" {
-		t.Fatalf("got an unexpected error: %v", err)
-	}
+	g.Expect(err).To(HaveOccurred())
+	g.Expect(err).To(MatchError("invalid disk specification"))
 }
 
 func TestDeleteDisk(t *testing.T) {
+	g := NewWithT(t)
+
 	testcases := []struct {
 		name          string
 		disksSpec     Spec
@@ -153,24 +152,19 @@ func TestDeleteDisk(t *testing.T) {
 					},
 				},
 			})
-			if err != nil {
-				t.Fatalf("Failed to create test context: %v", err)
-			}
+			g.Expect(err).NotTo(HaveOccurred())
 
 			s := &Service{
 				Scope:  clusterScope,
 				Client: disksMock,
 			}
 
-			if err := s.Delete(context.TODO(), &tc.disksSpec); err != nil {
-				if tc.expectedError == "" || err.Error() != tc.expectedError {
-					t.Fatalf("got an unexpected error: %v", err)
-				}
+			err = s.Delete(context.TODO(), &tc.disksSpec)
+			if tc.expectedError != "" {
+				g.Expect(err).To(HaveOccurred())
+				g.Expect(err).To(MatchError(tc.expectedError))
 			} else {
-				if tc.expectedError != "" {
-					t.Fatalf("expected an error: %v", tc.expectedError)
-
-				}
+				g.Expect(err).NotTo(HaveOccurred())
 			}
 		})
 	}

diff --git a/cloud/services/groups/groups_test.go b/cloud/services/groups/groups_test.go
@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"testing"
 
+	. "github.com/onsi/gomega"
 	"sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups/mock_groups"
 
 	"github.com/Azure/go-autorest/autorest"
@@ -41,6 +42,8 @@ func init() {
 }
 
 func TestGetGroups(t *testing.T) {
+	g := NewWithT(t)
+
 	testcases := []struct {
 		name          string
 		expectedError string
@@ -96,31 +99,27 @@ func TestGetGroups(t *testing.T) {
 					},
 				},
 			})
-			if err != nil {
-				t.Fatalf("Failed to create test context: %v", err)
-			}
+			g.Expect(err).NotTo(HaveOccurred())
 
 			s := &Service{
 				Scope:  clusterScope,
 				Client: groupsMock,
 			}
 
 			_, err = s.Get(context.TODO(), nil)
-			if err != nil {
-				if tc.expectedError == "" || err.Error() != tc.expectedError {
-					t.Fatalf("got an unexpected error: %v", err)
-				}
+			if tc.expectedError != "" {
+				g.Expect(err).To(HaveOccurred())
+				g.Expect(err).To(MatchError(tc.expectedError))
 			} else {
-				if tc.expectedError != "" {
-					t.Fatalf("expected an error: %v", tc.expectedError)
-
-				}
+				g.Expect(err).NotTo(HaveOccurred())
 			}
 		})
 	}
 }
 
 func TestReconcileGroups(t *testing.T) {
+	g := NewWithT(t)
+
 	testcases := []struct {
 		name               string
 		clusterScopeParams scope.ClusterScopeParams
@@ -212,30 +211,27 @@ func TestReconcileGroups(t *testing.T) {
 			tc.clusterScopeParams.Client = client
 			tc.clusterScopeParams.Cluster = cluster
 			clusterScope, err := scope.NewClusterScope(tc.clusterScopeParams)
-			if err != nil {
-				t.Fatalf("Failed to create test context: %v", err)
-			}
+			g.Expect(err).NotTo(HaveOccurred())
 
 			s := &Service{
 				Scope:  clusterScope,
 				Client: groupsMock,
 			}
 
-			if err := s.Reconcile(context.TODO(), nil); err != nil {
-				if tc.expectedError == "" || err.Error() != tc.expectedError {
-					t.Fatalf("got an unexpected error: %v", err)
-				}
+			err = s.Reconcile(context.TODO(), nil)
+			if tc.expectedError != "" {
+				g.Expect(err).To(HaveOccurred())
+				g.Expect(err).To(MatchError(tc.expectedError))
 			} else {
-				if tc.expectedError != "" {
-					t.Fatalf("expected an error: %v", tc.expectedError)
-
-				}
+				g.Expect(err).NotTo(HaveOccurred())
 			}
 		})
 	}
 }
 
 func TestDeleteGroups(t *testing.T) {
+	g := NewWithT(t)
+
 	testcases := []struct {
 		name               string
 		clusterScopeParams scope.ClusterScopeParams
@@ -399,24 +395,19 @@ func TestDeleteGroups(t *testing.T) {
 			tc.clusterScopeParams.Client = client
 			tc.clusterScopeParams.Cluster = cluster
 			clusterScope, err := scope.NewClusterScope(tc.clusterScopeParams)
-			if err != nil {
-				t.Fatalf("Failed to create test context: %v", err)
-			}
+			g.Expect(err).NotTo(HaveOccurred())
 
 			s := &Service{
 				Scope:  clusterScope,
 				Client: groupsMock,
 			}
 
-			if err := s.Delete(context.TODO(), nil); err != nil {
-				if tc.expectedError == "" || err.Error() != tc.expectedError {
-					t.Fatalf("got an unexpected error: %v", err)
-				}
+			err = s.Delete(context.TODO(), nil)
+			if tc.expectedError != "" {
+				g.Expect(err).To(HaveOccurred())
+				g.Expect(err).To(MatchError(tc.expectedError))
 			} else {
-				if tc.expectedError != "" {
-					t.Fatalf("expected an error: %v", tc.expectedError)
-
-				}
+				g.Expect(err).NotTo(HaveOccurred())
 			}
 		})
 	}