robocars/robocar-base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MqttValue] Return json content as default value

Browse Source
This commit is contained in:
Cyrille Nofficial 2019-12-27 14:47:55 +01:00
parent 4932ffbf31
commit 33511a015a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mqttdevice/mqttdevice.go
View File

@ -1,6 +1,7 @@
package mqttdevice package mqttdevice
import ( import (
"encoding/json"
"fmt" "fmt"
"github.com/cyrilix/robocar-base/types" "github.com/cyrilix/robocar-base/types"
MQTT "github.com/eclipse/paho.mqtt.golang" MQTT "github.com/eclipse/paho.mqtt.golang"
@ -107,9 +108,13 @@ func NewMqttValue(v interface{}) MqttValue {
case MqttValue: case MqttValue:
return val return val
default: default:
log.Printf("invalid mqtt value: %v", val) jsonValue, err := json.Marshal(v)
if err != nil {
log.Printf("unable to mashall to json value '%v': %v", v, err)
return nil return nil
} }
return jsonValue
}
} }
func (m *MqttValue) IntValue() (int, error) { func (m *MqttValue) IntValue() (int, error) {

6
mqttdevice/mqttdevice_test.go
View File

@ -66,14 +66,14 @@ func TestNewMqttValue(t *testing.T) {
{[]byte("test bytes"), []byte("test bytes")}, {[]byte("test bytes"), []byte("test bytes")},
{struct { {struct {
content string Content string
}{"invalid"}, nil}, }{"other"}, []byte(`{"Content":"other"}`)},
} }
for _, c := range cases { for _, c := range cases {
val := NewMqttValue(c.value) val := NewMqttValue(c.value)
if string(val) != string(c.expected) { if string(val) != string(c.expected) {
t.Errorf("NewMqttValue(%v): %v, wants %v", c.value, val, c.expected) t.Errorf("NewMqttValue(%v): %v, wants %v", c.value, string(val), string(c.expected))
} }
} }
} }