chore: update tests

Author: ldez

pkg/lint/lintersdb/enabled_set.go

@@ -81,7 +81,7 @@ func (es EnabledSet) build(lcfg *config.Linters, enabledByDefaultLinters []*lint
 	}
 
 	// typecheck is not a real linter and cannot be disabled.
-	if _, ok := resultLintersSet["typecheck"]; !ok && !es.cfg.InternalCmdTest {
+	if _, ok := resultLintersSet["typecheck"]; !ok && (es.cfg == nil || !es.cfg.InternalCmdTest) {
 		for _, lc := range es.m.GetLinterConfigs("typecheck") {
 			// it's important to use lc.Name() nor name because name can be alias
 			resultLintersSet[lc.Name()] = lc

pkg/lint/lintersdb/enabled_set_test.go

@@ -16,81 +16,86 @@ func TestGetEnabledLintersSet(t *testing.T) {
 		def  []string // enabled by default linters
 		exp  []string // alphabetically ordered enabled linter names
 	}
+
 	allMegacheckLinterNames := []string{"gosimple", "staticcheck", "unused"}
+
 	cases := []cs{
 		{
 			cfg: config.Linters{
 				Disable: []string{"megacheck"},
 			},
 			name: "disable all linters from megacheck",
 			def:  allMegacheckLinterNames,
-			exp:  nil, // all disabled
+			exp:  []string{"typecheck"}, // all disabled
 		},
 		{
 			cfg: config.Linters{
 				Disable: []string{"staticcheck"},
 			},
 			name: "disable only staticcheck",
 			def:  allMegacheckLinterNames,
-			exp:  []string{"gosimple", "unused"},
+			exp:  []string{"gosimple", "typecheck", "unused"},
 		},
 		{
 			name: "don't merge into megacheck",
 			def:  allMegacheckLinterNames,
-			exp:  allMegacheckLinterNames,
+			exp:  []string{"gosimple", "staticcheck", "typecheck", "unused"},
 		},
 		{
 			name: "expand megacheck",
 			cfg: config.Linters{
 				Enable: []string{"megacheck"},
 			},
 			def: nil,
-			exp: allMegacheckLinterNames,
+			exp: []string{"gosimple", "staticcheck", "typecheck", "unused"},
 		},
 		{
 			name: "don't disable anything",
-			def:  []string{"gofmt", "govet"},
-			exp:  []string{"gofmt", "govet"},
+			def:  []string{"gofmt", "govet", "typecheck"},
+			exp:  []string{"gofmt", "govet", "typecheck"},
 		},
 		{
 			name: "enable gosec by gas alias",
 			cfg: config.Linters{
 				Enable: []string{"gas"},
 			},
-			exp: []string{"gosec"},
+			exp: []string{"gosec", "typecheck"},
 		},
 		{
 			name: "enable gosec by primary name",
 			cfg: config.Linters{
 				Enable: []string{"gosec"},
 			},
-			exp: []string{"gosec"},
+			exp: []string{"gosec", "typecheck"},
 		},
 		{
 			name: "enable gosec by both names",
 			cfg: config.Linters{
 				Enable: []string{"gosec", "gas"},
 			},
-			exp: []string{"gosec"},
+			exp: []string{"gosec", "typecheck"},
 		},
 		{
 			name: "disable gosec by gas alias",
 			cfg: config.Linters{
 				Disable: []string{"gas"},
 			},
 			def: []string{"gosec"},
+			exp: []string{"typecheck"},
 		},
 		{
 			name: "disable gosec by primary name",
 			cfg: config.Linters{
 				Disable: []string{"gosec"},
 			},
 			def: []string{"gosec"},
+			exp: []string{"typecheck"},
 		},
 	}
 
 	m := NewManager(nil, nil)
 	es := NewEnabledSet(m, NewValidator(m), nil, nil)
+
 	for _, c := range cases {
 		c := c
 		t.Run(c.name, func(t *testing.T) {

pkg/result/processors/nolint_test.go

@@ -310,21 +310,21 @@ func TestNolintUnused(t *testing.T) {
 	}
 
 	t.Run("when an issue does not occur, it is not removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
 		defer p.Finish()
 
 		processAssertSame(t, p, nolintlintIssueVarcheck)
 	})
 
 	t.Run("when an issue does not occur but nolintlint is nolinted, it is removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
 		defer p.Finish()
 
 		processAssertEmpty(t, p, nolintlintIssueVarcheckUnusedOK)
 	})
 
 	t.Run("when an issue occurs, it is removed from the nolintlint issues", func(t *testing.T) {
-		p := createProcessor(t, log, []string{"nolintlint", "varcheck"})
+		p := createProcessor(t, log, []string{"nolintlint", "typecheck", "varcheck"})
 		defer p.Finish()
 
 		processAssertEmpty(t, p, []result.Issue{{
@@ -338,7 +338,7 @@ func TestNolintUnused(t *testing.T) {
 
 	t.Run("when a linter is not enabled, it is removed from the nolintlint unused issues", func(t *testing.T) {
 		enabledSetLog := logutils.NewMockLog()
-		enabledSetLog.On("Infof", "Active %d linters: %s", 1, []string{"nolintlint"})
+		enabledSetLog.On("Infof", "Active %d linters: %s", 2, []string{"nolintlint", "typecheck"})
 
 		cfg := &config.Config{Linters: config.Linters{DisableAll: true, Enable: []string{"nolintlint"}}}
 		dbManager := lintersdb.NewManager(cfg, nil)