Merge pull request #15 from plopezm/develop

Improved testing

Author: plopezm

Goedb.go

@@ -23,7 +23,7 @@ func init() {
 // Initialize gets the datasources from persistence.json
 func Initialize() {
 	var persistence config.Persistence
-	persistence = config.GetPersistenceConfig()
+	persistence = config.GetPersistenceConfig("persistence.json")
 
 	for _, datasource := range persistence.Datasources {
 		driver := new(manager.GoedbSQLDriver)

config/ConfigurationFile.go

@@ -2,9 +2,7 @@ package config
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
-	"os"
 )
 
 // Persistence represents the collection of datasources defined by the developer in persistence.json
@@ -21,15 +19,13 @@ type Datasource struct {
 }
 
 // GetPersistenceConfig generates the persistence struct from persistence.json
-func GetPersistenceConfig() Persistence {
-	raw, err := ioutil.ReadFile("./persistence.json")
-	if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(1)
-	}
-
+func GetPersistenceConfig(persistenceConfigFile string) Persistence {
 	var persistence Persistence
-
-	json.Unmarshal(raw, &persistence)
+	raw, err := ioutil.ReadFile(persistenceConfigFile)
+	if err == nil {
+		json.Unmarshal(raw, &persistence)
+	}else{
+		persistence.Datasources = make([]Datasource, 0)
+	}
 	return persistence
 }

tests/ConfigurationFile_test.go

@@ -0,0 +1,17 @@
+package tests
+
+import (
+	"testing"
+	"github.com/plopezm/goedb/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetPersistenceConfig(t *testing.T){
+	persistence := config.GetPersistenceConfig("persistence.json")
+	assert.Equal(t,2, len(persistence.Datasources))
+}
+
+func TestGetPersistenceConfigNotFound(t *testing.T){
+	persistence := config.GetPersistenceConfig("Notfoundfile.json")
+	assert.Equal(t,0, len(persistence.Datasources))
+}