From 5351b73c92312cf45b1ed3a840e0162e738c93a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Jime=CC=81nez?= Date: Sat, 20 Aug 2016 11:54:54 +0100 Subject: [PATCH] Remove mocks from deprecated Generator interface --- automock/generator_mock_test.go | 129 -------------------------------- automock/generator_test.go | 12 --- 2 files changed, 141 deletions(-) delete mode 100644 automock/generator_mock_test.go diff --git a/automock/generator_mock_test.go b/automock/generator_mock_test.go deleted file mode 100644 index 8fc34d9..0000000 --- a/automock/generator_mock_test.go +++ /dev/null @@ -1,129 +0,0 @@ -/* -* CODE GENERATED AUTOMATICALLY WITH github.com/ernesto-jimenez/gogen/automock -* THIS FILE SHOULD NOT BE EDITED BY HAND - */ - -package automock - -import ( - "fmt" - mock "github.com/stretchr/testify/mock" - - io "io" -) - -// GeneratorMock mock -type GeneratorMock struct { - mock.Mock -} - -// Imports mocked method -func (m *GeneratorMock) Imports() map[string]string { - - ret := m.Called() - - var r0 map[string]string - switch res := ret.Get(0).(type) { - case nil: - case map[string]string: - r0 = res - default: - panic(fmt.Sprintf("unexpected type: %v", res)) - } - - return r0 - -} - -// Methods mocked method -func (m *GeneratorMock) Methods() []Method { - - ret := m.Called() - - var r0 []Method - switch res := ret.Get(0).(type) { - case nil: - case []Method: - r0 = res - default: - panic(fmt.Sprintf("unexpected type: %v", res)) - } - - return r0 - -} - -// Name mocked method -func (m *GeneratorMock) Name() string { - - ret := m.Called() - - var r0 string - switch res := ret.Get(0).(type) { - case nil: - case string: - r0 = res - default: - panic(fmt.Sprintf("unexpected type: %v", res)) - } - - return r0 - -} - -// Package mocked method -func (m *GeneratorMock) Package() string { - - ret := m.Called() - - var r0 string - switch res := ret.Get(0).(type) { - case nil: - case string: - r0 = res - default: - panic(fmt.Sprintf("unexpected type: %v", res)) - } - - return r0 - -} - -// SetInternal mocked method -func (m *GeneratorMock) SetInternal(p0 bool) { - - m.Called(p0) - -} - -// SetName mocked method -func (m *GeneratorMock) SetName(p0 string) { - - m.Called(p0) - -} - -// SetPackage mocked method -func (m *GeneratorMock) SetPackage(p0 string) { - - m.Called(p0) - -} - -// Write mocked method -func (m *GeneratorMock) Write(p0 io.Writer) error { - - ret := m.Called(p0) - - var r0 error - switch res := ret.Get(0).(type) { - case nil: - case error: - r0 = res - default: - panic(fmt.Sprintf("unexpected type: %v", res)) - } - - return r0 - -} diff --git a/automock/generator_test.go b/automock/generator_test.go index d06b40d..fe0489b 100644 --- a/automock/generator_test.go +++ b/automock/generator_test.go @@ -3,7 +3,6 @@ package automock import ( "bufio" "bytes" - "errors" "fmt" "io" "net/http" @@ -81,21 +80,10 @@ func printWithLines(txt io.Reader) { } } -//go:generate go run ../cmd/goautomock/main.go Generator //go:generate go run ../cmd/goautomock/main.go io.Writer //go:generate go run ../cmd/goautomock/main.go -pkg=io ByteScanner //go:generate go run ../cmd/goautomock/main.go net/http.CookieJar -func TestMockedGenerator(t *testing.T) { - m := &GeneratorMock{} - m.On("Write", mock.Anything).Return(nil).Once() - assert.NoError(t, m.Write(&bytes.Buffer{})) - - err := errors.New("fail") - m.On("Write", mock.Anything).Return(err) - assert.Equal(t, err, m.Write(&bytes.Buffer{})) -} - func TestMockedIOWriter(t *testing.T) { m := &WriterMock{} expected := []byte("hello")