Merge pull request #3062 from RainbowMango/pr_simplify_tests

simplify context tests

pkg/controllers/context/context_test.go

@@ -6,103 +6,73 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-type args struct {
-	controllerName               string
-	disabledByDefaultControllers []string
-}
-
 func TestContext_IsControllerEnabled(t *testing.T) {
 	tests := []struct {
 		name                         string
-		opts     Options
+		controllerName               string
-		args     args
+		controllers                  []string
+		disabledByDefaultControllers []string
 		expected                     bool
 	}{
 		{
 			name:                         "on by name",
-			args: args{
 			controllerName:               "bravo",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"alpha", "bravo", "-charlie"}, // --controllers=alpha,bravo,-charlie
-			opts: Options{
-				Controllers: []string{"alpha", "bravo", "-charlie"},
-			},
 			expected:                     true,
 		},
 		{
 			name:                         "off by name",
-			args: args{
 			controllerName:               "charlie",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"alpha", "bravo", "-charlie"}, // --controllers=alpha,bravo,-charlie
-			opts: Options{
-				Controllers: []string{"alpha", "bravo", "-charlie"},
-			},
 			expected:                     false,
 		},
 		{
 			name:                         "on by default",
-			args: args{
 			controllerName:               "alpha",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"*"}, // --controllers=*
-			opts: Options{
-				Controllers: []string{"*"},
-			},
 			expected:                     true,
 		},
 		{
 			name:                         "off by default",
-			args: args{
 			controllerName:               "delta",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"*"}, // --controllers=*
-			opts: Options{
-				Controllers: []string{"*"},
-			},
 			expected:                     false,
 		},
 		{
 			name:                         "on by star, not off by name",
-			args: args{
 			controllerName:               "alpha",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"*", "-charlie"}, // --controllers=*,-charlie
-			opts: Options{
-				Controllers: []string{"*", "-charlie"},
-			},
 			expected:                     true,
 		},
 		{
 			name:                         "off by name with star",
-			args: args{
 			controllerName:               "charlie",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"*", "-charlie"}, // --controllers=*,-charlie
-			opts: Options{
-				Controllers: []string{"*", "-charlie"},
-			},
 			expected:                     false,
 		},
 		{
 			name:                         "off by default implicit, no star",
-			args: args{
 			controllerName:               "foxtrot",
 			disabledByDefaultControllers: []string{"delta", "echo"},
-			},
+			controllers:                  []string{"alpha", "bravo", "-charlie"}, // --controllers=alpha,bravo,-charlie
-			opts: Options{
-				Controllers: []string{"alpha", "bravo", "-charlie"},
-			},
 			expected:                     false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := Context{
-				Opts: tt.opts,
+				Opts: Options{
+					Controllers: tt.controllers,
+				},
 			}
-			if got := c.IsControllerEnabled(tt.args.controllerName, sets.NewString(tt.args.disabledByDefaultControllers...)); got != tt.expected {
+			if got := c.IsControllerEnabled(tt.controllerName, sets.NewString(tt.disabledByDefaultControllers...)); got != tt.expected {
-				t.Errorf("IsControllerEnabled() = %v, want %v", got, tt.expected)
+				t.Errorf("expected %v, but got %v", tt.expected, got)
 			}
 		})
 	}