1 files changed, 24 insertions, 3 deletions
diff --git a/model/webrtc_test.go b/model/webrtc_test.go
index 2418bd53a..7ec6605f8 100644
--- a/model/webrtc_test.go
+++ b/model/webrtc_test.go
@@ -8,12 +8,33 @@ import (
 	"testing"
 )
 
-func TestWebrtcJson(t *testing.T) {
+func TestWebrtcInfoResponseToFromJson(t *testing.T) {
 	o := WebrtcInfoResponse{Token: NewId(), GatewayUrl: NewId()}
 	json := o.ToJson()
 	ro := WebrtcInfoResponseFromJson(strings.NewReader(json))
 
-	if o.Token != ro.Token {
-		t.Fatal("Tokens do not match")
+	CheckString(t, ro.Token, o.Token)
+	CheckString(t, ro.GatewayUrl, o.GatewayUrl)
+
+	invalidJson := `{"wat"`
+	r := WebrtcInfoResponseFromJson(strings.NewReader(invalidJson))
+	if r != nil {
+		t.Fatalf("Should have failed")
+	}
+}
+
+func TestGatewayResponseFromJson(t *testing.T) {
+	// Valid Gateway Response
+	s1 := `{"janus": "something"}`
+	g1 := GatewayResponseFromJson(strings.NewReader(s1))
+
+	CheckString(t, g1.Status, "something")
+
+	// Malformed JSON
+	s2 := `{"wat"`
+	g2 := GatewayResponseFromJson(strings.NewReader(s2))
+
+	if g2 != nil {
+		t.Fatal("expected nil")
 	}
 }