Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

fix syntax errors in tests

Browse source
This commit is contained in:
Sonja Happ 2021-04-29 13:28:01 +02:00
parent b1c08f16b0
commit 6b2677ef63
12 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database/database.go
View file

@ -120,7 +120,7 @@ func MigrateModels() {
} }
// DBAddAdminUser adds a default admin user to the DB // DBAddAdminUser adds a default admin user to the DB
func DBAddAdminUser(cfg *config.Config) error { func DBAddAdminUser(cfg *config.Config) (error, string) {
DBpool.AutoMigrate(User{}) DBpool.AutoMigrate(User{})
// Check if admin user exists in DB // Check if admin user exists in DB
@ -157,10 +157,10 @@ func DBAddAdminUser(cfg *config.Config) error {
// add admin user to DB // add admin user to DB
err = DBpool.Create(&user).Error err = DBpool.Create(&user).Error
if err != nil { if err != nil {
return err return err, ""
} }
} }
return nil return nil, adminPW
} }
func generatePassword(Len int) string { func generatePassword(Len int) string {

12
database/database_test.go
View file

@ -51,39 +51,39 @@ func TestInitDB(t *testing.T) {
ownconfig := config.NewConfig([]config.Provider{defaults, env}) ownconfig := config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.Error(t, err) assert.Error(t, err)
dbname, err := configuration.GlobalConfig.String("db.name") dbname, err := configuration.GlobalConfig.String("db.name")
assert.NoError(t, err) assert.NoError(t, err)
static["db.name"] = dbname static["db.name"] = dbname
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.Error(t, err) assert.Error(t, err)
dbhost, err := configuration.GlobalConfig.String("db.host") dbhost, err := configuration.GlobalConfig.String("db.host")
assert.NoError(t, err) assert.NoError(t, err)
static["db.host"] = dbhost static["db.host"] = dbhost
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.Error(t, err) assert.Error(t, err)
dbuser, err := configuration.GlobalConfig.String("db.user") dbuser, err := configuration.GlobalConfig.String("db.user")
static["db.user"] = dbuser static["db.user"] = dbuser
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.Error(t, err) assert.Error(t, err)
dbpass, err := configuration.GlobalConfig.String("db.pass") dbpass, err := configuration.GlobalConfig.String("db.pass")
static["db.pass"] = dbpass static["db.pass"] = dbpass
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.Error(t, err) assert.Error(t, err)
dbssl, err := configuration.GlobalConfig.String("db.ssl") dbssl, err := configuration.GlobalConfig.String("db.ssl")
assert.NoError(t, err) assert.NoError(t, err)
static["db.ssl"] = dbssl static["db.ssl"] = dbssl
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig) err = InitDB(ownconfig, "true")
assert.NoError(t, err) assert.NoError(t, err)
// Verify that you can connect to the database // Verify that you can connect to the database

2
routes/component-configuration/config_test.go
View file

@ -143,7 +143,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/file/file_test.go
View file

@ -81,7 +81,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/infrastructure-component/ic_test.go
View file

@ -112,7 +112,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/register_test.go
View file

@ -43,7 +43,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/result/result_test.go
View file

@ -98,7 +98,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/scenario/scenario_test.go
View file

@ -68,7 +68,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/signal/signal_test.go
View file

@ -151,7 +151,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/user/user_test.go
View file

@ -55,7 +55,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/widget/widget_test.go
View file

@ -120,7 +120,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig, "true")
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
start.go
View file

@ -127,7 +127,7 @@ func main() {
} }
// Make sure that at least one admin user exists in DB // Make sure that at least one admin user exists in DB
err = database.DBAddAdminUser(configuration.GlobalConfig) err, _ = database.DBAddAdminUser(configuration.GlobalConfig)
if err != nil { if err != nil {
fmt.Println("error: adding admin user failed:", err.Error()) fmt.Println("error: adding admin user failed:", err.Error())
log.Fatal(err) log.Fatal(err)