colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use database util inside router test

This commit is contained in:
Jannis Mattheis 2018-03-24 16:41:51 +01:00 committed by Jannis Mattheis
parent 496a0ba7dc
commit 505bc405d8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
router/router_test.go
View File

@ -5,17 +5,16 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"strings" "strings"
"testing" "testing"
"github.com/gin-gonic/gin/json" "github.com/gin-gonic/gin/json"
"github.com/gotify/server/database"
"github.com/gotify/server/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"github.com/gotify/server/config" "github.com/gotify/server/config"
"github.com/gotify/server/mode" "github.com/gotify/server/mode"
"github.com/gotify/server/model"
"github.com/gotify/server/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
) )
var ( var (
@ -29,7 +28,7 @@ func TestIntegrationSuite(t *testing.T) {
type IntegrationSuite struct { type IntegrationSuite struct {
suite.Suite suite.Suite
db *database.GormDatabase db *test.Database
server *httptest.Server server *httptest.Server
closable func() closable func()
} }
@ -37,9 +36,9 @@ type IntegrationSuite struct {
func (s *IntegrationSuite) BeforeTest(string, string) { func (s *IntegrationSuite) BeforeTest(string, string) {
mode.Set(mode.TestDev) mode.Set(mode.TestDev)
var err error var err error
s.db, err = database.New("sqlite3", "itest.db", "admin", "pw", 5) s.db = test.NewDBWithDefaultUser(s.T())
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
g, closable := Create(s.db, &model.VersionInfo{Version: "1.0.0", BuildDate: "2018-02-20-17:30:47", Commit: "asdasds"}, &config.Configuration{PassStrength: 5}) g, closable := Create(s.db.GormDatabase, &model.VersionInfo{Version: "1.0.0", BuildDate: "2018-02-20-17:30:47", Commit: "asdasds"}, &config.Configuration{PassStrength: 5})
s.closable = closable s.closable = closable
s.server = httptest.NewServer(g) s.server = httptest.NewServer(g)
} }
@ -47,7 +46,6 @@ func (s *IntegrationSuite) BeforeTest(string, string) {
func (s *IntegrationSuite) AfterTest(string, string) { func (s *IntegrationSuite) AfterTest(string, string) {
s.closable() s.closable()
s.db.Close() s.db.Close()
assert.Nil(s.T(), os.Remove("itest.db"))
s.server.Close() s.server.Close()
} }