Allow mock-pkg to be the "_test" package

Issue ernesto-jimenez#3
benma · Aug 26, 2016 · 04f8f06 · 04f8f06
1 parent cf49914
commit 04f8f06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/automock/generator.go b/automock/generator.go
@@ -26,7 +26,7 @@ type Generator struct {
 
 // NewGenerator initializes a Generator that will mock the given interface from the specified package.
 func NewGenerator(pkg, iface string) (*Generator, error) {
-	p, err := importer.DefaultWithTestFiles().Import(pkg)
+	p, err := importer.Default().Import(pkg)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/goautomock/main.go b/cmd/goautomock/main.go
@@ -52,7 +52,7 @@ func main() {
 	if *mockName != "" {
 		gen.SetName(*mockName)
 	}
-	inPkg := *pkg == "." && path.Dir(*out) == "."
+	inPkg := *pkg == "." && (path.Dir(*out) == "." && !strings.HasSuffix(*mockPkg, "_test"))
 	gen.SetInternal(inPkg)
 	if *mockPkg == "" && !inPkg {
 		p, err := importer.Default().Import(".")