Merge pull request nukosuke#206 from frairon/fix-collaborateurs-marsh…

…alling

Bugfix json-marshal collaborators in Ticket

zendesk/collaborators.go

@@ -70,7 +70,7 @@ func (c *Collaborators) Append(i interface{}) error {
 }
 
 // MarshalJSON is marshaller for Collaborators
-func (c *Collaborators) MarshalJSON() ([]byte, error) {
+func (c Collaborators) MarshalJSON() ([]byte, error) {
 	return json.Marshal(c.collaborators)
 }
 

zendesk/collaborators_test.go

@@ -1,6 +1,7 @@
 package zendesk
 
 import (
+	"encoding/json"
 	"reflect"
 	"testing"
 )
@@ -47,3 +48,19 @@ func TestCanBeMarshalled(t *testing.T) {
 		t.Fatalf("Json output %s did not match expected output %s", out, collaboratorListJSON)
 	}
 }
+
+func TestCanBeRemarshalled(t *testing.T) {
+	var src, dst Collaborators
+	marshalled, err := json.Marshal(src)
+	if err != nil {
+		t.Fatalf("Marshalling returned an error %v", err)
+	}
+	err = json.Unmarshal(marshalled, &dst)
+	if err != nil {
+		t.Fatalf("Unmarshal returned an error %v", err)
+	}
+
+	if !reflect.DeepEqual(src, dst) {
+		t.Fatalf("remarshalling is inconsistent")
+	}
+}

zendesk/ticket_test.go

@@ -229,3 +229,22 @@ func TestDeleteTicket(t *testing.T) {
 		t.Fatalf("Failed to delete ticket field: %s", err)
 	}
 }
+
+func TestTicketMarshalling(t *testing.T) {
+	var src, dst Ticket
+
+	marshalled, err := json.Marshal(src)
+	if err != nil {
+		t.Fatalf("Failed to json-marshal ticket: %v", err)
+	}
+
+	err = json.Unmarshal(marshalled, &dst)
+	if err != nil {
+		t.Fatalf("Failed to json-unmarshal ticket: %v", err)
+	}
+
+	if !reflect.DeepEqual(src, dst) {
+		t.Fatalf("remarshalling is inconsistent")
+	}
+
+}