From 6e02d70ca5ebf19c8def918b6752ebe810a01b5e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sep 02 2019 23:21:39 +0000
Subject: Handle tests outside packages correctly.


---

diff --git a/pkg/util/util.go b/pkg/util/util.go
index 4812399..49c5670 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -240,6 +240,11 @@ func (p *PackageInfoCollector) BuildArtifact() (*ProjectData, error) {
 					data.Tests[pkgName] = append(data.Tests[pkgName], item)
 				}
 			}
+			for _, item := range pkgInfo.XTestImports {
+				if is, _ := p.isStandard(item); !is {
+					data.Tests[pkgName] = append(data.Tests[pkgName], item)
+				}
+			}
 		}
 	}
 
@@ -297,9 +302,10 @@ func (p *PackageInfoCollector) CollectProjectDeps(standard, skipSelf, withTests,
 	for _, info := range p.packageInfos {
 		var pkgImports []string
 		if testsOnly {
-			pkgImports = info.TestImports
+			pkgImports = append(info.TestImports, info.XTestImports...)
 		} else if withTests {
 			pkgImports = append(info.Imports, info.TestImports...)
+			pkgImports = append(pkgImports, info.XTestImports...)
 		} else {
 			pkgImports = info.Imports
 		}