comments

Author: sarthyparty

internal/mode/static/state/graph/gateway_listener_test.go

@@ -519,54 +519,65 @@ func TestListenerNamesHaveOverlap(t *testing.T) {
 	tests := []struct {
 		hostname1    *v1.Hostname
 		hostname2    *v1.Hostname
+		msg          string
 		expectResult bool
 	}{
 		{
 			hostname1:    (*v1.Hostname)(helpers.GetPointer("*.example.com")),
 			hostname2:    (*v1.Hostname)(helpers.GetPointer("*.example.com")),
 			expectResult: true,
+			msg:          "same hostnames with wildcard",
 		},
 		{
 			hostname1:    nil,
 			hostname2:    nil,
 			expectResult: true,
+			msg:          "two nil hostnames",
 		},
 		{
 			hostname1:    (*v1.Hostname)(helpers.GetPointer("cafe.example.com")),
 			hostname2:    (*v1.Hostname)(helpers.GetPointer("app.example.com")),
 			expectResult: false,
+			msg:          "two different hostnames no wildcard",
 		},
 		{
 			hostname1:    (*v1.Hostname)(helpers.GetPointer("cafe.example.com")),
 			hostname2:    nil,
 			expectResult: true,
+			msg:          "hostname1 is nil",
 		},
 		{
 			hostname1:    nil,
 			hostname2:    (*v1.Hostname)(helpers.GetPointer("cafe.example.com")),
 			expectResult: true,
+			msg:          "hostname2 is nil",
 		},
 		{
 			hostname1:    (*v1.Hostname)(helpers.GetPointer("*.example.com")),
 			hostname2:    (*v1.Hostname)(helpers.GetPointer("*.example.org")),
 			expectResult: false,
+			msg:          "wildcard hostnames that do not overlap",
 		},
 		{
 			hostname1:    (*v1.Hostname)(helpers.GetPointer("*.example.com")),
 			hostname2:    (*v1.Hostname)(helpers.GetPointer("cafe.example.com")),
 			expectResult: true,
+			msg:          "one wildcard hostname and one hostname that overlap",
 		},
 	}
 
 	for _, test := range tests {
-		g := NewWithT(t)
-		g.Expect(haveOverlap(test.hostname1, test.hostname2)).To(Equal(test.expectResult))
+		t.Run(test.msg, func(t *testing.T) {
+			g := NewWithT(t)
+			g.Expect(haveOverlap(test.hostname1, test.hostname2)).To(Equal(test.expectResult))
+		})
 	}
 }
 
 func TestValidateTLSFieldOnTLSListener(t *testing.T) {
 	tests := []struct {
 		listener     v1.Listener
+		msg          string
 		expectedCond []conditions.Condition
 		expectValid  bool
 	}{
@@ -576,39 +587,37 @@ func TestValidateTLSFieldOnTLSListener(t *testing.T) {
 				"TLS: Required value: tls must be defined for TLS listener",
 			),
 			expectValid: false,
-		},
-		{
-			listener: v1.Listener{},
-			expectedCond: staticConds.NewListenerUnsupportedValue(
-				"TLS: Required value: tls must be defined for TLS listener",
-			),
-			expectValid: false,
+			msg:         "TLS listener without tls field",
 		},
 		{
 			listener: v1.Listener{TLS: nil},
 			expectedCond: staticConds.NewListenerUnsupportedValue(
 				"TLS: Required value: tls must be defined for TLS listener",
 			),
 			expectValid: false,
+			msg:         "TLS listener with TLS field nil",
 		},
 		{
 			listener: v1.Listener{TLS: &v1.GatewayTLSConfig{Mode: helpers.GetPointer(v1.TLSModeTerminate)}},
 			expectedCond: staticConds.NewListenerUnsupportedValue(
 				"TLS.Mode: Required value: Mode must be passthrough for TLS listener",
 			),
 			expectValid: false,
+			msg:         "TLS listener with TLS mode terminate",
 		},
 		{
 			listener:    v1.Listener{TLS: &v1.GatewayTLSConfig{Mode: helpers.GetPointer(v1.TLSModePassthrough)}},
 			expectValid: true,
+			msg:         "TLS listener with TLS mode passthrough",
 		},
 	}
 	for _, test := range tests {
-		g := NewWithT(t)
-
-		cond, valid := validateTLSFieldOnTLSListener(test.listener)
+		t.Run(test.msg, func(t *testing.T) {
+			g := NewWithT(t)
+			cond, valid := validateTLSFieldOnTLSListener(test.listener)
 
-		g.Expect(cond).To(BeEquivalentTo(test.expectedCond))
-		g.Expect(valid).To(BeEquivalentTo(test.expectValid))
+			g.Expect(cond).To(BeEquivalentTo(test.expectedCond))
+			g.Expect(valid).To(BeEquivalentTo(test.expectValid))
+		})
 	}
 }

internal/mode/static/state/graph/route_common_test.go

@@ -2415,7 +2415,7 @@ func TestBindL4RouteToListeners(t *testing.T) {
 	}
 }
 
-func TestBuildL4RoutesForGateways(t *testing.T) {
+func TestBuildL4RoutesForGateways_NoGateways(t *testing.T) {
 	g := NewWithT(t)
 
 	nsName := types.NamespacedName{Namespace: testNs, Name: "hi"}
@@ -2444,7 +2444,7 @@ func TestBuildL4RoutesForGateways(t *testing.T) {
 	)).To(BeNil())
 }
 
-func TestTryToAttachL4RouteToListeners(t *testing.T) {
+func TestTryToAttachL4RouteToListeners_NoAttachableListeners(t *testing.T) {
 	g := NewWithT(t)
 
 	route := &L4Route{