aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--env_test.go42
-rw-r--r--package_git_test.go9
-rw-r--r--package_test.go47
3 files changed, 30 insertions, 68 deletions
diff --git a/env_test.go b/env_test.go
index 0c8c1b3..249d321 100644
--- a/env_test.go
+++ b/env_test.go
@@ -16,7 +16,7 @@ import (
"github.com/shuLhan/share/lib/text/diff"
)
-func testEnvAddExclude(t *testing.T) {
+func TestEnvAddExclude(t *testing.T) {
testEnv.pkgsExclude = nil
cases := []struct {
@@ -47,7 +47,7 @@ func testEnvAddExclude(t *testing.T) {
}
}
-func testEnvExclude(t *testing.T) {
+func TestEnvExclude(t *testing.T) {
testEnv.pkgsExclude = nil
testEnv.pkgs = nil
testEnv.pkgsMissing = nil
@@ -183,7 +183,7 @@ func testEnvExclude(t *testing.T) {
}
}
-func testEnvLoad(t *testing.T) {
+func TestEnvLoad(t *testing.T) {
testEnv.pkgsExclude = nil
testEnv.pkgs = nil
testEnv.pkgsMissing = nil
@@ -218,7 +218,7 @@ func testEnvLoad(t *testing.T) {
}
}
-func testEnvGetPackageFromDB(t *testing.T) {
+func TestEnvGetPackageFromDB(t *testing.T) {
cases := []struct {
desc string
importPath string
@@ -281,7 +281,7 @@ func testEnvGetPackageFromDB(t *testing.T) {
}
}
-func testEnvQuery(t *testing.T) {
+func TestEnvQuery(t *testing.T) {
cases := []struct {
desc string
pkgs []string
@@ -365,7 +365,7 @@ github.com/ksubedi/gomove 0.2.17
}
}
-func testEnvFilterUnusedDeps(t *testing.T) {
+func TestEnvFilterUnusedDeps(t *testing.T) {
cases := []struct {
importPath string
exp map[string]bool
@@ -410,7 +410,7 @@ func testEnvFilterUnusedDeps(t *testing.T) {
}
}
-func testEnvSave(t *testing.T) {
+func TestEnvSave(t *testing.T) {
cases := []struct {
desc string
dirty bool
@@ -455,7 +455,7 @@ func testEnvSave(t *testing.T) {
}
}
-func testEnvUpdateMissing(t *testing.T) {
+func TestEnvUpdateMissing(t *testing.T) {
cases := []struct {
newPkg *Package
expPkg string
@@ -487,7 +487,11 @@ func testEnvUpdateMissing(t *testing.T) {
}
}
-func testEnvScan(t *testing.T) {
+func TestEnvScan(t *testing.T) {
+ testEnv.pkgs = nil
+ testEnv.pkgsMissing = nil
+ testEnv.db = nil
+
cases := []struct {
desc string
expPkgs []*Package
@@ -521,7 +525,7 @@ func testEnvScan(t *testing.T) {
}
}
-func testEnvSync(t *testing.T) {
+func TestEnvSync(t *testing.T) {
cases := []struct {
desc string
pkgName string
@@ -542,21 +546,3 @@ func testEnvSync(t *testing.T) {
}
}
}
-
-func TestEnv(t *testing.T) {
- t.Run("addExclude", testEnvAddExclude)
- t.Run("Exclude", testEnvExclude)
- t.Run("Load", testEnvLoad)
- t.Run("GetPackageFromDB", testEnvGetPackageFromDB)
- t.Run("Query", testEnvQuery)
- t.Run("filterUnusedDeps", testEnvFilterUnusedDeps)
- t.Run("Save", testEnvSave)
- t.Run("updateMissing", testEnvUpdateMissing)
-
- testEnv.pkgs = nil
- testEnv.pkgsMissing = nil
- testEnv.db = nil
-
- t.Run("Scan", testEnvScan)
- t.Run("Sync", testEnvSync)
-}
diff --git a/package_git_test.go b/package_git_test.go
index 22c1b74..4a0e2f6 100644
--- a/package_git_test.go
+++ b/package_git_test.go
@@ -10,7 +10,7 @@ import (
"github.com/shuLhan/share/lib/test"
)
-func testGitScan(t *testing.T) {
+func TestGitScan(t *testing.T) {
cases := []struct {
desc string
expErr string
@@ -40,7 +40,7 @@ func testGitScan(t *testing.T) {
}
}
-func testGitScanDeps(t *testing.T) {
+func TestGitScanDeps(t *testing.T) {
cases := []struct {
expErr string
expDeps []string
@@ -66,8 +66,3 @@ func testGitScanDeps(t *testing.T) {
testEnv.pkgsMissing, true)
}
}
-
-func TestPackageGit(t *testing.T) {
- t.Run("Scan", testGitScan)
- t.Run("ScanDeps", testGitScanDeps)
-}
diff --git a/package_test.go b/package_test.go
index 518090c..eb138c1 100644
--- a/package_test.go
+++ b/package_test.go
@@ -16,7 +16,7 @@ import (
"github.com/shuLhan/share/lib/test/mock"
)
-func testPackageRemove(t *testing.T) {
+func TestPackageRemove(t *testing.T) {
cases := []struct {
desc string
pkgName string
@@ -59,7 +59,7 @@ func testPackageRemove(t *testing.T) {
}
}
-func testPackageInstall(t *testing.T) {
+func TestPackageInstall(t *testing.T) {
cases := []struct {
desc string
pkg *Package
@@ -98,7 +98,7 @@ func testPackageInstall(t *testing.T) {
}
}
-func testIsEqual(t *testing.T) {
+func TestIsEqual(t *testing.T) {
cases := []struct {
desc string
pkg *Package
@@ -178,7 +178,7 @@ func testIsEqual(t *testing.T) {
}
}
-func testAddDep(t *testing.T) {
+func TestAddDep(t *testing.T) {
cases := []struct {
desc string
envPkgs []*Package
@@ -276,7 +276,7 @@ func testAddDep(t *testing.T) {
testGitPkgCur.DepsMissing = nil
}
-func testPushRequiredBy(t *testing.T) {
+func TestPushRequiredBy(t *testing.T) {
cases := []struct {
desc string
importPath string
@@ -312,7 +312,7 @@ func testPushRequiredBy(t *testing.T) {
}
}
-func testPackageRemoveRequiredBy(t *testing.T) {
+func TestPackageRemoveRequiredBy(t *testing.T) {
cases := []struct {
desc string
pkg *Package
@@ -345,7 +345,7 @@ func testPackageRemoveRequiredBy(t *testing.T) {
}
}
-func testPackageLoad(t *testing.T) {
+func TestPackageLoad(t *testing.T) {
cases := []struct {
desc string
pkgName string
@@ -455,7 +455,7 @@ func testPackageLoad(t *testing.T) {
}
}
-func testGoInstall(t *testing.T) {
+func TestGoInstall(t *testing.T) {
cases := []struct {
desc string
pkg *Package
@@ -510,7 +510,7 @@ func testGoInstall(t *testing.T) {
}
}
-func testPackageString(t *testing.T) {
+func TestPackageString(t *testing.T) {
cases := []struct {
pkg *Package
exp string
@@ -538,7 +538,7 @@ func testPackageString(t *testing.T) {
}
}
-func testUpdate(t *testing.T) {
+func TestUpdate(t *testing.T) {
cases := []struct {
desc string
curPkg *Package
@@ -652,7 +652,7 @@ func testUpdate(t *testing.T) {
}
}
-func testUpdateMissingDep(t *testing.T) {
+func TestUpdateMissingDep(t *testing.T) {
cases := []struct {
desc string
curPkg *Package
@@ -725,7 +725,7 @@ func testUpdateMissingDep(t *testing.T) {
}
}
-func testPackageGoClean(t *testing.T) {
+func TestPackageGoClean(t *testing.T) {
cases := []struct {
desc string
pkgName string
@@ -767,28 +767,9 @@ func testPackageGoClean(t *testing.T) {
}
}
-func testPackagePost(t *testing.T) {
- err := testGitPkgInstall.Remove()
+func TestPackagePost(t *testing.T) {
+ err := testGitPkgInstall.Remove(testEnv.path)
if err != nil {
t.Fatal(err)
}
}
-
-func TestPackage(t *testing.T) {
- t.Run("Remove", testPackageRemove)
- t.Run("Install", testPackageInstall)
-
- t.Run("GoInstall", testGoInstall)
- t.Run("IsEqual", testIsEqual)
- t.Run("addDep", testAddDep)
- t.Run("pushRequiredBy", testPushRequiredBy)
- t.Run("RemoveRequiredBy", testPackageRemoveRequiredBy)
- t.Run("load", testPackageLoad)
- t.Run("String", testPackageString)
- t.Run("Update", testUpdate)
- t.Run("UpdateMissingDep", testUpdateMissingDep)
-
- t.Run("GoClean", testPackageGoClean)
-
- t.Run("Post", testPackagePost)
-}