table-driven tests

Signed-off-by: Thiago Perrotta <[email protected]>

Author: thiagowfx

pkg/chart/chart_test.go

@@ -397,50 +397,55 @@ func TestLintYamlValidation(t *testing.T) {
 }
 
 func TestLintYamlValidationWithoutValuesYaml(t *testing.T) {
-	type testData struct {
-		name     string
-		chartDir string
-		expected bool
+	testCases := []struct {
+		name           string
+		chartDir       string
+		validateYaml   bool
+		callsYamlLint  int
+		callsYamale    int
+	}{
+		{
+			name:          "no values.yaml with validation",
+			chartDir:      "testdata/no_values_yaml",
+			validateYaml:  true,
+			callsYamlLint: 1, // Only Chart.yaml
+			callsYamale:   0,
+		},
+		{
+			name:          "no values.yaml without validation",
+			chartDir:      "testdata/no_values_yaml",
+			validateYaml:  false,
+			callsYamlLint: 0,
+			callsYamale:   0,
+		},
+		{
+			name:          "with values.yaml with validation",
+			chartDir:      "testdata/test_lints",
+			validateYaml:  true,
+			callsYamlLint: 2, // Chart.yaml and values.yaml
+			callsYamale:   0,
+		},
 	}
 
-	runTests := func(validate bool, callsYamlLint int, callsYamale int) {
-		fakeMockLinter := new(fakeLinter)
-
-		fakeMockLinter.On("Yamale", mock.Anything, mock.Anything).Return(true)
-		fakeMockLinter.On("YamlLint", mock.Anything, mock.Anything).Return(true)
-
-		ct.linter = fakeMockLinter
-		ct.config.ValidateYaml = validate
-		ct.config.ValidateChartSchema = false
-		ct.config.ValidateMaintainers = false
-
-		var suffix string
-		if validate {
-			suffix = "with-validation"
-		} else {
-			suffix = "without-validation"
-		}
+	for _, testData := range testCases {
+		t.Run(testData.name, func(t *testing.T) {
+			fakeMockLinter := new(fakeLinter)
+			fakeMockLinter.On("Yamale", mock.Anything, mock.Anything).Return(true)
+			fakeMockLinter.On("YamlLint", mock.Anything, mock.Anything).Return(true)
 
-		testCases := []testData{
-			{fmt.Sprintf("lint-no-values-yaml-%s", suffix), "testdata/no_values_yaml", true},
-		}
+			ct.linter = fakeMockLinter
+			ct.config.ValidateYaml = testData.validateYaml
+			ct.config.ValidateChartSchema = false
+			ct.config.ValidateMaintainers = false
 
-		for _, testData := range testCases {
-			t.Run(testData.name, func(t *testing.T) {
-				chart, err := NewChart(testData.chartDir)
-				assert.Nil(t, err)
-				result := ct.LintChart(chart)
-				assert.Equal(t, testData.expected, result.Error == nil)
-				fakeMockLinter.AssertNumberOfCalls(t, "Yamale", callsYamale)
-				// Only Chart.yaml should be linted, not values.yaml since it doesn't exist
-				fakeMockLinter.AssertNumberOfCalls(t, "YamlLint", callsYamlLint)
-			})
-		}
+			chart, err := NewChart(testData.chartDir)
+			assert.Nil(t, err)
+			result := ct.LintChart(chart)
+			assert.Nil(t, result.Error)
+			fakeMockLinter.AssertNumberOfCalls(t, "Yamale", testData.callsYamale)
+			fakeMockLinter.AssertNumberOfCalls(t, "YamlLint", testData.callsYamlLint)
+		})
 	}
-
-	// When validation is enabled, only Chart.yaml should be linted (1 call), not values.yaml
-	runTests(true, 1, 0)
-	runTests(false, 0, 0)
 }
 
 func TestLintDependencyExtraArgs(t *testing.T) {