Better tests organization

api/api_test.go

@@ -1,33 +1,20 @@
-package test
+package api_test
 
 import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"net/http"
 	"net/http/httptest"
-	"os"
+	_ "github.com/deluan/gosonic/routers"
-	"path/filepath"
-	"runtime"
 )
 
 const (
-	testUser     = "deluan"
+	testUser = "deluan"
 	testPassword = "wordpass"
-	testClient   = "test"
+	testClient = "test"
-	testVersion  = "1.0.0"
+	testVersion = "1.0.0"
 )
 
-func init() {
-	_, file, _, _ := runtime.Caller(1)
-	appPath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
-	beego.TestBeegoInit(appPath)
-
-	noLog := os.Getenv("NOLOG")
-	if noLog != "" {
-		beego.SetLevel(beego.LevelError)
-	}
-}
-
 func AddParams(url string) string {
 	return fmt.Sprintf("%s?u=%s&p=%s&c=%s&v=%s", url, testUser, testPassword, testClient, testVersion)
 }

api/get_license_test.go

@@ -1,14 +1,15 @@
-package api
+package api_test
 
 import (
 	"encoding/xml"
-	_ "github.com/deluan/gosonic/routers"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"
+	"github.com/deluan/gosonic/tests"
 )
 
 func TestGetLicense(t *testing.T) {
+	tests.Init(t, false)
+
 	_, w := Get(AddParams("/rest/getLicense.view"), "TestGetLicense")
 
 	Convey("Subject: GetLicense Endpoint\n", t, func() {

api/get_music_folders_test.go

@@ -1,15 +1,16 @@
-package api
+package api_test
 
 import (
-	_ "github.com/deluan/gosonic/routers"
-	. "github.com/deluan/gosonic/tests"
 	"testing"
 
 	"encoding/xml"
 	. "github.com/smartystreets/goconvey/convey"
+	"github.com/deluan/gosonic/tests"
 )
 
 func TestGetMusicFolders(t *testing.T) {
+	tests.Init(t, false)
+
 	_, w := Get(AddParams("/rest/getMusicFolders.view"), "TestGetMusicFolders")
 
 	Convey("Subject: GetMusicFolders Endpoint\n", t, func() {

api/ping_test.go

@@ -1,15 +1,16 @@
-package api
+package api_test
 
 import (
 	"encoding/xml"
 	"github.com/deluan/gosonic/api/responses"
-	_ "github.com/deluan/gosonic/routers"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"
+	"github.com/deluan/gosonic/tests"
 )
 
 func TestPing(t *testing.T) {
+	tests.Init(t, false)
+
 	_, w := Get(AddParams("/rest/ping.view"), "TestPing")
 
 	Convey("Subject: Ping Endpoint\n", t, func() {

api/validation_test.go

@@ -1,15 +1,16 @@
-package api
+package api_test
 
 import (
 	"encoding/xml"
 	"github.com/deluan/gosonic/api/responses"
-	_ "github.com/deluan/gosonic/routers"
-	. "github.com/deluan/gosonic/tests"
 	. "github.com/smartystreets/goconvey/convey"
 	"testing"
+	"github.com/deluan/gosonic/tests"
 )
 
 func TestCheckParams(t *testing.T) {
+	tests.Init(t, false)
+
 	_, w := Get("/rest/ping.view", "TestCheckParams")
 
 	Convey("Subject: CheckParams\n", t, func() {

repositories/.goconvey.goconvey

@@ -0,0 +1 @@
+-short

repositories/init_database_test.go

@@ -4,6 +4,7 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 	_ "github.com/deluan/gosonic/tests"
 	"testing"
+	"github.com/deluan/gosonic/tests"
 )
 
 const (
@@ -11,11 +12,7 @@ const (
 )
 
 func TestCreateCollection(t *testing.T) {
-	if testing.Short() {
+	tests.Init(t, true)
-		t.Skip("skipping test in short mode.")
-	}
-
-	dbInstance().Drop(testCollectionName)
 
 	Convey("Given an empty DB", t, func() {
 
@@ -50,5 +47,10 @@ func TestCreateCollection(t *testing.T) {
 				So(allPaths, ShouldContainKey, "Name")
 			})
 		})
+
+		Reset(func() {
+			dbInstance().Drop(testCollectionName)
+		})
 	})
+
 }

tests/init_tests.go

@@ -0,0 +1,25 @@
+package tests
+
+import (
+	"github.com/astaxie/beego"
+	"os"
+	"path/filepath"
+	"runtime"
+	"testing"
+)
+
+func Init(t *testing.T, skipOnShort bool) {
+	if skipOnShort && testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
+
+	_, file, _, _ := runtime.Caller(0)
+	appPath, _ := filepath.Abs(filepath.Join(filepath.Dir(file), ".."))
+	beego.TestBeegoInit(appPath)
+
+	noLog := os.Getenv("NOLOG")
+	if noLog != "" {
+		beego.SetLevel(beego.LevelError)
+	}
+}
+