scratchfoundation/golangci-lint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/golangci-lint.git synced 2025-08-28 22:28:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use stretchr/testify to mock log.

Browse source 
Simplifies test log usage and removes additional
targets and dependencies to go:generate mocks.
This commit is contained in:
Trevor Pounds 2019-09-24 11:20:05 -04:00
parent a2b2c7a7af
commit a16b4d872b
45 changed files with 4771 additions and 3648 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkg/result/processors/nolint_test.go
View file

@ -6,14 +6,12 @@ import (
"path/filepath"
"testing"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/golangci/golangci-lint/pkg/lint/astcache"
"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
"github.com/golangci/golangci-lint/pkg/logutils"
"github.com/golangci/golangci-lint/pkg/logutils/mock_logutils"
"github.com/golangci/golangci-lint/pkg/result"
)
@ -43,18 +41,15 @@ func newTestNolintProcessor(log logutils.Log) *Nolint {
return NewNolint(cache, log, lintersdb.NewManager(nil))
}
func getOkLogger(ctrl *gomock.Controller) *mock_logutils.MockLog {
log := mock_logutils.NewMockLog(ctrl)
log.EXPECT().Infof(gomock.Any(), gomock.Any()).AnyTimes()
func getMockLog() *logutils.MockLog {
log := logutils.NewMockLog()
log.On("Infof", mock.Anything, mock.Anything).Maybe()
return log
}
//nolint:funlen
func TestNolint(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
p := newTestNolintProcessor(getOkLogger(ctrl))
p := newTestNolintProcessor(getMockLog())
defer p.Finish()
// test inline comments
@ -152,10 +147,8 @@ func TestNolintInvalidLinterName(t *testing.T) {
},
}
ctrl := gomock.NewController(t)
defer ctrl.Finish()
log := getOkLogger(ctrl)
log.EXPECT().Warnf("Found unknown linters in //nolint directives: %s", "bad1, bad2")
log := getMockLog()
log.On("Warnf", "Found unknown linters in //nolint directives: %s", "bad1, bad2")
p := newTestNolintProcessor(log)
processAssertEmpty(t, p, issues...)
@ -163,10 +156,7 @@ func TestNolintInvalidLinterName(t *testing.T) {
}
func TestNolintAliases(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
p := newTestNolintProcessor(getOkLogger(ctrl))
p := newTestNolintProcessor(getMockLog())
for _, line := range []int{47, 49, 51} {
line := line
t.Run(fmt.Sprintf("line-%d", line), func(t *testing.T) {