Use HaveLen to check length of something

Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>

Author: llamerada-jp

internal/controller/mantlebackup_controller_test.go

@@ -2265,7 +2265,7 @@ var _ = Describe("import", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(pv.GetLabels()["app.kubernetes.io/name"]).To(Equal(labelAppNameValue))
 			Expect(pv.GetLabels()["app.kubernetes.io/component"]).To(Equal(labelComponentZeroOutVolume))
-			Expect(len(pv.Spec.AccessModes)).To(Equal(1))
+			Expect(pv.Spec.AccessModes).To(HaveLen(1))
 			Expect(pv.Spec.AccessModes[0]).To(Equal(corev1.ReadWriteOnce))
 			Expect(pv.Spec.Capacity).To(Equal(pvCapacity))
 			Expect(pv.Spec.CSI.Driver).To(Equal(pvDriver))
@@ -2287,7 +2287,7 @@ var _ = Describe("import", func() {
 			Expect(pvc.GetLabels()["app.kubernetes.io/name"]).To(Equal(labelAppNameValue))
 			Expect(pvc.GetLabels()["app.kubernetes.io/component"]).To(Equal(labelComponentZeroOutVolume))
 			Expect(*pvc.Spec.StorageClassName).To(Equal(""))
-			Expect(len(pvc.Spec.AccessModes)).To(Equal(1))
+			Expect(pvc.Spec.AccessModes).To(HaveLen(1))
 			Expect(pvc.Spec.AccessModes[0]).To(Equal(corev1.ReadWriteOnce))
 			Expect(pvc.Spec.Resources).To(Equal(pvcResources))
 			Expect(*pvc.Spec.VolumeMode).To(Equal(corev1.PersistentVolumeBlock))
@@ -2299,17 +2299,17 @@ var _ = Describe("import", func() {
 			Expect(job.GetLabels()["app.kubernetes.io/name"]).To(Equal(labelAppNameValue))
 			Expect(job.GetLabels()["app.kubernetes.io/component"]).To(Equal(labelComponentZeroOutJob))
 			Expect(*job.Spec.BackoffLimit).To(Equal(int32(65535)))
-			Expect(len(job.Spec.Template.Spec.Containers)).To(Equal(1))
+			Expect(job.Spec.Template.Spec.Containers).To(HaveLen(1))
 			Expect(job.Spec.Template.Spec.Containers[0].Name).To(Equal("zeroout"))
 			Expect(*job.Spec.Template.Spec.Containers[0].SecurityContext.Privileged).To(BeTrue())
 			Expect(*job.Spec.Template.Spec.Containers[0].SecurityContext.RunAsGroup).To(Equal(int64(0)))
 			Expect(*job.Spec.Template.Spec.Containers[0].SecurityContext.RunAsUser).To(Equal(int64(0)))
 			Expect(job.Spec.Template.Spec.Containers[0].Image).To(Equal(mbr.podImage))
-			Expect(len(job.Spec.Template.Spec.Containers[0].VolumeDevices)).To(Equal(1))
+			Expect(job.Spec.Template.Spec.Containers[0].VolumeDevices).To(HaveLen(1))
 			Expect(job.Spec.Template.Spec.Containers[0].VolumeDevices[0].Name).To(Equal("zeroout-rbd"))
 			Expect(job.Spec.Template.Spec.Containers[0].VolumeDevices[0].DevicePath).To(Equal("/dev/zeroout-rbd"))
 			Expect(job.Spec.Template.Spec.RestartPolicy).To(Equal(corev1.RestartPolicyOnFailure))
-			Expect(len(job.Spec.Template.Spec.Volumes)).To(Equal(1))
+			Expect(job.Spec.Template.Spec.Volumes).To(HaveLen(1))
 			Expect(job.Spec.Template.Spec.Volumes[0]).To(Equal(corev1.Volume{
 				Name: "zeroout-rbd",
 				VolumeSource: corev1.VolumeSource{

test/e2e/multik8s/full_backup_test.go

@@ -132,11 +132,11 @@ var _ = Describe("full backup", Label("full-backup"), func() {
 			// Make sure snapshots are correctly created.
 			primarySnaps, err := ListRBDSnapshotsInPVC(PrimaryK8sCluster, namespace, pvcName)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(primarySnaps)).To(Equal(1))
+			Expect(primarySnaps).To(HaveLen(1))
 			Expect(primarySnaps[0].Name).To(Equal(backupName))
 			secondarySnaps, err := ListRBDSnapshotsInPVC(SecondaryK8sCluster, namespace, pvcName)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(secondarySnaps)).To(Equal(1)) // middle snapshots should be deleted.
+			Expect(secondarySnaps).To(HaveLen(1)) // Middle snapshots should be deleted.
 			Expect(secondarySnaps[0].Name).To(Equal(backupName))
 
 			By("ensuring the PVC can be attached to the pod in the primary cluster")

test/e2e/multik8s/testutil/util.go

@@ -487,7 +487,7 @@ func WriteRandomDataToPV(ctx SpecContext, cluster int, namespace, pvcName string
 	}).Should(Succeed())
 	stdout, _, err := Kubectl(cluster, nil, "logs", "-n", namespace, "job/"+writeJobName)
 	Expect(err).NotTo(HaveOccurred())
-	Expect(len(stdout)).NotTo(Equal(0))
+	Expect(stdout).NotTo(HaveLen(0))
 	return string(stdout)
 }