Some refactorings

2023-03-26 21:26:55 -04:00
parent 05d381c26f
commit b998c05ca0
5 changed files with 66 additions and 43 deletions
@@ -15,29 +15,45 @@ func TestGG(t *testing.T) {
 	RunSpecs(t, "GG Suite")
 }

-var _ = Describe("IfZero", func() {
-	DescribeTable("string",
-		func(v, orElse, expected string) {
-			Expect(gg.IfZero(v, orElse)).To(Equal(expected))
-		},
-		Entry("zero value", "", "default", "default"),
-		Entry("non-zero value", "anything", "default", "anything"),
-	)
-	DescribeTable("numeric",
-		func(v, orElse, expected int) {
-			Expect(gg.IfZero(v, orElse)).To(Equal(expected))
-		},
-		Entry("zero value", 0, 2, 2),
-		Entry("non-zero value", -1, 2, -1),
-	)
-	type testStruct struct {
-		field1 int
-	}
-	DescribeTable("struct",
-		func(v, orElse, expected testStruct) {
-			Expect(gg.IfZero(v, orElse)).To(Equal(expected))
-		},
-		Entry("zero value", testStruct{}, testStruct{123}, testStruct{123}),
-		Entry("non-zero value", testStruct{456}, testStruct{123}, testStruct{456}),
-	)
+var _ = Describe("GG", func() {
+	Describe("If", func() {
+		DescribeTable("string",
+			func(v, orElse, expected string) {
+				Expect(gg.If(v, orElse)).To(Equal(expected))
+			},
+			Entry("zero value", "", "default", "default"),
+			Entry("non-zero value", "anything", "default", "anything"),
+		)
+		DescribeTable("numeric",
+			func(v, orElse, expected int) {
+				Expect(gg.If(v, orElse)).To(Equal(expected))
+			},
+			Entry("zero value", 0, 2, 2),
+			Entry("non-zero value", -1, 2, -1),
+		)
+		type testStruct struct {
+			field1 int
+		}
+		DescribeTable("struct",
+			func(v, orElse, expected testStruct) {
+				Expect(gg.If(v, orElse)).To(Equal(expected))
+			},
+			Entry("zero value", testStruct{}, testStruct{123}, testStruct{123}),
+			Entry("non-zero value", testStruct{456}, testStruct{123}, testStruct{456}),
+		)
+	})
+
+	Describe("FirstOr", func() {
+		Context("when given a list of strings", func() {
+			It("returns the first non-empty value", func() {
+				Expect(gg.FirstOr("default", "foo", "bar", "baz")).To(Equal("foo"))
+				Expect(gg.FirstOr("default", "", "", "qux")).To(Equal("qux"))
+			})
+
+			It("returns the default value if all values are empty", func() {
+				Expect(gg.FirstOr("default", "", "", "")).To(Equal("default"))
+				Expect(gg.FirstOr("", "", "", "")).To(Equal(""))
+			})
+		})
+	})
 })