change Open config to be in api.go under NewAPIFromConfig

api.go

@@ -85,7 +85,34 @@ func (api *CacophonyAPI) JustRegistered() bool {
 	return api.justRegistered
 }
 
-// NewAPI creates a CacophonyAPI instance and obtains a fresh JSON Web
+// NewAPIFromConfig prases the supplied configFile and creates a new CacophonyAPI with the configFile information
+// and saves the generated password to privConfigFileName(configFile)
+func NewAPIFromConfig(configFile string) (*CacophonyAPI, error) {
+	conf, err := ParseConfigFile(configFile)
+	if err != nil {
+		return nil, fmt.Errorf("configuration error: %v", err)
+	}
+	privConfigFilename := privConfigFilename(configFile)
+	password, err := ReadPassword(privConfigFilename)
+	if err != nil {
+		return nil, err
+	}
+
+	api, err := NewAPI(conf.ServerURL, conf.Group, conf.DeviceName, password)
+	if err != nil {
+		return nil, err
+	}
+
+	if api.JustRegistered() {
+		err := WritePassword(privConfigFilename, api.Password())
+		if err != nil {
+			return nil, err
+		}
+	}
+	return api, nil
+}
+
+// createAPI creates a CacophonyAPI instance and obtains a fresh JSON Web
 // Token. If no password is given then the device is registered.
 func NewAPI(serverURL, group, deviceName, password string) (*CacophonyAPI, error) {
 

api_test.go

@@ -34,11 +34,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var apiURL = "http://localhost:1080"
 var tokenSuccess = true
 var responseHeader = http.StatusOK
-var message string
-var rawThermalData = "this is the raw thermal file"
-var apiURL = "http://localhost:1080"
+var rawThermalData = randString(100)
 var defaultDevice = "test-device"
 var defaultPassword = "test-password"
 var defaultGroup = "test-group"
@@ -77,7 +76,7 @@ func TestUploadThermalRawHttpRequest(t *testing.T) {
 func getTokenResponse() *tokenResponse {
 	return &tokenResponse{
 		Success:  tokenSuccess,
-		Messages: []string{message},
+		Messages: []string{},
 		Token:    "tok-" + randString(20),
 	}
 }

config.go

@@ -115,33 +115,6 @@ func WritePassword(filename, password string) error {
 	return err
 }
 
-// Open the configFile and creates a new CacophonyAPI with the configFile information
-// and saves the generated password to privConfigFileName(configFile)
-func Open(configFile string) (*CacophonyAPI, error) {
-	conf, err := ParseConfigFile(configFile)
-	if err != nil {
-		return nil, fmt.Errorf("configuration error: %v", err)
-	}
-	privConfigFilename := privConfigFilename(configFile)
-	password, err := ReadPassword(privConfigFilename)
-	if err != nil {
-		return nil, err
-	}
-
-	api, err := NewAPI(conf.ServerURL, conf.Group, conf.DeviceName, password)
-	if err != nil {
-		return nil, err
-	}
-
-	if api.JustRegistered() {
-		err := WritePassword(privConfigFilename, api.Password())
-		if err != nil {
-			return nil, err
-		}
-	}
-	return api, nil
-}
-
 // privCOnfigFileName take a configFile and creates an associated
 // file to store the password in with suffix -priv.yaml
 func privConfigFilename(configFile string) string {