Merge pull request #324 from salasberryfin/tests-switch-havexacteleme…

…nts-containelements test: use gomega's ContainElements
rancher · May 16, 2024 · 141f4e0 · 141f4e0
2 parents ceab8cc + 6f3f6c3
commit 141f4e0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/pkg/registration/registration_test.go b/pkg/registration/registration_test.go
@@ -120,7 +120,8 @@ func TestInternalFirstMethod(t *testing.T) {
 			actualAddresses, err := regMethod(nil, tc.rcp, col)
 			g.Expect(err).NotTo(HaveOccurred())
 
-			g.Expect(actualAddresses).To(HaveExactElements(tc.expectedAddresses))
+			g.Expect(actualAddresses).To(HaveLen(len(tc.expectedAddresses)))
+			g.Expect(actualAddresses).To(ContainElements(tc.expectedAddresses))
 		})
 	}
 }
@@ -172,8 +173,8 @@ func TestInternalOnlyMethod(t *testing.T) {
 			actualAddresses, err := regMethod(nil, tc.rcp, col)
 			g.Expect(err).NotTo(HaveOccurred())
 
-			g.Expect(actualAddresses).To(HaveExactElements(tc.expectedAddresses))
-
+			g.Expect(actualAddresses).To(HaveLen(len(tc.expectedAddresses)))
+			g.Expect(actualAddresses).To(ContainElements(tc.expectedAddresses))
 		})
 	}
 }
@@ -225,8 +226,8 @@ func TestExternalOnlyMethod(t *testing.T) {
 			actualAddresses, err := regMethod(nil, tc.rcp, col)
 			g.Expect(err).NotTo(HaveOccurred())
 
-			g.Expect(actualAddresses).To(HaveExactElements(tc.expectedAddresses))
-
+			g.Expect(len(actualAddresses)).To(Equal(len(tc.expectedAddresses)))
+			g.Expect(actualAddresses).To(ContainElements(tc.expectedAddresses))
 		})
 	}
 }
@@ -276,8 +277,8 @@ func TestAddressMethod(t *testing.T) {
 
 			expectedAddresses := []string{"100.100.100.100"}
 
-			g.Expect(actualAddresses).To(HaveExactElements(expectedAddresses))
-
+			g.Expect(len(actualAddresses)).To(Equal(len(expectedAddresses)))
+			g.Expect(actualAddresses).To(ContainElements(expectedAddresses))
 		})
 	}
 }
@@ -336,8 +337,8 @@ func TestControlPlaneMethod(t *testing.T) {
 			g.Expect(err).NotTo(HaveOccurred())
 
 			expectedAddresses := []string{tc.expectedAddress}
-			g.Expect(actualAddresses).To(HaveExactElements(expectedAddresses))
-
+			g.Expect(len(actualAddresses)).To(Equal(len(expectedAddresses)))
+			g.Expect(actualAddresses).To(ContainElements(expectedAddresses))
 		})
 	}
 }
@@ -376,7 +377,6 @@ func createCluster(name string, cpHost string, cpPort int) *clusterv1.Cluster {
 	}
 
 	return cluster
-
 }
 
 func createMachine(name string, internalIPs []string, externalIPs []string) *clusterv1.Machine {