Refactor tests

Author: grantr

pkg/client/client_test.go

@@ -864,50 +864,36 @@ var _ = Describe("Client", func() {
 	})
 
 	Describe("DeleteOptions", func() {
-		It("should set empty metav1.DeleteOptions from nil or empty", func() {
-			var do *client.DeleteOptions
-			Expect(do.AsDeleteOptions()).To(Equal(&metav1.DeleteOptions{}))
-			do = &client.DeleteOptions{}
-			Expect(do.AsDeleteOptions()).To(Equal(&metav1.DeleteOptions{}))
-		})
-
-		It("should be converted to metav1.DeleteOptions", func() {
-			gp := int64(1)
-			pc := metav1.NewUIDPreconditions("uid")
-			dp := metav1.DeletePropagationForeground
-			do := &client.DeleteOptions{
-				GracePeriodSeconds: &gp,
-				Preconditions:      pc,
-				PropagationPolicy:  &dp,
-			}
-			mdo := do.AsDeleteOptions()
-			Expect(mdo.GracePeriodSeconds).To(Equal(&gp))
-			Expect(mdo.Preconditions).To(Equal(pc))
-			Expect(mdo.PropagationPolicy).To(Equal(&dp))
-		})
-
-		It("should be able to set GracePeriodSeconds from option func", func() {
+		It("should allow setting GracePeriodSeconds", func() {
 			do := &client.DeleteOptions{}
-			do.ApplyOptions([]client.DeleteOptionFunc{client.GracePeriodSeconds(1)})
+			client.GracePeriodSeconds(1)(do)
 			gp := int64(1)
-			Expect(do.GracePeriodSeconds).To(Equal(&gp))
+			Expect(do.AsDeleteOptions().GracePeriodSeconds).To(Equal(&gp))
 		})
 
-		It("should be able to set Precondition from option func", func() {
-			pc := metav1.NewUIDPreconditions("uid")
+		It("should allow setting Precondition", func() {
 			do := &client.DeleteOptions{}
-			do.ApplyOptions([]client.DeleteOptionFunc{client.Preconditions(pc)})
+			pc := metav1.NewUIDPreconditions("uid")
+			client.Preconditions(pc)(do)
+			Expect(do.AsDeleteOptions().Preconditions).To(Equal(pc))
 			Expect(do.Preconditions).To(Equal(pc))
 		})
 
-		It("should be able to set PropagationPolicy from option func", func() {
+		It("should allow setting PropagationPolicy", func() {
 			do := &client.DeleteOptions{}
-			do.ApplyOptions([]client.DeleteOptionFunc{client.PropagationPolicy(metav1.DeletePropagationForeground)})
+			client.PropagationPolicy(metav1.DeletePropagationForeground)(do)
 			dp := metav1.DeletePropagationForeground
-			Expect(do.PropagationPolicy).To(Equal(&dp))
+			Expect(do.AsDeleteOptions().PropagationPolicy).To(Equal(&dp))
+		})
+
+		It("should produce empty metav1.DeleteOptions if nil", func() {
+			var do *client.DeleteOptions
+			Expect(do.AsDeleteOptions()).To(Equal(&metav1.DeleteOptions{}))
+			do = &client.DeleteOptions{}
+			Expect(do.AsDeleteOptions()).To(Equal(&metav1.DeleteOptions{}))
 		})
 
-		It("should be able to set all option funcs", func() {
+		It("should merge multiple options together", func() {
 			gp := int64(1)
 			pc := metav1.NewUIDPreconditions("uid")
 			dp := metav1.DeletePropagationForeground