Fix bug that prevented New... funcs from working, db name wasn't being set. Add tests to catch this in the future.

Author: c9845

mariadb_test.go

@@ -10,7 +10,7 @@ func TestNewMariaDB(t *testing.T) {
 
 	c := NewMariaDB(host, dbName, user, password)
 	if c.Type != DBTypeMariaDB {
-		t.FailNow()
+		t.Fatal("wrong db type", c.Type)
 		return
 	}
 

mssql.go

@@ -10,6 +10,7 @@ func NewMSSQL(host, dbName, user, password string) *Config {
 	c.Type = DBTypeMSSQL
 	c.Host = host
 	c.Port = defaultMSSQLPort
+	c.Name = dbName
 	c.User = user
 	c.Password = password
 

mssql_test.go

@@ -3,9 +3,35 @@ package sqldb
 import "testing"
 
 func TestNewMSSQL(t *testing.T) {
-	c := NewMSSQL("10.0.0.1", "db_name", "user1", "password1")
+	host := "10.0.0.1"
+	dbName := "db_name"
+	user := "user"
+	password := "password"
+
+	c := NewMSSQL(host, dbName, user, password)
 	if c.Type != DBTypeMSSQL {
-		t.FailNow()
+		t.Fatal("wrong db type", c.Type)
+		return
+	}
+
+	if c.Host != host {
+		t.Fatal("host does not match", c.Host, host)
+		return
+	}
+	if c.Port != defaultMSSQLPort {
+		t.Fatal("default port not set")
+		return
+	}
+	if c.Name != dbName {
+		t.Fatal("db name does not match", c.Name, dbName)
+		return
+	}
+	if c.User != user {
+		t.Fatal("user does not match", c.User, user)
+		return
+	}
+	if c.Password != password {
+		t.Fatal("host does not match", c.Password, password)
 		return
 	}
 }

mysql.go

@@ -10,6 +10,7 @@ func NewMySQL(host, dbName, user, password string) *Config {
 	c.Type = DBTypeMySQL
 	c.Host = host
 	c.Port = defaultMySQLPort
+	c.Name = dbName
 	c.User = user
 	c.Password = password
 

mysql_test.go

@@ -3,9 +3,35 @@ package sqldb
 import "testing"
 
 func TestNewMySQL(t *testing.T) {
-	c := NewMySQL("10.0.0.1", "db_name", "user1", "password1")
+	host := "10.0.0.1"
+	dbName := "db_name"
+	user := "user"
+	password := "password"
+
+	c := NewMySQL(host, dbName, user, password)
 	if c.Type != DBTypeMySQL {
-		t.FailNow()
+		t.Fatal("wrong db type", c.Type)
+		return
+	}
+
+	if c.Host != host {
+		t.Fatal("host does not match", c.Host, host)
+		return
+	}
+	if c.Port != defaultMySQLPort {
+		t.Fatal("default port not set")
+		return
+	}
+	if c.Name != dbName {
+		t.Fatal("db name does not match", c.Name, dbName)
+		return
+	}
+	if c.User != user {
+		t.Fatal("user does not match", c.User, user)
+		return
+	}
+	if c.Password != password {
+		t.Fatal("host does not match", c.Password, password)
 		return
 	}
 }

sqldb_test.go

@@ -115,6 +115,15 @@ func TestConnect(t *testing.T) {
 		t.Fatal("Connection not showing connected as it should!")
 		return
 	}
+
+	//Test with a bad path.
+	c.Close()
+	c.SQLitePath = "/path/is/bad.db"
+	err = c.Connect()
+	if err == nil {
+		t.Fatal("error should have occured because path does not exist.")
+		return
+	}
 }
 
 func TestDefaultMapperFunc(t *testing.T) {
@@ -198,6 +207,42 @@ func TestValidate(t *testing.T) {
 		t.Fatal("Error about bad db type should have occured in validate.")
 		return
 	}
+
+	//Test using New... config builders.
+	host := "10.0.0.1"
+	dbName := "db_name"
+	user := "user"
+	password := "password"
+	cfg := NewMariaDB(host, dbName, user, password)
+	if err = cfg.validate(); err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	cfg = NewMySQL(host, dbName, user, password)
+	if err = cfg.validate(); err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	cfg = NewMSSQL(host, dbName, user, password)
+	if err = cfg.validate(); err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	cfg = NewSQLite("/path/to/sqlite.db")
+	if err = cfg.validate(); err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	//Bad logging level.
+	cfg.LoggingLevel = -100
+	if err = cfg.validate(); err != nil {
+		t.Fatal(err)
+		return
+	}
 }
 
 func TestBuildConnectionString(t *testing.T) {
@@ -433,6 +478,19 @@ func TestAddConnectionOption(t *testing.T) {
 		t.Fatal("Connection option value mismatch.", vFound, v)
 		return
 	}
+
+	//Make sure blank map is populated if map doesn't exist.
+	c.ConnectionOptions = nil
+	c.AddConnectionOption(k, v)
+	vFound, ok = c.ConnectionOptions[k]
+	if !ok {
+		t.Fatal("Could not find key in connection options.")
+		return
+	}
+	if vFound != v {
+		t.Fatal("Connection option value mismatch.", vFound, v)
+		return
+	}
 }
 
 func TestType(t *testing.T) {