Use stretchr/testify to mock log.

Simplifies test log usage and removes additional
targets and dependencies to go:generate mocks.

Author: tpounds

Makefile

@@ -40,11 +40,11 @@ test_linters:
 
 # Maintenance
 
-generate: README.md docs/demo.svg install.sh pkg/logutils/mock_logutils/mock_log.go vendor
+generate: README.md docs/demo.svg install.sh vendor
 fast_generate: README.md vendor
 
 maintainer-clean: clean
-	rm -f docs/demo.svg README.md install.sh pkg/logutils/mock_logutils/mock_log.go
+	rm -f docs/demo.svg README.md install.sh
 	rm -rf vendor
 .PHONY: generate maintainer-clean
 
@@ -66,7 +66,7 @@ release:
 
 # Non-PHONY targets (real files)
 
-golangci-lint: FORCE pkg/logutils/mock_logutils/mock_log.go
+golangci-lint: FORCE
 	go build -o $@ ./cmd/golangci-lint
 
 tools:
@@ -88,9 +88,6 @@ install.sh: .goreleaser.yml
 README.md: FORCE golangci-lint
 	go run ./scripts/gen_readme/main.go
 
-pkg/logutils/mock_logutils/mock_log.go: pkg/logutils/log.go
-	go generate ./...
-
 go.mod: FORCE
 	go mod tidy
 	go mod verify

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/fatih/color v1.7.0
 	github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db
 	github.com/go-lintpack/lintpack v0.5.2
-	github.com/golang/mock v1.3.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a
 	github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6

go.sum

@@ -339,7 +339,6 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4er
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -808,6 +807,7 @@ github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50/go.mod h1:1pdIZ
 github.com/streadway/amqp v0.0.0-20181205114330-a314942b2fd9/go.mod h1:1WNBiOZtZQLpVAyu0iTduoJL9hEsMloAK5XWrtW0xdY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

pkg/golinters/gofmt_test.go

@@ -3,15 +3,12 @@ package golinters
 import (
 	"testing"
 
-	"github.com/golang/mock/gomock"
-
-	"github.com/golangci/golangci-lint/pkg/result"
-
 	diffpkg "github.com/sourcegraph/go-diff/diff"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 
 	"github.com/golangci/golangci-lint/pkg/logutils"
-	"github.com/golangci/golangci-lint/pkg/logutils/mock_logutils"
+	"github.com/golangci/golangci-lint/pkg/result"
 )
 
 func testDiffProducesChanges(t *testing.T, log logutils.Log, diff string, expectedChanges ...Change) {
@@ -130,10 +127,9 @@ index 0000000..6399915
 +// line
 `
 
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	log := mock_logutils.NewMockLog(ctrl)
-	log.EXPECT().Infof("The diff contains only additions: no original or deleted lines: %#v", gomock.Any())
+	log := logutils.NewMockLog()
+	log.On("Infof", "The diff contains only additions: no original or deleted lines: %#v", mock.Anything)
+
 	var noChanges []Change
 	testDiffProducesChanges(t, log, diff, noChanges...)
 }

pkg/logutils/log.go

@@ -1,8 +1,5 @@
 package logutils
 
-//go:generate go run ../../vendor/github.com/golang/mock/mockgen -source log.go -destination mock_logutils/mock_log.go
-//go:generate go run ../../vendor/golang.org/x/tools/cmd/goimports -w mock_logutils/mock_log.go
-
 type Log interface {
 	Fatalf(format string, args ...interface{})
 	Panicf(format string, args ...interface{})

pkg/logutils/mock.go

@@ -0,0 +1,47 @@
+package logutils
+
+import (
+	"github.com/stretchr/testify/mock"
+)
+
+type MockLog struct {
+	mock.Mock
+}
+
+func NewMockLog() *MockLog {
+	return &MockLog{}
+}
+
+func (m *MockLog) Fatalf(format string, args ...interface{}) {
+	mArgs := []interface{}{format}
+	m.Called(append(mArgs, args...)...)
+}
+
+func (m *MockLog) Panicf(format string, args ...interface{}) {
+	mArgs := []interface{}{format}
+	m.Called(append(mArgs, args...)...)
+}
+
+func (m *MockLog) Errorf(format string, args ...interface{}) {
+	mArgs := []interface{}{format}
+	m.Called(append(mArgs, args...)...)
+}
+
+func (m *MockLog) Warnf(format string, args ...interface{}) {
+	mArgs := []interface{}{format}
+	m.Called(append(mArgs, args...)...)
+}
+
+func (m *MockLog) Infof(format string, args ...interface{}) {
+	mArgs := []interface{}{format}
+	m.Called(append(mArgs, args...)...)
+}
+
+func (m *MockLog) Child(name string) Log {
+	m.Called(name)
+	return m
+}
+
+func (m *MockLog) SetLevel(level LogLevel) {
+	m.Called(level)
+}

pkg/logutils/mock_logutils/mock_log.go

@@ -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,21 +147,16 @@ 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...)
 	p.Finish()
 }
 
 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) {

pkg/result/processors/nolint_test.go

@@ -9,8 +9,6 @@ package tools
 //
 // nolint
 import (
-	_ "github.com/golang/mock/mockgen"
 	_ "github.com/goreleaser/godownloader"
 	_ "github.com/goreleaser/goreleaser"
-	_ "golang.org/x/tools/cmd/goimports"
 )