Use constants in tests

Author: ciarams87

internal/controller/state/graph/graph_test.go

@@ -33,8 +33,9 @@ import (
 
 func TestBuildGraph(t *testing.T) {
 	const (
-		gcName         = "my-class"
-		controllerName = "my.controller"
+		gcName                  = "my-class"
+		controllerName          = "my.controller"
+		experimentalFeaturesOff = false
 	)
 
 	cm := &v1.ConfigMap{
@@ -1456,7 +1457,7 @@ func TestBuildGraph(t *testing.T) {
 					PolicyValidator:     fakePolicyValidator,
 				},
 				logr.Discard(),
-				false,
+				experimentalFeaturesOff,
 			)
 
 			g.Expect(helpers.Diff(test.expected, result)).To(BeEmpty())

internal/controller/state/graph/multiple_gateways_test.go

@@ -22,8 +22,9 @@ import (
 )
 
 const (
-	controllerName = "nginx"
-	gcName         = "my-gateway-class"
+	controllerName          = "nginx"
+	gcName                  = "my-gateway-class"
+	experimentalFeaturesOff = false
 )
 
 var (
@@ -406,7 +407,7 @@ func Test_MultipleGateways_WithNginxProxy(t *testing.T) {
 					PolicyValidator:     fakePolicyValidator,
 				},
 				logr.Discard(),
-				false,
+				experimentalFeaturesOff,
 			)
 
 			g.Expect(helpers.Diff(test.expGraph, result)).To(BeEmpty())
@@ -896,7 +897,7 @@ func Test_MultipleGateways_WithListeners(t *testing.T) {
 					PolicyValidator:     fakePolicyValidator,
 				},
 				logr.Discard(),
-				false,
+				experimentalFeaturesOff,
 			)
 
 			g.Expect(helpers.Diff(test.expGraph, result)).To(BeEmpty())

internal/controller/status/gatewayclass.go

@@ -3,7 +3,6 @@ package status
 import (
 	"sort"
 
-	"k8s.io/apimachinery/pkg/util/sets"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
@@ -12,55 +11,55 @@ import (
 // The list must be sorted in ascending alphabetical order.
 // If experimental is true, experimental features like TLSRoute will be included.
 func supportedFeatures(experimental bool) []gatewayv1.SupportedFeature {
-	featSet := sets.New(
+	featureNames := []features.FeatureName{
 		// Core features
-		features.GatewayFeature,
-		features.GRPCRouteFeature,
-		features.HTTPRouteFeature,
-		features.ReferenceGrantFeature,
+		features.SupportGateway,
+		features.SupportGRPCRoute,
+		features.SupportHTTPRoute,
+		features.SupportReferenceGrant,
 
 		// BackendTLSPolicy
-		features.BackendTLSPolicyFeature,
+		features.SupportBackendTLSPolicy,
 
 		// Gateway extended
-		features.GatewayEmptyAddressFeature,
-		features.GatewayHTTPListenerIsolationFeature,
-		features.GatewayInfrastructurePropagationFeature,
-		features.GatewayPort8080Feature,
-		features.GatewayStaticAddressesFeature,
+		features.SupportGatewayAddressEmpty,
+		features.SupportGatewayHTTPListenerIsolation,
+		features.SupportGatewayInfrastructurePropagation,
+		features.SupportGatewayPort8080,
+		features.SupportGatewayStaticAddresses,
 
 		// HTTPRoute extended
-		features.HTTPRouteBackendProtocolWebSocketFeature,
-		features.HTTPRouteDestinationPortMatchingFeature,
-		features.HTTPRouteHostRewriteFeature,
-		features.HTTPRouteMethodMatchingFeature,
-		features.HTTPRouteParentRefPortFeature,
-		features.HTTPRoutePathRedirectFeature,
-		features.HTTPRoutePathRewriteFeature,
-		features.HTTPRoutePortRedirectFeature,
-		features.HTTPRouteQueryParamMatchingFeature,
-		features.HTTPRouteRequestMirrorFeature,
-		features.HTTPRouteRequestMultipleMirrorsFeature,
-		features.HTTPRouteRequestPercentageMirrorFeature,
-		features.HTTPRouteResponseHeaderModificationFeature,
-		features.HTTPRouteSchemeRedirectFeature,
-	)
+		features.SupportHTTPRouteBackendProtocolWebSocket,
+		features.SupportHTTPRouteDestinationPortMatching,
+		features.SupportHTTPRouteHostRewrite,
+		features.SupportHTTPRouteMethodMatching,
+		features.SupportHTTPRouteParentRefPort,
+		features.SupportHTTPRoutePathRedirect,
+		features.SupportHTTPRoutePathRewrite,
+		features.SupportHTTPRoutePortRedirect,
+		features.SupportHTTPRouteQueryParamMatching,
+		features.SupportHTTPRouteRequestMirror,
+		features.SupportHTTPRouteRequestMultipleMirrors,
+		features.SupportHTTPRouteRequestPercentageMirror,
+		features.SupportHTTPRouteResponseHeaderModification,
+		features.SupportHTTPRouteSchemeRedirect,
+	}
 
 	// Add experimental features if enabled
 	if experimental {
-		featSet.Insert(features.TLSRouteFeature)
-	}
-
-	// Convert features to SupportedFeature slice
-	result := make([]gatewayv1.SupportedFeature, 0, featSet.Len())
-	for _, feat := range featSet.UnsortedList() {
-		result = append(result, gatewayv1.SupportedFeature{Name: gatewayv1.FeatureName(feat.Name)})
+		featureNames = append(featureNames, features.SupportTLSRoute)
 	}
 
 	// Sort alphabetically by feature name
-	sort.Slice(result, func(i, j int) bool {
-		return string(result[i].Name) < string(result[j].Name)
+	sort.Slice(featureNames, func(i, j int) bool {
+		return string(featureNames[i]) < string(featureNames[j])
 	})
 
+	// Convert to SupportedFeature slice
+	result := make([]gatewayv1.SupportedFeature, 0, len(featureNames))
+	for _, name := range featureNames {
+		result = append(result, gatewayv1.SupportedFeature{Name: gatewayv1.FeatureName(name)})
+	}
+
 	return result
 }

internal/controller/status/gatewayclass_test.go

@@ -6,80 +6,61 @@ import (
 
 	. "github.com/onsi/gomega"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func TestSupportedFeatures(t *testing.T) {
 	t.Parallel()
 
+	standardFeatures := []gatewayv1.FeatureName{
+		gatewayv1.FeatureName(features.SupportBackendTLSPolicy),
+		gatewayv1.FeatureName(features.SupportGRPCRoute),
+		gatewayv1.FeatureName(features.SupportGateway),
+		gatewayv1.FeatureName(features.SupportGatewayAddressEmpty),
+		gatewayv1.FeatureName(features.SupportGatewayHTTPListenerIsolation),
+		gatewayv1.FeatureName(features.SupportGatewayInfrastructurePropagation),
+		gatewayv1.FeatureName(features.SupportGatewayPort8080),
+		gatewayv1.FeatureName(features.SupportGatewayStaticAddresses),
+		gatewayv1.FeatureName(features.SupportHTTPRoute),
+		gatewayv1.FeatureName(features.SupportHTTPRouteBackendProtocolWebSocket),
+		gatewayv1.FeatureName(features.SupportHTTPRouteDestinationPortMatching),
+		gatewayv1.FeatureName(features.SupportHTTPRouteHostRewrite),
+		gatewayv1.FeatureName(features.SupportHTTPRouteMethodMatching),
+		gatewayv1.FeatureName(features.SupportHTTPRouteParentRefPort),
+		gatewayv1.FeatureName(features.SupportHTTPRoutePathRedirect),
+		gatewayv1.FeatureName(features.SupportHTTPRoutePathRewrite),
+		gatewayv1.FeatureName(features.SupportHTTPRoutePortRedirect),
+		gatewayv1.FeatureName(features.SupportHTTPRouteQueryParamMatching),
+		gatewayv1.FeatureName(features.SupportHTTPRouteRequestMirror),
+		gatewayv1.FeatureName(features.SupportHTTPRouteRequestMultipleMirrors),
+		gatewayv1.FeatureName(features.SupportHTTPRouteRequestPercentageMirror),
+		gatewayv1.FeatureName(features.SupportHTTPRouteResponseHeaderModification),
+		gatewayv1.FeatureName(features.SupportHTTPRouteSchemeRedirect),
+		gatewayv1.FeatureName(features.SupportReferenceGrant),
+	}
+
+	experimentalFeatures := []gatewayv1.FeatureName{
+		gatewayv1.FeatureName(features.SupportTLSRoute),
+	}
+
+	allFeatures := append(slices.Clone(standardFeatures), experimentalFeatures...)
+
 	tests := []struct {
 		name               string
 		expectedFeatures   []gatewayv1.FeatureName
 		unexpectedFeatures []gatewayv1.FeatureName
 		experimental       bool
 	}{
 		{
-			name:         "standard features only",
-			experimental: false,
-			expectedFeatures: []gatewayv1.FeatureName{
-				"BackendTLSPolicy",
-				"GRPCRoute",
-				"Gateway",
-				"GatewayAddressEmpty",
-				"GatewayHTTPListenerIsolation",
-				"GatewayInfrastructurePropagation",
-				"GatewayPort8080",
-				"GatewayStaticAddresses",
-				"HTTPRoute",
-				"HTTPRouteBackendProtocolWebSocket",
-				"HTTPRouteDestinationPortMatching",
-				"HTTPRouteHostRewrite",
-				"HTTPRouteMethodMatching",
-				"HTTPRouteParentRefPort",
-				"HTTPRoutePathRedirect",
-				"HTTPRoutePathRewrite",
-				"HTTPRoutePortRedirect",
-				"HTTPRouteQueryParamMatching",
-				"HTTPRouteRequestMirror",
-				"HTTPRouteRequestMultipleMirrors",
-				"HTTPRouteRequestPercentageMirror",
-				"HTTPRouteResponseHeaderModification",
-				"HTTPRouteSchemeRedirect",
-				"ReferenceGrant",
-			},
-			unexpectedFeatures: []gatewayv1.FeatureName{
-				"TLSRoute",
-			},
+			name:               "standard features only",
+			experimental:       false,
+			expectedFeatures:   standardFeatures,
+			unexpectedFeatures: experimentalFeatures,
 		},
 		{
-			name:         "standard and experimental features",
-			experimental: true,
-			expectedFeatures: []gatewayv1.FeatureName{
-				"BackendTLSPolicy",
-				"GRPCRoute",
-				"Gateway",
-				"GatewayAddressEmpty",
-				"GatewayHTTPListenerIsolation",
-				"GatewayInfrastructurePropagation",
-				"GatewayPort8080",
-				"GatewayStaticAddresses",
-				"HTTPRoute",
-				"HTTPRouteBackendProtocolWebSocket",
-				"HTTPRouteDestinationPortMatching",
-				"HTTPRouteHostRewrite",
-				"HTTPRouteMethodMatching",
-				"HTTPRouteParentRefPort",
-				"HTTPRoutePathRedirect",
-				"HTTPRoutePathRewrite",
-				"HTTPRoutePortRedirect",
-				"HTTPRouteQueryParamMatching",
-				"HTTPRouteRequestMirror",
-				"HTTPRouteRequestMultipleMirrors",
-				"HTTPRouteRequestPercentageMirror",
-				"HTTPRouteResponseHeaderModification",
-				"HTTPRouteSchemeRedirect",
-				"ReferenceGrant",
-				"TLSRoute",
-			},
+			name:               "standard and experimental features",
+			experimental:       true,
+			expectedFeatures:   allFeatures,
 			unexpectedFeatures: []gatewayv1.FeatureName{},
 		},
 	}