Regression in mock generation #141

curtisallen · 2017-04-05T21:42:22Z

It looks like 81f429d introduced a regression. Causing import cycles in generated mocks.

Given

foo/foo.go

package foo

type Data struct {
}

type Foo interface {
	Something() Data
}

The generated mock produces an import cycle using e4fa388

mockery -name=Foo -dir=foo -inpkg

Generates a mock with
foo/mock_Foo.go

import foo "github.com/curtisallen/mockery-bug/foo"
...
// Something provides a mock function with given fields:
func (_m *MockFoo) Something() foo.Data {
	ret := _m.Called()

	var r0 foo.Data
	if rf, ok := ret.Get(0).(func() foo.Data); ok {
		r0 = rf()
	} else {
		r0 = ret.Get(0).(foo.Data)
	}

	return r0
}

However using 370e224 the mock generated doesn't have an import cycle.

I've created a repo demonstrating the bug https://github.com/curtisallen/mockery-bug
See correct mock
Import cycle mock

cc:/ @KingofSouth

The text was updated successfully, but these errors were encountered:

tamccall · 2017-04-05T22:43:05Z

I found this same issue at work a few days ago. I have a change locally to fix it here, but I want to write some tests to ensure it doesn't happen again.

feel free to use my branch in the short term @curtisallen

curtisallen · 2017-04-05T23:05:19Z

Great thanks!

tamccall · 2017-04-08T17:32:47Z

I went ahead and put up a pr for my fix in an attempt to get master back into a good state,

Haven't been able to repro in unit testing yet, so I will create a seperate issue to track getting the unit test added

tamccall · 2017-04-28T19:35:30Z

@evanphx Could #143 get a review this issue has been open for quite awhile, and the tip of master is currently broken.

tamccall · 2017-05-19T22:25:10Z

@curtisallen #143 was merged in today. Try getting the newest version from master and see if you are still having issues.

curtisallen · 2017-05-19T23:06:44Z

Thanks, @KingofSouth , yup HEAD works as expected. Closing

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

@sudo-suhas

* Internal registry for disambiguated imports, vars - Move functionality in the moq package partially into internal/{registry,template}. - Leverage registry to assign unique package and variable/method parameter names. Use import aliases if present in interface source package. BREAKING CHANGE: When the interface definition does not mention the parameter names, the field names in call info anonymous struct will be different. The new field names are generated using the type info (string -> s, int -> n, chan int -> intCh, []MyType -> myTypes, map[string]int -> stringToInt etc.). For example, for a string parameter previously if the field name was 'In1', the new field could be 'S' or 'S1' (depends on number of string method parameters). * Refactor golden file tests to be table-driven * Fix sync pkg alias handling for moq generation * Improve, add tests (increase coverage) * Use $.Foo in template, avoid declaring variables $ is set to the data argument passed to Execute, that is, to the starting value of dot. Variables were declared to be able to refer to the parent context. * Consistent template field formatting * Use tabs in generated Godoc comments' example code * Minor simplification * go generate * Fix conflict for generated param name of pointer type Excellent work by @sudo-suhas.

tamccall mentioned this issue Apr 8, 2017

Fixed bug in inpkg where generated source would import itself #143

Merged

tamccall mentioned this issue Apr 8, 2017

Need Additional unit test coverage for inpkg generation #144

Closed

curtisallen closed this as completed May 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Regression in mock generation #141

Regression in mock generation #141

curtisallen commented Apr 5, 2017 •

edited

Loading

tamccall commented Apr 5, 2017 •

edited

Loading

curtisallen commented Apr 5, 2017

tamccall commented Apr 8, 2017 •

edited

Loading

tamccall commented Apr 28, 2017

tamccall commented May 19, 2017

curtisallen commented May 19, 2017

Regression in mock generation #141

Regression in mock generation #141

Comments

curtisallen commented Apr 5, 2017 • edited Loading

tamccall commented Apr 5, 2017 • edited Loading

curtisallen commented Apr 5, 2017

tamccall commented Apr 8, 2017 • edited Loading

tamccall commented Apr 28, 2017

tamccall commented May 19, 2017

curtisallen commented May 19, 2017

curtisallen commented Apr 5, 2017 •

edited

Loading

tamccall commented Apr 5, 2017 •

edited

Loading

tamccall commented Apr 8, 2017 •

edited

Loading